From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 16 +++++++++++++++-
1 files changed, 15 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 5ff5a43..2df964f 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
@@ -102,6 +102,9 @@
<result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" />
<result column="co_state_desc" property="stateDesc" jdbcType="VARCHAR" />
+
+ <result column="co_uid" property="userId" jdbcType="VARCHAR" />
+
<association property="userInfo" column="co_uid"
resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />
@@ -435,7 +438,8 @@
hongBaoState, 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
+ 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" />
@@ -1048,5 +1052,15 @@
WHERE v2.`hb_type` = 20 AND v2.`hb_state` = 3
AND co.`co_order_no` = #{orderNo} AND co.`co_source_type`= #{sourceType})A
</select>
+
+ <select id="count24HValidOrderByUid" resultType="Long">
+ SELECT IFNULL(COUNT(A.co_order_no),0) FROM (SELECT co.`co_order_no` FROM yeshi_ec_hongbao_order ho
+ LEFT JOIN yeshi_ec_hongbao_v2 v2 ON v2.hb_id = ho.`ho_hongbao_id`
+ LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
+ WHERE v2.`hb_type` = 1 AND co.`co_state_whole_order`<![CDATA[<>]]> 3 AND co.`co_uid` = #{uid}
+ AND co.co_third_create_time <![CDATA[>]]> #{minTime}
+ AND co.`co_third_create_time` <![CDATA[<=]]> DATE_SUB(NOW(), INTERVAL 1 DAY)
+ GROUP BY co.`co_order_no`,co.`co_source_type`)A
+ </select>
</mapper>
--
Gitblit v1.8.0