From 36e556587fc44cd9f613b10873d15a5f9cdf2fc6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Aug 2022 14:25:48 +0800
Subject: [PATCH] 20220810

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 5b4901c..b1ebead 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -59,7 +59,7 @@
     </select>
 
     <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
-        select *,
+        select a.*,
                b.name memberName,
                b.bind_phone memberBindPhone,
                b.phone memberPhone
@@ -92,7 +92,7 @@
                 </if>
             </if>
         </where>
-        order by a.created_time desc
+        GROUP BY a.id  order by a.created_time desc
     </select>
 
     <select id="getMallOrderInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderVo">
@@ -123,6 +123,8 @@
         <result column="remark" property="remark" />
         <result column="take_code" property="takeCode" />
         <result column="take_unique_code" property="takeUniqueCode" />
+        <result column="delivery_state" property="deliveryState" />
+        <result column="is_home" property="isHome" />
         <result column="del_flag" property="delFlag" />
         <result column="leader_name" property="leaderName" />
         <result column="leader_phone" property="leaderPhone" />
@@ -333,4 +335,11 @@
         select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
         where pay_method = #{payMethod} and status = #{statue}
     </select>
+
+    <update id="updateOrderStateAndDeliveryState">
+        update mall_order_info
+        set status = #{orderState},
+            delivery_state = #{deliveryState}
+        where id = #{orderId}
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1