From 5723081b2da05257b254196d440e3f1f6d7a654b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 03 Apr 2023 13:41:15 +0800
Subject: [PATCH] 设定时区,这样创建的时间就不会出现问题

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e80890a..0a4d3a4 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -152,12 +152,12 @@
                 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 == 6 and record.status != 0">
-                and a.status = 4 and a.comment_state = 1
+                and a.status = 4 and a.comment_state = 2
             </if>
             <if test="record.status == 4 and record.status != 0">
-                and a.status = 4
+                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 record.status != 5 and record.status != 6">
                 and a.status = #{record.status}
             </if>
             <if test="record.status == 5">
@@ -170,7 +170,7 @@
                 and a.order_type=#{record.orderType}
             </if>
             <if test="record.allStatus == 2">
-                and a.status <![CDATA[< ]]> 4 and a.comment_state = 1
+                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
@@ -359,4 +359,48 @@
         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>
+
+    <select id="selectOrderCntByDate" resultType="cc.mrbird.febs.mall.vo.MallOrderInfoTestVo">
+        SELECT
+            b. NAME,
+            a.member_id memberId,
+            COUNT(a.id) orderCnt
+        FROM
+            mall_order_info a
+                LEFT JOIN mall_member b ON a.member_id = b.id
+        WHERE
+            a. STATUS = 4
+          AND a.comment_state = 2
+          AND date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+        GROUP BY
+            a.member_id
+        ORDER BY
+            orderCnt DESC
+    </select>
+
+    <select id="selectByMemberIdAndDate" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+        SELECT
+            a.*
+        FROM
+            mall_order_info a
+        WHERE
+            a. STATUS = 4
+          AND a.comment_state = 2
+          AND a.member_id = #{memberId}
+          AND date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+        order by a.CREATED_TIME desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1