From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 660351c..bb3975c 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>
@@ -100,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="score_amount" property="scoreAmount" />
+        <result column="score_cnt" property="scoreCnt" />
         <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
             <id property="id" column="item_id" />
             <result property="orderId" column="order_id" />
@@ -113,6 +127,10 @@
             <result property="price" column="price" />
             <result property="amount" column="amount" />
             <result property="isNormal" column="is_normal" />
+            <result property="staticMulti" column="static_multi" />
+            <result property="goodsLevel" column="goods_level" />
+            <result property="normalPer" column="normal_per" />
+            <result property="normalBonus" column="normal_bonus" />
         </collection>
     </resultMap>
 
@@ -170,7 +188,11 @@
             b.cnt,
             b.price,
             b.amount,
-            b.is_normal
+            b.is_normal,
+            b.static_multi,
+            b.goods_level,
+            b.normal_per,
+            b.normal_bonus
         from mall_order_info a
              inner join mall_order_item b on a.id=b.order_id
         where a.id=#{id}
@@ -269,7 +291,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>
 
@@ -283,4 +305,28 @@
         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>
+
+    <select id="selectScoreOrderListInDate" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+        select * from mall_order_info orderInfo
+            inner join mall_order_item orderItem on orderInfo.id=orderItem.order_id
+            inner join mall_goods goodsInfo on orderItem.goods_id=goodsInfo.ID and goodsInfo.goods_type = 2 and goodsInfo.id=#{goodsId}
+        where orderInfo.order_time >= #{startDate}
+            and orderInfo.order_time &lt;= #{endDate}
+            and orderInfo.status in (2,3,4,5)
+            and orderInfo.member_id=#{memberId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1