From 73b3813c2d110bf446f251350f120bb1e2b51d0c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 10:45:14 +0800
Subject: [PATCH] 20221227 充值归集

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 95e7910..55144df 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -44,14 +44,19 @@
     </select>
 
     <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
-        select *,
+        select a.*,
                b.name memberName,
                b.bind_phone memberBindPhone,
-               b.phone memberPhone
-        from mall_order_info a
+               b.phone memberPhone,
+               c.goods_name
+        from mall_order_item c
+        left join mall_order_info a on a.id = c.order_id
         left join mall_member b on a.member_id = b.id
         <where>
             <if test="record != null">
+                <if test="record.goodsName != null and record.goodsName != ''">
+                    and c.goods_name like CONCAT('%', CONCAT(#{record.goodsName}, '%'))
+                </if>
                 <if test="record.payResult != null and record.payResult != ''">
                     and a.pay_result = #{record.payResult}
                 </if>
@@ -105,6 +110,10 @@
         <result column="carriage" property="carriage" />
         <result column="remark" property="remark" />
         <result column="del_flag" property="delFlag" />
+        <result column="deliver_type" property="deliverType" />
+        <result column="shop_id" property="shopId" />
+        <result column="subsidy_amount" property="subsidyAmount" />
+        <result column="pay_trade_no" property="payTradeNo" />
         <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
             <id property="id" column="item_id" />
             <result property="orderId" column="order_id" />
@@ -142,10 +151,13 @@
             <if test="record.query != null and record.query != ''">
                 and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
             </if>
-            <if test="record.status == 4 and record.status != 0">
-                and a.status = 4
+            <if test="record.status == 6 and record.status != 0">
+                and a.status = 4 and a.comment_state = 2
             </if>
-            <if test="record.status != 4 and record.status != 0 and record.status != 5">
+            <if test="record.status == 4 and record.status != 0">
+                and a.status = 4 and a.comment_state != 2
+            </if>
+            <if test="record.status != 4 and record.status != 0 and record.status != 5 and record.status != 6">
                 and a.status = #{record.status}
             </if>
             <if test="record.status == 5">
@@ -156,6 +168,12 @@
             </if>
             <if test="record.orderType != null">
                 and a.order_type=#{record.orderType}
+            </if>
+            <if test="record.allStatus == 2">
+                and a.status <![CDATA[<= ]]> 4 and a.comment_state != 2
+            </if>
+            <if test="record.allStatus == 3">
+                and a.status = 4 and a.comment_state = 2
             </if>
         </where>
         order by a.created_time desc
@@ -228,7 +246,9 @@
 
     <select id="selectTotalAmount" resultType="java.math.BigDecimal">
         select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
-        where member_id=#{memberId} and status in (2, 3, 4) and order_type=1
+        where member_id=#{memberId}
+          and status = 4
+          and comment_state = 2
     </select>
 
     <select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
@@ -302,4 +322,54 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="selectCountByCreateTimeAndMemberId" resultType="java.lang.Integer">
+        select
+            count(a.id)
+        from mall_order_info a
+        where
+              a.status = 4
+            and a.comment_state = 2
+            and a.member_id = #{memberId}
+            <if test="createdTime != null">
+                and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+            </if>
+
+    </select>
+
+    <select id="selectTodayAmountByCreateTimeAndMemberId" resultType="java.math.BigDecimal">
+            select
+                ifnull(sum(a.subsidy_amount),0)
+            from mall_order_info a
+            where
+                  a.status = 4
+                and a.comment_state = 2
+                and a.member_id = #{memberId}
+            <if test="createdTime != null">
+                and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+            </if>
+
+    </select>
+
+    <select id="selectOrderInfoByStatusAndMemberId" resultType="java.lang.Integer">
+        select
+        count(a.id)
+        from mall_order_info a
+        where
+        a.status <![CDATA[< ]]> 4
+        and a.member_id = #{memberId}
+    </select>
+
+    <select id="selectCountByCreateTime" resultType="java.lang.Integer">
+        select
+        count(a.id)
+        from mall_order_info a
+        where
+        a.status = 4
+        and a.comment_state = 2
+        <if test="createdTime != null">
+            and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+        </if>
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1