From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 1 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 6cd8478..b0c121f 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
@@ -163,7 +163,7 @@
co_order_goods_id,co_count,co_state,co_state_whole_order,
co_estimate,co_eIncome,co_payment,co_settlement, co_third_create_time,
MAX(co_settle_time) AS co_settle_time, co_order_by, co_create_time,
- co_update_time,co_state_desc
+ co_update_time,co_state_desc,co_urank
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Long">
@@ -1116,4 +1116,89 @@
</foreach>
GROUP BY co.`co_order_no`, co.`co_source_type` )A
</select>
+
+ <select id="getMinSettleTimeAndUid" resultMap="BaseResultMap">
+ SELECT d.`co_uid`,MAX(d.`co_settle_time`) AS co_settle_time FROM `yeshi_ec_common_order` d
+ WHERE d.`co_settle_time` IS NOT NULL AND d.`co_payment` > 1
+ GROUP BY d.`co_uid`
+ </select>
+
+
+
+
+ <select id="getOrderList" resultMap="ResultMap">
+ SELECT hb.`hb_type` AS hongBaoType, MAX(hb.`hb_get_time`) AS
+ accountTime, MAX(hb.`hb_pre_get_time`) AS preAccountTime,
+ <include refid="Order_Column_List" />
+ FROM yeshi_ec_hongbao_order ho LEFT JOIN (SELECT
+ <include refid="Hongbao_Column_List" />
+ FROM yeshi_ec_hongbao_v2 v2 WHERE v2.`hb_uid`= #{uid} AND <![CDATA[v2.`hb_type`<> 10 ]]>
+ <include refid="SELECT_PARAM_HONGBAO_TYPE" />
+ <if test="type == 2 and day == 5">
+ <!-- 鏈湀鏈堝皢瑕佸埌璐﹀垎浜鍗� -->
+ AND DATE_FORMAT(v2.`hb_pre_get_time`,'%Y%m') =
+ DATE_FORMAT(CURDATE(),'%Y%m')
+ </if>
+ <if test="type == 3 and day == 5">
+ <!-- 鏈湀灏嗚鍒拌处閭�璇疯鍗� -->
+ AND DATE_FORMAT(v2.`hb_pre_get_time`,'%Y%m') =
+ DATE_FORMAT(CURDATE(),'%Y%m')
+ </if>
+ <!-- 绾㈠寘绫诲瀷 -->
+ )hb ON IF(hb.hb_pid IS NULL,hb.hb_id,hb.hb_pid)=ho.`ho_hongbao_id`
+ 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_STATE" />
+ <!-- 璁㈠崟鐘舵�� -->
+ <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="listSource != null and listSource.size() > 0">
+ <foreach collection="listSource" item="item" open="AND (" close=")" separator="or">
+ co.co_source_type = #{item}
+ </foreach>
+ </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="countOrderList" resultType="java.lang.Long">
+ SELECT IFNULL(COUNT(ho_id),0) FROM (SELECT ho.ho_id FROM
+ yeshi_ec_hongbao_order ho LEFT JOIN (SELECT
+ <include refid="Hongbao_Column_List" />
+ FROM yeshi_ec_hongbao_v2 v2 WHERE v2.`hb_uid`= #{uid} AND <![CDATA[v2.`hb_type`<> 10 ]]>
+ <include refid="SELECT_PARAM_HONGBAO_TYPE" />
+ <!-- 绾㈠寘绫诲瀷 -->
+ <if test="type == 2 and day == 5">
+ <!-- 鏈湀鏈堝皢瑕佸埌璐﹀垎浜鍗� -->
+ AND DATE_FORMAT(v2.`hb_pre_get_time`,'%Y%m') =
+ DATE_FORMAT(CURDATE(),'%Y%m')
+ </if>
+ <if test="type == 3 and day == 5">
+ <!-- 鏈湀灏嗚鍒拌处閭�璇疯鍗� -->
+ AND DATE_FORMAT(v2.`hb_pre_get_time`,'%Y%m') =
+ DATE_FORMAT(CURDATE(),'%Y%m')
+ </if>
+ )hb ON IF(hb.hb_pid IS NULL,hb.hb_id,hb.hb_pid)=ho.`ho_hongbao_id`
+ 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_STATE" />
+ <!-- 璁㈠崟鐘舵�� -->
+ <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="listSource != null and listSource.size() > 0">
+ <foreach collection="listSource" item="item" open="AND (" close=")" separator="or">
+ co.co_source_type = #{item}
+ </foreach>
+ </if>
+ GROUP BY co.`co_order_no`, co.`co_source_type` )A
+ </select>
+
+
</mapper>
--
Gitblit v1.8.0