From aa861e83f2a7a5f99ed30d448c129c2032b71af6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 May 2023 09:39:58 +0800
Subject: [PATCH] 微信支付

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 00a6577..a16b8d7 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -44,15 +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>
-            a.del_flag=2
             <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>
@@ -67,6 +71,12 @@
                 </if>
                 <if test="record.name != null and record.name != ''">
                     and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+                </if>
+                <if test="record.startTime != null and record.startTime != ''">
+                    and a.order_time &gt;= #{record.startTime}
+                </if>
+                <if test="record.endTime != null and record.endTime != ''">
+                    and a.order_time &lt;= #{record.endTime}
                 </if>
             </if>
         </where>
@@ -96,9 +106,12 @@
         <result column="longitude" property="longitude" />
         <result column="latitude" property="latitude" />
         <result column="order_type" property="orderType" />
+        <result column="comment_state" property="commentState" />
         <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" />
         <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
             <id property="id" column="item_id" />
             <result property="orderId" column="order_id" />
@@ -137,7 +150,7 @@
                 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 in (5,6)
+                and a.status = 4
             </if>
             <if test="record.status != 4 and record.status != 0 and record.status != 5">
                 and a.status = #{record.status}
@@ -268,7 +281,7 @@
     <update id="updateOrderConfirmStatus">
         update mall_order_info
         set status=4,
-            receiving_time=new Date()
+            receiving_time=now()
         where status=3 and date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
     </update>
 
@@ -277,4 +290,23 @@
         inner join mall_order_item b on a.id=b.order_id and b.is_normal=1
         where date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
     </select>
+
+    <select id="selectSumAmountByPayMethodAndStatue" resultType="java.math.BigDecimal">
+        select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+        where pay_method = #{payMethod} and status = #{statue}
+    </select>
+
+    <select id="selectTotalAmountByPayDoneAndDataString" resultType="java.math.BigDecimal">
+        select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+        where pay_result = #{payResult} and date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+    </select>
+
+    <select id="selectSumAmountByPayMethodAndSomeStatue" resultType="java.math.BigDecimal">
+        select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+        where pay_method = #{payMethod}
+          and status in
+        <foreach collection="statues" separator="," close=")" open="(" item="item">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1