From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
index 8452f45..11eee01 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -328,6 +328,7 @@
MAX(co_settle_time) AS co_settle_time, co_order_by, co_create_time,
co_update_time
</sql>
+
<select id="listUserOrder" resultMap="ResultMap">
<!-- 鏌ヨ鐢ㄦ埛璁㈠崟 -->
SELECT COALESCE(SUM(hb.`hb_money`),0)AS totalMoney, hb.hb_state AS
@@ -347,11 +348,15 @@
<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
<!-- 璁㈠崟鏃堕棿 -->
<include refid="SELECT_PARAM_HONGBAO_STATE" />
- <!-- 绾㈠寘鐘舵�� -->
+ <!-- 璁㈠崟鍙锋煡璇� -->
<if test="orderNo != null and orderNo !='' ">AND co.co_order_no = #{orderNo}</if>
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
+
GROUP BY co.`co_order_no`, co.`co_source_type` ORDER BY
co.co_third_create_time DESC LIMIT ${start},${count}
</select>
+
<select id="countUserOrder" resultType="java.lang.Long">
<!-- 缁熻鐢ㄦ埛璁㈠崟鏁伴噺 -->
SELECT IFNULL(COUNT(ho_id),0) FROM (SELECT ho.ho_id FROM
@@ -368,8 +373,11 @@
<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
<!-- 璁㈠崟鏃堕棿 -->
<include refid="SELECT_PARAM_HONGBAO_STATE" />
- <!-- 绾㈠寘鐘舵�� -->
+ <!-- 璁㈠崟鍙锋煡璇� -->
<if test="orderNo != null and orderNo !='' ">AND co.co_order_no = #{orderNo}</if>
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
+
GROUP BY co.`co_order_no`, co.`co_source_type` )A
</select>
<select id="listOrderGoodsInfo" resultMap="ResultMap"
@@ -387,6 +395,8 @@
</foreach>
GROUP BY tc.`co_order_no`,tc.`co_order_goods_id`
</select>
+
+
<select id="countHistoryOrder" resultType="java.util.HashMap">
<!-- 缁熻鍘嗗彶璁㈠崟鏁伴噺 -->
SELECT SUM(A.self)AS totalSelf,SUM(A.shared)AS
@@ -418,7 +428,13 @@
AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),
DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1
</if>
- GROUP BY co.`co_order_no`, co.`co_source_type`)YX UNION ALL
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
+
+ GROUP BY co.`co_order_no`, co.`co_source_type`)YX
+
+ UNION ALL
+
<!-- 鍒嗕韩璁㈠崟 -->
SELECT 0 AS self,IFNULL(COUNT(ho_id),0) AS shared,0 AS invite FROM
(SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho LEFT JOIN ( SELECT *
@@ -445,7 +461,13 @@
AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),
DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1
</if>
- GROUP BY co.`co_order_no`, co.`co_source_type`)WQ UNION ALL
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
+
+ GROUP BY co.`co_order_no`, co.`co_source_type`)WQ
+
+ UNION ALL
+
<!-- 閭�璇疯鍗� -->
SELECT 0 AS self,0 AS shared,IFNULL(COUNT(ho_id),0) AS invite FROM
(SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho LEFT JOIN ( SELECT *
@@ -472,8 +494,13 @@
AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),
DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1
</if>
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
+
GROUP BY co.`co_order_no`, co.`co_source_type`)SX )A
</select>
+
+
<select id="countByUidAndOrderState" resultType="java.util.HashMap">
SELECT SUM(A.valid)AS totalValid, SUM(A.proces)AS
totalProces,SUM(A.Invalid)AS totalInvite FROM (
@@ -486,8 +513,13 @@
LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
WHERE hb.hb_id IS NOT NULL <![CDATA[AND co.`co_state` <> 3]]>
AND (co.`co_state_whole_order` =1 OR co.`co_state_whole_order` = 2)
- <include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
- GROUP BY co.`co_order_no`, co.`co_source_type`)YX UNION ALL
+ <include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
+ GROUP BY co.`co_order_no`, co.`co_source_type`)YX
+
+ UNION ALL
+
<!-- 缁存潈璁㈠崟 -->
SELECT 0 AS valid,IFNULL(COUNT(ho_id),0) AS proces,0 AS Invalid FROM
(SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho LEFT JOIN ( SELECT *
@@ -497,7 +529,12 @@
LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
WHERE hb.hb_id IS NOT NULL AND co.`co_state` = 3
<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
- GROUP BY co.`co_order_no`, co.`co_source_type`)WQ UNION ALL
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
+ GROUP BY co.`co_order_no`, co.`co_source_type`)WQ
+
+ UNION ALL
+
<!-- 澶辨晥璁㈠崟 -->
SELECT 0 AS valid,0 AS proces,IFNULL(COUNT(ho_id),0) AS Invalid FROM
(SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho LEFT JOIN ( SELECT *
@@ -507,6 +544,8 @@
LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
WHERE hb.hb_id IS NOT NULL AND co.`co_state_whole_order` = 3
<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
GROUP BY co.`co_order_no`, co.`co_source_type`)SX )A
</select>
<select id="countBonusOrderNumber" resultType="java.lang.Long">
@@ -519,6 +558,8 @@
LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
WHERE hb.hb_id IS NOT NULL
<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
GROUP BY co.`co_order_no`, co.`co_source_type` )A
</select>
<select id="countBonusOrderMoney" resultType="java.math.BigDecimal">
@@ -537,6 +578,8 @@
AND co.`co_state` = 2
<!-- 涓婃湀 :缁熻宸叉敹璐� -->
</if>
+ <!-- 璁㈠崟鏉ユ簮 -->
+ <if test="source != null">AND co.co_source_type = #{source}</if>
</select>
<select id="countBonusOrderMoneyAndNumber" resultType="java.util.HashMap">
SELECT COUNT(*) AS totalNum, CAST(SUM(moneys) AS DECIMAL(19,2)) AS
--
Gitblit v1.8.0