update:保存时增加字段

fengliang
1 parent a29ac220
Showing 2 changed files with 11 additions and 6 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderPaymenServiceImpl.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderPaymentMapper.xml
@@ -396,7 +396,7 @@ public class OrderPaymenServiceImpl implements OrderPaymentService {
         }
         //卖方订单并且使用买方元气卡支付时，记录园区卡支付的具体方式
-        if (payChannel.equals(OrderPaymentAllChannel.CARD_CHANNEL.getCodeInteger()) || OrderOrderType.SELLER_ORDER.getCodeInteger().equals(order.getOrderType())) {
+        if (payChannel.equals(OrderPaymentAllChannel.CARD_CHANNEL.getCodeInteger()) && OrderOrderType.SELLER_ORDER.getCodeInteger().equals(order.getOrderType())) {
             if (orderPayDto.getPayChannelSub() == null) {
                 orderPayment.setPayChannelSub(OrderPaymentSubChannel.CARD_CHANNEL_BUYER.getCodeInteger());
             } else {
@@ -34,13 +34,14 @@
     <result column="seller_fee_state" jdbcType="VARCHAR" property="sellerFeeState" />
     <result column="order_status" jdbcType="TINYINT" property="orderStatus" />
     <result column="relation_id" jdbcType="BIGINT" property="relationId" />
+    <result column="pay_channel_sub" jdbcType="TINYINT" property="payChannelSub"/>
   </resultMap>
     <sql id="Base_Column_List">
         id, `code`, order_id, order_code,market_id, pay_amount, pay_discount, payer_customer_id, payer_store_customer_id,
         payer_customer_name, payer_card_no, payer_account_id, payer_fund_account_id, payee_shop_id,
         payee_shop_name, payee_card_no, payee_account_id, payee_fund_account_id, payee_seller_id,
         payee_seller_name, pay_time, pay_mode, pay_channel, version, created_time, modified_time,
-        `state`, trade_id,totle_seller_fee,seller_fee_state,order_status,relation_id
+        `state`, trade_id,totle_seller_fee,seller_fee_state,order_status,relation_id,pay_channel_sub
     </sql>
     <sql id="VO_Column_List">
         id, `code`, order_id, order_code, convert(pay_amount, decimal(20,2))/100 as pay_amount, convert(pay_discount, decimal(20,2))/100 as pay_discount, payer_customer_id, payer_store_customer_id,
@@ -58,7 +59,8 @@
                                payee_account_id, payee_fund_account_id, payee_seller_id,
                                payee_seller_name, pay_time, pay_mode,
                                pay_channel, version,  state, trade_id,
-                               totle_seller_fee,seller_fee_state,order_status,relation_id
+                               totle_seller_fee,seller_fee_state,order_status,relation_id,
+                               pay_channel_sub
     )
     values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{orderId,jdbcType=INTEGER},#{marketId,jdbcType=BIGINT},
             #{orderCode,jdbcType=VARCHAR}, #{payAmount,jdbcType=BIGINT}, #{payDiscount,jdbcType=BIGINT},
@@ -68,7 +70,8 @@
             #{payeeAccountId,jdbcType=BIGINT}, #{payeeFundAccountId,jdbcType=BIGINT}, #{payeeSellerId,jdbcType=BIGINT},
             #{payeeSellerName,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMode,jdbcType=INTEGER},
             #{payChannel,jdbcType=INTEGER}, #{version,jdbcType=INTEGER}, #{state,jdbcType=TINYINT}, #{tradeId,jdbcType=VARCHAR},
-            #{totleSellerFee,jdbcType=BIGINT}, #{sellerFeeState,jdbcType=TINYINT},#{orderStatus,jdbcType=TINYINT}, #{relationId,jdbcType=BIGINT})
+            #{totleSellerFee,jdbcType=BIGINT}, #{sellerFeeState,jdbcType=TINYINT},#{orderStatus,jdbcType=TINYINT}, #{relationId,jdbcType=BIGINT},
+            #{payChannelSub,jdbcType=INTEGER})
   </insert>
     <insert id="saveBatch" useGeneratedKeys="true" keyProperty="id">
         insert into order_payment (id, code, order_id,market_id,
@@ -79,7 +82,8 @@
                                    payee_account_id, payee_fund_account_id, payee_seller_id,
                                    payee_seller_name, pay_time, pay_mode,
                                    pay_channel, version,  state, trade_id,
-                                   totle_seller_fee,seller_fee_state,order_status,relation_id
+                                   totle_seller_fee,seller_fee_state,order_status,relation_id,
+                                   pay_channel_sub
         )
         values
         <foreach collection="list" item="payment" separator=",">
@@ -91,7 +95,8 @@
                 #{payment.payeeAccountId,jdbcType=BIGINT}, #{payment.payeeFundAccountId,jdbcType=BIGINT}, #{payment.payeeSellerId,jdbcType=BIGINT},
                 #{payment.payeeSellerName,jdbcType=VARCHAR}, #{payment.payTime,jdbcType=TIMESTAMP}, #{payment.payMode,jdbcType=INTEGER},
                 #{payment.payChannel,jdbcType=INTEGER}, #{payment.version,jdbcType=INTEGER}, #{payment.state,jdbcType=TINYINT}, #{payment.tradeId,jdbcType=VARCHAR},
-                #{payment.totleSellerFee,jdbcType=BIGINT}, #{payment.sellerFeeState,jdbcType=TINYINT},#{payment.orderStatus,jdbcType=TINYINT}, #{payment.relationId,jdbcType=BIGINT})
+                #{payment.totleSellerFee,jdbcType=BIGINT}, #{payment.sellerFeeState,jdbcType=TINYINT},#{payment.orderStatus,jdbcType=TINYINT}, #{payment.relationId,jdbcType=BIGINT},
+                #{payChannelSub,jdbcType=INTEGER})
         </foreach>
     </insert>
     <update id="updatepayment" parameterType="com.diligrp.etrade.order.model.OrderPayment">