From 84c7afc62bb1eb6f5d80d2d9928d0d11a1ffbdda Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Aug 2023 21:14:13 +0800
Subject: [PATCH] 赠送积分更新状态

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 1ac65c9..76f1bea 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -138,6 +138,7 @@
         <result column="city" property="city" />
         <result column="township" property="township" />
         <result column="detail_address" property="detailAddress" />
+        <result column="delivery_type" property="deliveryType" />
         <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
             <id property="id" column="item_id" />
             <result property="orderId" column="order_id" />
@@ -261,6 +262,11 @@
         where member_id=#{memberId} and status in (2, 3, 4) and order_type=1
     </select>
 
+    <select id="selectTotalAmountListByMemberId" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+        select * from mall_order_info
+        where member_id=#{memberId} and status in (2, 3, 4)
+    </select>
+
     <select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
         select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
         where status = 4
@@ -377,6 +383,7 @@
         <result column="city" property="city" />
         <result column="township" property="township" />
         <result column="detail_address" property="detailAddress" />
+        <result column="delivery_type" property="deliveryType" />
     </resultMap>
 
     <select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
@@ -412,6 +419,7 @@
         select
         a.*,
         b.goods_name,
+        b.sku_name,
         b.cnt,
         b.price,
         b.amount
@@ -427,6 +435,7 @@
         SUM(cnt) goodsCnt
     from mall_order_item
     <where>
+    1=1
         <if test="record.orderIdsStr != null">
             and order_id in
                 <foreach collection="record.orderIdsStr" item="id" index="index" open="(" close=")" separator=",">

--
Gitblit v1.9.1