增加orderPayTime

src/main/java/com/sfa/job/domain/order/entity/WdtQimenOrderDetail.java

@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 /**
  * 旺店通订单明细表 wangdiantong_order_detail
  */
-@TableName(value = "finance_order_detail")
+@TableName(value = "wdt_qimen_order_detail")
 @Data
 public class WdtQimenOrderDetail extends BaseDo {
     // 订单唯一键

src/main/resources/mapper/order/WdtQimenOrderDetailMapper.xml

@@ -20,7 +20,7 @@
             #{item.weight}, #{item.imgUrl}, #{item.actualNum}, #{item.barcode}, #{item.paid},
             #{item.suiteId}, #{item.bindOid}, #{item.printSuiteMode}, #{item.flag}, #{item.stockState},
             #{item.isConsigned}, #{item.isReceived}, #{item.cid}, #{item.modifiedDate}, #{item.createdDate},
-            #{item.sharePostPrice}, #{item.invoiceContent}, #{item.payTime}, #{item.shortName},
+            #{item.sharePostPrice}, #{item.invoiceContent}, #{item.payTime}, #{item.orderPayTime}, #{item.shortName},
             #{item.fenxiaoNick}, #{item.fenxiaoId}, #{item.fenxiaoName}, #{item.batchNo},
             #{item.startTime}, #{item.endTime}, #{item.tradeNo}, #{item.shopNo}, #{item.shopName},
             #{item.shopRemark}, #{item.tradeStatus}, #{item.tradeTime}, #{item.consignTime},
@@ -92,6 +92,7 @@
         share_post_price = VALUES(share_post_price),
         invoice_content = VALUES(invoice_content),
         pay_time = VALUES(pay_time),
+        order_pay_time = VALUES(order_pay_time),
         short_name = VALUES(short_name),
         fenxiao_nick = VALUES(fenxiao_nick),
         fenxiao_id = VALUES(fenxiao_id),
@@ -150,7 +151,7 @@
             suite_discount, api_goods_name, api_spec_name, api_goods_id, api_spec_id, goods_id, spec_id,
             commission, goods_type, from_mask, remark, modified, created, prop1, prop2, weight, img_url,
             actual_num, barcode, paid, suite_id, bind_oid, print_suite_mode, flag, stock_state, is_consigned,
-            is_received, cid, modified_date, created_date, share_post_price, invoice_content, pay_time, short_name,
+            is_received, cid, modified_date, created_date, share_post_price, invoice_content, pay_time, order_pay_time,short_name,
             fenxiao_nick, fenxiao_id, fenxiao_name, batch_no, start_time, end_time, trade_no, shop_no, shop_name,
             shop_remark, trade_status, trade_time, consign_time, receiver_area, zbj_name, zbj_id, zbj_zb_id,
             zbj_sale_type, zbj_qd_type, receivable, spec_name_erp, flavor_erp, sync_type, actual_cost,
@@ -218,7 +219,8 @@
         <result column="created_date" property="createdDate" jdbcType="VARCHAR"/>
         <result column="share_post_price" property="sharePostPrice" jdbcType="DECIMAL"/>
         <result column="invoice_content" property="invoiceContent" jdbcType="VARCHAR"/>
-        <result column="pay_time" property="payTime" jdbcType="VARCHAR"/>
+        <result column="pay_time" property="payTime" jdbcType="TIMESTAMP"/>
+        <result column="order_pay_time" property="orderPayTime" jdbcType="TIMESTAMP"/>
         <result column="short_name" property="shortName" jdbcType="VARCHAR"/>
         <result column="fenxiao_nick" property="fenxiaoNick" jdbcType="VARCHAR"/>
         <result column="fenxiao_id" property="fenxiaoId" jdbcType="VARCHAR"/>

src/main/resources/mapper/order/WdtQimenOrderMapper.xml

@@ -8,7 +8,7 @@
             (
             #{item.tradeId}, #{item.tradeNo}, #{item.platformId}, #{item.warehouseType}, #{item.srcTids}, #{item.payAccount}, #{item.tradeStatus}, #{item.tradeType},
             #{item.deliveryTerm}, #{item.receiverRing}, #{item.freezeReason}, #{item.refundStatus}, #{item.fenxiaoType}, #{item.fenxiaoNick}, #{item.tradeTime},
-            #{item.payTime},#{item.orderPayTime}, #{item.consignTime}, #{item.buyerNick}, #{item.receiverName}, #{item.receiverProvince}, #{item.receiverCity}, #{item.receiverDistrict},
+            #{item.payTime}, #{item.consignTime}, #{item.buyerNick}, #{item.receiverName}, #{item.receiverProvince}, #{item.receiverCity}, #{item.receiverDistrict},
             #{item.receiverAddress}, #{item.receiverMobile}, #{item.receiverTelno}, #{item.receiverZip}, #{item.receiverArea}, #{item.receiverDtb}, #{item.badReason},
             #{item.logisticsNo}, #{item.buyerMessage}, #{item.csRemark}, #{item.remarkFlag}, #{item.printRemark}, #{item.goodsTypeCount}, #{item.goodsCount},
             #{item.goodsAmount}, #{item.postAmount}, #{item.otherAmount}, #{item.discount}, #{item.receivable}, #{item.codAmount}, #{item.extCodFee}, #{item.goodsCost},
@@ -42,7 +42,6 @@
         fenxiao_nick = VALUES(fenxiao_nick),
         trade_time = VALUES(trade_time),
         pay_time = VALUES(pay_time),
-        order_pay_time = VALUES(order_pay_time),
         consign_time = VALUES(consign_time),
         buyer_nick = VALUES(buyer_nick),
         receiver_name = VALUES(receiver_name),
@@ -148,7 +147,7 @@
     <sql id="Order_Base_Column_List">
         trade_id, trade_no, platform_id, warehouse_type, src_tids, pay_account, trade_status, trade_type,
         delivery_term, receiver_ring, freeze_reason, refund_status, fenxiao_type, fenxiao_nick, trade_time,
-        pay_time,order_pay_time, consign_time, buyer_nick, receiver_name, receiver_province, receiver_city, receiver_district,
+        pay_time, consign_time, buyer_nick, receiver_name, receiver_province, receiver_city, receiver_district,
         receiver_address, receiver_mobile, receiver_telno, receiver_zip, receiver_area, receiver_dtb, bad_reason,
         logistics_no, buyer_message, cs_remark, remark_flag, print_remark, goods_type_count, goods_count,
         goods_amount, post_amount, other_amount, discount, receivable, cod_amount, ext_cod_fee, goods_cost,
@@ -187,7 +186,7 @@
         INSERT INTO wdt_qimen_order (
             trade_id, trade_no, platform_id, warehouse_type, src_tids, pay_account, trade_status, trade_type,
             delivery_term, receiver_ring, freeze_reason, refund_status, fenxiao_type, fenxiao_nick, trade_time,
-            pay_time, order_pay_time,consign_time, buyer_nick, receiver_name, receiver_province, receiver_city, receiver_district,
+            pay_time,consign_time, buyer_nick, receiver_name, receiver_province, receiver_city, receiver_district,
             receiver_address, receiver_mobile, receiver_telno, receiver_zip, receiver_area, receiver_dtb, bad_reason,
             logistics_no, buyer_message, cs_remark, remark_flag, print_remark, goods_type_count, goods_count,
             goods_amount, post_amount, other_amount, discount, receivable, cod_amount, ext_cod_fee, goods_cost,
@@ -204,7 +203,7 @@
         ) VALUES (
                      #{tradeId}, #{tradeNo}, #{platformId}, #{warehouseType}, #{srcTids}, #{payAccount}, #{tradeStatus}, #{tradeType},
                      #{deliveryTerm}, #{receiverRing}, #{freezeReason}, #{refundStatus}, #{fenxiaoType}, #{fenxiaoNick}, #{tradeTime},
-                     #{payTime},#{orderPayTime}, #{consignTime}, #{buyerNick}, #{receiverName}, #{receiverProvince}, #{receiverCity}, #{receiverDistrict},
+                     #{payTime}, #{consignTime}, #{buyerNick}, #{receiverName}, #{receiverProvince}, #{receiverCity}, #{receiverDistrict},
                      #{receiverAddress}, #{receiverMobile}, #{receiverTelno}, #{receiverZip}, #{receiverArea}, #{receiverDtb}, #{badReason},
                      #{logisticsNo}, #{buyerMessage}, #{csRemark}, #{remarkFlag}, #{printRemark}, #{goodsTypeCount}, #{goodsCount},
                      #{goodsAmount}, #{postAmount}, #{otherAmount}, #{discount}, #{receivable}, #{codAmount}, #{extCodFee}, #{goodsCost},
@@ -240,7 +239,6 @@
             fenxiao_nick = #{fenxiaoNick},
             trade_time = #{tradeTime},
             pay_time = #{payTime},
-            order_pay_time = #{orderPayTime},
             consign_time = #{consignTime},
             buyer_nick = #{buyerNick},
             receiver_name = #{receiverName},