cashierdesk / dili-cashier · Commits

Commit e0137e451c095185a8c2b7607d5e087753885fc9

Authored by guantingwei
1 parent d3712f23
build: skipped

refactor payment DAO to rename pay_payment_id to pay_trade_id

Inline Side-by-side
Showing 1 changed file with 11 additions and 11 deletions
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizPaymentDao.xml
  View file @e0137e4
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <result column="biz_order_id" jdbcType="BIGINT" property="bizOrderId" /> 7 <result column="biz_order_id" jdbcType="BIGINT" property="bizOrderId" />
8 <result column="order_id" jdbcType="VARCHAR" property="orderId" /> 8 <result column="order_id" jdbcType="VARCHAR" property="orderId" />
9 <result column="trade_id" jdbcType="VARCHAR" property="tradeId" /> 9 <result column="trade_id" jdbcType="VARCHAR" property="tradeId" />
10 - <result column="pay_payment_id" jdbcType="VARCHAR" property="payPaymentId" /> 10 + <result column="pay_trade_id" jdbcType="VARCHAR" property="payTradeId" />
11 <result column="mch_id" jdbcType="VARCHAR" property="mchId" /> 11 <result column="mch_id" jdbcType="VARCHAR" property="mchId" />
12 <result column="card_no" jdbcType="VARCHAR" property="cardNo" /> 12 <result column="card_no" jdbcType="VARCHAR" property="cardNo" />
13 <result column="username" jdbcType="VARCHAR" property="username" /> 13 <result column="username" jdbcType="VARCHAR" property="username" />
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" /> 25 <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
26 </resultMap> 26 </resultMap>
27 <sql id="Base_Column_List"> 27 <sql id="Base_Column_List">
28 - id, pay_trade_no, biz_order_id, order_id, trade_id, pay_payment_id, mch_id, card_no, 28 + id, pay_trade_no, biz_order_id, order_id, trade_id, pay_trade_id, mch_id, card_no,
29 username, user_id, account_id, fund_account_id, pay_fee, pay_state, pay_time, channel_id, 29 username, user_id, account_id, fund_account_id, pay_fee, pay_state, pay_time, channel_id,
30 cashier_url, payment_callback, version, created_time, modified_time 30 cashier_url, payment_callback, version, created_time, modified_time
31 </sql> 31 </sql>
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 </delete> 49 </delete>
50 <insert id="insert" parameterType="com.diligrp.cashier.mall.model.MallBizPayment"> 50 <insert id="insert" parameterType="com.diligrp.cashier.mall.model.MallBizPayment">
51 insert into mall_biz_payment (id, pay_trade_no, biz_order_id, 51 insert into mall_biz_payment (id, pay_trade_no, biz_order_id,
52 - order_id, trade_id, pay_payment_id, 52 + order_id, trade_id, pay_trade_id,
53 mch_id, card_no, username, 53 mch_id, card_no, username,
54 user_id, account_id, fund_account_id, 54 user_id, account_id, fund_account_id,
55 pay_fee, pay_state, pay_time, 55 pay_fee, pay_state, pay_time,
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 version, created_time, modified_time 57 version, created_time, modified_time
58 ) 58 )
59 values (#{id,jdbcType=BIGINT}, #{payTradeNo,jdbcType=VARCHAR}, #{bizOrderId,jdbcType=BIGINT}, 59 values (#{id,jdbcType=BIGINT}, #{payTradeNo,jdbcType=VARCHAR}, #{bizOrderId,jdbcType=BIGINT},
60 - #{orderId,jdbcType=VARCHAR}, #{tradeId,jdbcType=VARCHAR}, #{payPaymentId,jdbcType=VARCHAR}, 60 + #{orderId,jdbcType=VARCHAR}, #{tradeId,jdbcType=VARCHAR}, #{payTradeId,jdbcType=VARCHAR},
61 #{mchId,jdbcType=VARCHAR}, #{cardNo,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 61 #{mchId,jdbcType=VARCHAR}, #{cardNo,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR},
62 #{userId,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{fundAccountId,jdbcType=BIGINT}, 62 #{userId,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{fundAccountId,jdbcType=BIGINT},
63 #{payFee,jdbcType=BIGINT}, #{payState,jdbcType=TINYINT}, #{payTime,jdbcType=TIMESTAMP}, 63 #{payFee,jdbcType=BIGINT}, #{payState,jdbcType=TINYINT}, #{payTime,jdbcType=TIMESTAMP},
@@ -83,8 +83,8 @@ @@ -83,8 +83,8 @@
83 <if test="tradeId != null"> 83 <if test="tradeId != null">
84 trade_id, 84 trade_id,
85 </if> 85 </if>
86 - <if test="payPaymentId != null">  
87 - pay_payment_id, 86 + <if test="payTradeId != null">
  87 + pay_trade_id,
88 </if> 88 </if>
89 <if test="mchId != null"> 89 <if test="mchId != null">
90 mch_id, 90 mch_id,
@@ -148,8 +148,8 @@ @@ -148,8 +148,8 @@
148 <if test="tradeId != null"> 148 <if test="tradeId != null">
149 #{tradeId,jdbcType=VARCHAR}, 149 #{tradeId,jdbcType=VARCHAR},
150 </if> 150 </if>
151 - <if test="payPaymentId != null">  
152 - #{payPaymentId,jdbcType=VARCHAR}, 151 + <if test="payTradeId != null">
  152 + #{payTradeId,jdbcType=VARCHAR},
153 </if> 153 </if>
154 <if test="mchId != null"> 154 <if test="mchId != null">
155 #{mchId,jdbcType=VARCHAR}, 155 #{mchId,jdbcType=VARCHAR},
@@ -213,8 +213,8 @@ @@ -213,8 +213,8 @@
213 <if test="tradeId != null"> 213 <if test="tradeId != null">
214 trade_id = #{tradeId,jdbcType=VARCHAR}, 214 trade_id = #{tradeId,jdbcType=VARCHAR},
215 </if> 215 </if>
216 - <if test="payPaymentId != null">  
217 - pay_payment_id = #{payPaymentId,jdbcType=VARCHAR}, 216 + <if test="payTradeId != null">
  217 + pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
218 </if> 218 </if>
219 <if test="mchId != null"> 219 <if test="mchId != null">
220 mch_id = #{mchId,jdbcType=VARCHAR}, 220 mch_id = #{mchId,jdbcType=VARCHAR},
@@ -270,7 +270,7 @@ @@ -270,7 +270,7 @@
270 biz_order_id = #{bizOrderId,jdbcType=BIGINT}, 270 biz_order_id = #{bizOrderId,jdbcType=BIGINT},
271 order_id = #{orderId,jdbcType=VARCHAR}, 271 order_id = #{orderId,jdbcType=VARCHAR},
272 trade_id = #{tradeId,jdbcType=VARCHAR}, 272 trade_id = #{tradeId,jdbcType=VARCHAR},
273 - pay_payment_id = #{payPaymentId,jdbcType=VARCHAR}, 273 + pay_trade_id = #{payTradeId,jdbcType=VARCHAR},
274 mch_id = #{mchId,jdbcType=VARCHAR}, 274 mch_id = #{mchId,jdbcType=VARCHAR},
275 card_no = #{cardNo,jdbcType=VARCHAR}, 275 card_no = #{cardNo,jdbcType=VARCHAR},
276 username = #{username,jdbcType=VARCHAR}, 276 username = #{username,jdbcType=VARCHAR},