From 46dc84c9fb9aa7a53ff1c2479de66275115b0b87 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 11:22:44 +0800
Subject: [PATCH] 20210707
---
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 259 +++++++++++++++++++++++++--------------------------
1 files changed, 126 insertions(+), 133 deletions(-)
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index fa58ed8..74ceced 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -120,67 +120,66 @@
GROUP BY a.order_id order by a.create_time
</select>
-<!-- <select id="queryCuserOrderCount" resultType="java.util.HashMap">-->
-<!-- SELECT COUNT(*) as count FROM xzx_order_info WHERE create_user_id=#{userId}-->
-<!-- <if test="status != null">-->
-<!-- and order_status in-->
-<!-- <foreach collection="status" index="index" item="id" open="(" separator="," close=")">-->
-<!-- #{id}-->
-<!-- </foreach>-->
-<!-- </if>-->
-<!-- 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 COUNT(*) as count FROM xzx_order_info WHERE create_user_id=#{userId}
+ <if test="status != null">
+ and order_status in
+ <foreach collection="status" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
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
@@ -308,84 +307,78 @@
</if>
</select>
-<!-- <select id="queryCuserOrderFinishList" resultType="java.util.HashMap">-->
-<!-- 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}-->
-<!-- <if test="status != null">-->
-<!-- and a.order_status in-->
-<!-- <foreach collection="status" index="index" item="id" open="(" separator="," close=")">-->
-<!-- #{id}-->
-<!-- </foreach>-->
-<!-- </if>-->
-
-<!-- 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 a.order_id as orderId, sum(d.money) as money,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}
+ <if test="status != null">
+ and a.order_status in
+ <foreach collection="status" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ 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">
--
Gitblit v1.9.1