From 125ff101c88b86f649640cafb6b4416ca6d674ad Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 10:56:19 +0800
Subject: [PATCH] 20210707

---
 gc-user/src/main/resources/mapper/user/OrderMapper.xml |  125 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 124 insertions(+), 1 deletions(-)

diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index f61e067..70cd892 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -131,6 +131,56 @@
         GROUP BY order_type
     </select>
 
+<!--    <select id="queryCuserOrderCount" resultType="java.util.HashMap">-->
+<!--        SELECT-->
+<!--            COUNT(*) as count-->
+<!--        FROM-->
+<!--            (-->
+<!--                (-->
+<!--                    SELECT-->
+<!--                        a.order_id orderId,-->
+<!--                        a.order_status STATUS,-->
+<!--                        '1' type,-->
+<!--                        ifnull(sum(d.money), 0) money,-->
+<!--                        '0' score,-->
+<!--                        a.address address,-->
+<!--                        ifnull(sum(d.weight), 0) weight,-->
+<!--                        e. NAME NAME,-->
+<!--                        a.create_time createTime-->
+<!--                    FROM-->
+<!--                        xzx_order_info a-->
+<!--                            LEFT JOIN xzx_order_item_info d ON a.order_id = d.order_id-->
+<!--                            LEFT JOIN xzx_user_info e ON e.user_id = a.receiver-->
+<!--                    WHERE-->
+<!--                        a.create_user_id=#{userId}-->
+<!--                    GROUP BY-->
+<!--                        a.order_id-->
+<!--                )-->
+<!--                UNION-->
+<!--                (-->
+<!--                    SELECT-->
+<!--                        a.id orderId,-->
+<!--                        a. STATUS STATUS,-->
+<!--                        '2' type,-->
+<!--                        '0' money,-->
+<!--                        ifnull(sum(d.score), 0) score,-->
+<!--                        a.address address,-->
+<!--                        ifnull(sum(d.weight), 0) weight,-->
+<!--                        a.username NAME,-->
+<!--                        a.CREATED_TIME createTime-->
+<!--                    FROM-->
+<!--                        xzx_jhy_order a-->
+<!--                            LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id-->
+<!--                    WHERE-->
+<!--                        a.user_id = #{userId}-->
+<!--                    GROUP BY-->
+<!--                        a.id-->
+<!--                )-->
+<!--            ) v-->
+<!--        ORDER BY-->
+<!--            createTime DESC-->
+<!--    </select>-->
+
     <select id="queryPromoterOrderWeightMoney" resultType="com.xzx.gc.model.admin.PromoterModel">
         SELECT SUM(c.weight) as orderWeightCount, SUM(c.money) as orderMoneyCount
         FROM xzx_order_info b
@@ -258,7 +308,13 @@
     </select>
 
     <select id="queryCuserOrderFinishList" resultType="java.util.HashMap">
-        SELECT a.order_id as orderId, sum(d.money) as money,sum(d.weight) as weight,a.create_time as createTime FROM
+        SELECT a.order_id as orderId,
+               sum(d.money) as money,
+               a.address as address,
+               a.order_type as orderType,
+               sum(d.weight) as weight,
+               a.create_time as createTime
+        FROM
         xzx_order_info a
         LEFT JOIN xzx_order_item_info d on a.order_id = d.order_id
         WHERE a.create_user_id=#{userId}
@@ -271,6 +327,64 @@
 
         GROUP BY a.order_id
     </select>
+<!--    <select id="queryCuserOrderFinishList" resultType="java.util.HashMap">-->
+<!--        SELECT-->
+<!--            orderId,-->
+<!--            address,-->
+<!--            status,-->
+<!--            type,-->
+<!--            money,-->
+<!--            score,-->
+<!--            weight,-->
+<!--            name,-->
+<!--            createTime-->
+<!--        FROM-->
+<!--            (-->
+<!--                (-->
+<!--                    SELECT-->
+<!--                        a.order_id orderId,-->
+<!--                        a.order_status STATUS,-->
+<!--                        '1' type,-->
+<!--                        ifnull(sum(d.money), 0) money,-->
+<!--                        '0' score,-->
+<!--                        a.address address,-->
+<!--                        ifnull(sum(d.weight), 0) weight,-->
+<!--                        e. NAME NAME,-->
+<!--                        a.create_time createTime-->
+<!--                    FROM-->
+<!--                        xzx_order_info a-->
+<!--                            LEFT JOIN xzx_order_item_info d ON a.order_id = d.order_id-->
+<!--                            LEFT JOIN xzx_user_info e ON e.user_id = a.receiver-->
+<!--                    WHERE-->
+<!--                        a.create_user_id = #{userId}-->
+<!--                    GROUP BY-->
+<!--                        a.order_id-->
+<!--                )-->
+<!--                UNION-->
+<!--                (-->
+<!--                    SELECT-->
+<!--                        a.id orderId,-->
+<!--                        a. STATUS STATUS,-->
+<!--                        '2' type,-->
+<!--                        '0' money,-->
+<!--                        ifnull(sum(d.score), 0) score,-->
+<!--                        a.address address,-->
+<!--                        ifnull(sum(d.weight), 0) weight,-->
+<!--                        a.username NAME,-->
+<!--                        a.CREATED_TIME createTime-->
+<!--                    FROM-->
+<!--                        xzx_jhy_order a-->
+<!--                            LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id-->
+<!--                    WHERE-->
+<!--                        a.user_id = #{userId}-->
+<!--                    GROUP BY-->
+<!--                        a.id-->
+<!--                )-->
+<!--            ) v-->
+<!--        ORDER BY-->
+<!--            createTime DESC-->
+
+<!--    </select>-->
 
 
     <select id="orderCountStat" parameterType="java.util.Map" resultType="String">
@@ -399,4 +513,13 @@
             b.receive_time ASC
     </select>
 
+    <select id="selectJhyOrderByUserId" resultType="com.xzx.gc.entity.JhyOrder">
+        SELECT
+            a.*
+        FROM
+            xzx_jhy_order a
+        WHERE
+            a.status != '5'
+            and a.user_id = #{userId}
+    </select>
 </mapper>

--
Gitblit v1.9.1