字段冗余

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementLogistics.java

@@ -75,7 +75,11 @@ public class KwpSettlementLogistics {
      */
     @TableField(value = "remark")
     private String remark;
-
+    /**
+     * 冗余字段，写统计接口时增加
+     */
+    @TableField(value = "trading")
+    private String trading;
     /**
      * 对账托运方财务联系人
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementTrade.java

@@ -92,7 +92,11 @@ public class KwpSettlementTrade {
      */
     @TableField(value = "success_phone")
     private String successPhone;
-
+    /**
+     * 冗余字段，写统计接口时增加
+     */
+    @TableField(value = "trading")
+    private String trading;
     /**
      * 备注
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -579,6 +579,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //实际结算金额就是结算单实际需付金额
         kwpSettlementLogistics.setTotalPrice(kwpLedgerLogistics.getSettlePrice());
         kwpSettlementLogistics.setActualPrice(kwpLedgerLogistics.getActualPrice());
+        kwpSettlementLogistics.setTrading(kwpLedgerLogistics.getTrading());
         kwpSettlementLogistics.setRemark(Global.EMPTY_STRING);
         kwpSettlementLogistics.setAuditUser(kwpLedgerLogistics.getAuditUser());
         kwpSettlementLogistics.setAuditPhone(kwpLedgerLogistics.getAuditPhone());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -587,6 +587,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpSettlementTrade.setTotalPrice(kwpLedgerTrade.getSettlePrice());
         kwpSettlementTrade.setActualPrice(kwpLedgerTrade.getActualPrice());
         kwpSettlementTrade.setRemark(Global.EMPTY_STRING);
+        kwpSettlementTrade.setTrading(kwpLedgerTrade.getTrading());
         kwpSettlementTrade.setAuditUser(kwpLedgerTrade.getAuditUser());
         kwpSettlementTrade.setAuditPhone(kwpLedgerTrade.getAuditPhone());
         kwpSettlementTrade.setSuccessUser(ledgerReq.getSuccessUser());

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementLogisticsMapper.xml

@@ -13,6 +13,7 @@
         <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
         <result column="receipt_time" jdbcType="TIMESTAMP" property="receiptTime"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="trading" jdbcType="VARCHAR" property="trading"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
@@ -35,6 +36,7 @@
         actual_price,
         receipt_time,
         remark,
+        trading,
         audit_user,
         audit_phone,
         success_user,

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementTradeMapper.xml

@@ -16,6 +16,7 @@
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
         <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
+        <result column="trading" jdbcType="VARCHAR" property="trading"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
         <result column="status" jdbcType="INTEGER" property="status"/>
         <result column="create_by" jdbcType="BIGINT" property="createBy"/>
@@ -37,6 +38,7 @@
         audit_user,
         audit_phone,
         success_user,
+        trading,
         success_phone,
         remark,
         `status`,