From 36a6c7f1d1bc054a987aeabb4ab6d9f1278d8e4d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 四月 2019 09:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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 43c9bb9..81a7249 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
@@ -95,17 +95,16 @@
<result column="userId" property="userId" jdbcType="VARCHAR" />
<result column="userName" property="userName" jdbcType="VARCHAR" />
<result column="userPortrait" property="userPortrait" jdbcType="VARCHAR" />
- <result column="levelOneId" property="levelOneId" jdbcType="VARCHAR" />
- <result column="levelOneMoney" property="levelOneMoney"
- jdbcType="VARCHAR" />
- <result column="levelTwoId" property="levelTwoId" jdbcType="VARCHAR" />
- <result column="levelTwoMoney" property="levelTwoMoney"
- jdbcType="VARCHAR" />
+
+ <result column="hb_id" property="hongbaoId" jdbcType="BIGINT" />
+
<result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" />
<association property="userInfo" column="co_uid"
resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />
+
<association property="commonOrderGoods" column="co_order_goods_id"
resultMap="com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper.BaseResultMap" />
+
</resultMap>
<sql id="Base_Column_List">co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_state_whole_order,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,co_order_by,co_create_time,co_update_time,co_trade_id
</sql>
@@ -612,9 +611,7 @@
</select>
<select id="listQuery" resultMap="ResultMap">
SELECT A.*,u.id AS userId,u.`nick_name` AS userName,u.`portrait` AS
- userPortrait, pv2.`hb_uid` AS levelOneId,pv2.`hb_money` AS
- levelOneMoney, ppv2.`hb_uid` AS levelTwoId,ppv2.`hb_money` AS
- levelTwoMoney FROM (SELECT hb.hb_id,hb.hb_uid,hb.`hb_money` AS
+ userPortrait FROM (SELECT hb.hb_id,hb.hb_uid,hb.`hb_money` AS
totalMoney, hb.hb_state AS hongBaoState, hb.`hb_type` AS hongBaoType,
hb.`hb_get_time` AS accountTime, hb.`hb_pre_get_time` AS
preAccountTime, co.*,cog.* FROM yeshi_ec_hongbao_order ho LEFT JOIN
@@ -638,9 +635,7 @@
<if test="keyType == 2 ">AND hb.hb_uid = ${key}</if>
</if>
ORDER BY co.co_third_create_time DESC LIMIT ${start},${count} ) A LEFT
- JOIN yeshi_ec_user u ON u.id = A.hb_uid LEFT JOIN yeshi_ec_hongbao_v2
- pv2 ON pv2.`hb_pid` = A.hb_id LEFT JOIN yeshi_ec_hongbao_v2 ppv2 ON
- ppv2.`hb_pid` = pv2.hb_id
+ JOIN yeshi_ec_user u ON u.id = A.hb_uid
</select>
<select id="countQuery" resultType="java.lang.Long">
SELECT count(ho.ho_id) FROM yeshi_ec_hongbao_order ho LEFT JOIN
--
Gitblit v1.8.0