From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 6 +++++-
1 files changed, 5 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 ad35803..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" />
--
Gitblit v1.8.0