From 8e30aa7c1f0384f09278699318b4902b815b42a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2019 18:01:25 +0800
Subject: [PATCH] 维权返利初步修改,拼多多初步增加

---
 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 81a7249..8452f45 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,16 +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="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>
@@ -131,6 +131,16 @@
 		yeshi_ec_common_order co WHERE co.co_source_type=#{sourceType} and
 		co_order_no=#{orderNo}
 	</select>
+
+
+	<select id="selectBySourceTypeAndTradeId" resultMap="BaseResultMap">SELECT *
+		FROM
+		yeshi_ec_common_order co WHERE co.co_source_type=#{sourceType} and
+		co_trade_id=#{tradeId}  limit 1
+	</select>
+
+
+
 	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
 		yeshi_ec_common_order where co_id = #{id,jdbcType=BIGINT}
 	</delete>

--
Gitblit v1.8.0