对账结算功能扩展字段，审核和完成财务联系人id 4.1

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

@@ -13,6 +13,7 @@ import java.time.LocalDateTime;
 
 /**
  * 对账-物流订单
+ *
  * @author xucaiqin
  * @date 2023-07-17 15:34:39
  */
@@ -97,6 +98,11 @@ public class KwpLedgerLogistics {
      */
     @TableField(value = "deduct_price")
     private BigDecimal deductPrice;
+    /**
+     * 托运方财务联系人id
+     */
+    @TableField(value = "audit_user_id")
+    private Long auditUserId;
 
     /**
      * 审核人联系方式（托运方）
@@ -109,6 +115,11 @@ public class KwpLedgerLogistics {
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
+    /**
+     * 承运方财务联系人id
+     */
+    @TableField(value = "success_user_id")
+    private Long successUserId;
     /**
      * 财务联系人(承运方)
      */

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

@@ -99,6 +99,12 @@ public class KwpLedgerTrade {
     @TableField(value = "deduct_price")
     private BigDecimal deductPrice;
 
+    /**
+     * 采购方财务联系人id
+     */
+    @TableField(value = "audit_user_id")
+    private Long auditUserId;
+
     /**
      * 审核人联系方式（采购方）
      */
@@ -110,6 +116,11 @@ public class KwpLedgerTrade {
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
+    /**
+     * 销售方财务联系人id
+     */
+    @TableField(value = "success_user_id")
+    private Long successUserId;
     /**
      * 财务联系人(销售方)
      */

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

@@ -80,6 +80,11 @@ public class KwpSettlementLogistics {
      */
     @TableField(value = "trading")
     private String trading;
+    /**
+     * 对账托运方财务联系人
+     */
+    @TableField(value = "audit_user_id")
+    private Long auditUserId;
     /**
      * 对账托运方财务联系人
      */
@@ -91,7 +96,11 @@ public class KwpSettlementLogistics {
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
-
+    /**
+     * 对账承运方财务联系人
+     */
+    @TableField(value = "success_user_id")
+    private Long successUserId;
     /**
      * 对账承运方财务联系人
      */
@@ -139,4 +148,4 @@ public class KwpSettlementLogistics {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

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

@@ -68,7 +68,11 @@ public class KwpSettlementTrade {
      */
     @TableField(value = "receipt_time")
     private LocalDateTime receiptTime;
-
+    /**
+     * 对账采购财务联系人
+     */
+    @TableField(value = "audit_user_id")
+    private Long auditUserId;
     /**
      * 对账采购财务联系人名称
      */
@@ -81,6 +85,12 @@ public class KwpSettlementTrade {
     @TableField(value = "audit_phone")
     private String auditPhone;
 
+    /**
+     * 对账销售财务联系人
+     */
+    @TableField(value = "success_user_id")
+    private Long successUserId;
+
     /**
      * 对账销售财务联系人名称
      */
@@ -129,4 +139,4 @@ public class KwpSettlementTrade {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerCarrierDto.java

@@ -98,6 +98,11 @@ public class LedgerCarrierDto implements ILedger {
      * 扣款金额
      */
     private BigDecimal deductPrice;
+    /**
+     * 托运方联系人id
+     */
+    private Long auditUserId;
+
     /**
      * 对账审核人电话
      */
@@ -152,4 +157,4 @@ public class LedgerCarrierDto implements ILedger {
      * 订单数量
      */
     private Integer orderCount;
-}
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerLogisticsDto.java

@@ -79,6 +79,8 @@ public class LedgerLogisticsDto implements ILedger {
      * 对账托运方财务联系人名称
      */
     private String auditUser;
+    private Long auditUserId;
+    private Long successUserId;
     /**
      * 对账承运方财务联系人名称
      */
@@ -154,4 +156,4 @@ public class LedgerLogisticsDto implements ILedger {
      * 订单数量
      */
     private Integer orderCount;
-}
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerShipperDto.java

@@ -79,6 +79,11 @@ public class LedgerShipperDto implements ILedger {
      * 扣款金额
      */
     private BigDecimal deductPrice;
+    /**
+     * 财务联系人id
+     */
+    private Long successUserId;
+
     /**
      * 对账审核人电话（承运方）
      */
@@ -135,4 +140,4 @@ public class LedgerShipperDto implements ILedger {
     private Integer orderCount;
 
 
-}
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/LedgerLogistics.java

@@ -49,7 +49,6 @@ public class LedgerLogistics implements ILedger {
     private String carrierFirmName;
 
 
-
     /**
      * 发票税率（%）
      */
@@ -61,6 +60,8 @@ public class LedgerLogistics implements ILedger {
      */
     private String trading;
     private String tradingLabel;
+    private Long auditUserId;
+
     /**
      * 对账托运方财务联系人电话
      */
@@ -70,10 +71,12 @@ public class LedgerLogistics implements ILedger {
      * 对账托运方财务联系人名称
      */
     private String auditUser;
+    private String successUser;
+
     /**
      * 对账承运方财务联系人名称
      */
-    private String successUser;
+    private Long successUserId;
     /**
      * 对账承运方财务联系人电话
      */
@@ -137,4 +140,4 @@ public class LedgerLogistics implements ILedger {
      * 订单数量
      */
     private Integer orderCount;
-}
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LedgerConfirmReq.java

@@ -17,6 +17,8 @@ import lombok.Setter;
 public class LedgerConfirmReq implements IdsList {
     @NotNull(message = "id不能为空")
     private String id;
+
+    private Long auditUserId;
     /**
      * 对账审核人
      */
@@ -29,6 +31,6 @@ public class LedgerConfirmReq implements IdsList {
 //    @NotBlank(message = "对账审核人联系方式为空")
     @Size(max = 11, message = "对账审核人联系方式不能超过11个字符")
     private String auditPhone;
-//    @NotBlank(message = "对账清单凭证不能为空")
+    //    @NotBlank(message = "对账清单凭证不能为空")
     private String url;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LedgerSuccessReq.java

@@ -20,15 +20,17 @@ import java.time.LocalDate;
 public class LedgerSuccessReq implements IdsList {
     @NotBlank(message = "物流对账单id不能为空")
     private String id;
-//    @NotBlank(message = "财务联系人不能为空")
+    private Long successUserId;
+
+    //    @NotBlank(message = "财务联系人不能为空")
     @Size(max = 25, message = "财务联系人不能超过25个字符")
     private String successUser;
 
-//    @NotNull(message = "预计收款日期不能为空")
+    //    @NotNull(message = "预计收款日期不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate receiptTime;
 
-//    @NotBlank(message = "财务联系电话不能为空")
+    //    @NotBlank(message = "财务联系电话不能为空")
     @Size(max = 11, message = "财务联系电话不能超过11个字符")
     private String successPhone;
 

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

@@ -530,6 +530,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setStatus(LedgerEnum.LEDGERED.getStatus());
         kwpLedgerLogistics.setAuditPhone(confirmReq.getAuditPhone());
         kwpLedgerLogistics.setAuditUser(confirmReq.getAuditUser());
+        kwpLedgerLogistics.setAuditUserId(confirmReq.getAuditUserId());
         kwpLedgerLogistics.setUrl(confirmReq.getUrl());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
@@ -577,6 +578,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         }
         kwpLedgerLogistics.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpLedgerLogistics.setSuccessUser(ledgerReq.getSuccessUser());
+        kwpLedgerLogistics.setSuccessUserId(ledgerReq.getSuccessUserId());
         kwpLedgerLogistics.setStatus(LedgerEnum.SUCCESS.getStatus());
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
@@ -594,8 +596,10 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpSettlementLogistics.setActualPrice(kwpLedgerLogistics.getActualPrice());
         kwpSettlementLogistics.setTrading(kwpLedgerLogistics.getTrading());
         kwpSettlementLogistics.setRemark(Global.EMPTY_STRING);
+        kwpSettlementLogistics.setAuditUserId(kwpLedgerLogistics.getAuditUserId());
         kwpSettlementLogistics.setAuditUser(kwpLedgerLogistics.getAuditUser());
         kwpSettlementLogistics.setAuditPhone(kwpLedgerLogistics.getAuditPhone());
+        kwpSettlementLogistics.setSuccessUserId(ledgerReq.getSuccessUserId());
         kwpSettlementLogistics.setSuccessUser(ledgerReq.getSuccessUser());
         kwpSettlementLogistics.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementLogistics.setReceiptTime(receiptTime);

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

@@ -546,6 +546,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setStatus(LedgerEnum.LEDGERED.getStatus());
         kwpLedgerTrade.setAuditPhone(confirmReq.getAuditPhone());
         kwpLedgerTrade.setAuditUser(confirmReq.getAuditUser());
+        kwpLedgerTrade.setAuditUserId(confirmReq.getAuditUserId());
         kwpLedgerTrade.setUrl(confirmReq.getUrl());
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
@@ -598,6 +599,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         }
         kwpLedgerTrade.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpLedgerTrade.setSuccessUser(ledgerReq.getSuccessUser());
+        kwpLedgerTrade.setSuccessUserId(ledgerReq.getSuccessUserId());
         kwpLedgerTrade.setStatus(LedgerEnum.SUCCESS.getStatus());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
@@ -612,8 +614,10 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpSettlementTrade.setActualPrice(kwpLedgerTrade.getActualPrice());
         kwpSettlementTrade.setRemark(Global.EMPTY_STRING);
         kwpSettlementTrade.setTrading(kwpLedgerTrade.getTrading());
+        kwpSettlementTrade.setAuditUserId(kwpLedgerTrade.getAuditUserId());
         kwpSettlementTrade.setAuditUser(kwpLedgerTrade.getAuditUser());
         kwpSettlementTrade.setAuditPhone(kwpLedgerTrade.getAuditPhone());
+        kwpSettlementTrade.setSuccessUserId(ledgerReq.getSuccessUserId());
         kwpSettlementTrade.setSuccessUser(ledgerReq.getSuccessUser());
         kwpSettlementTrade.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementTrade.setReceiptTime(receiptTime);

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

@@ -17,8 +17,10 @@
         <result column="settle_price" jdbcType="DECIMAL" property="settlePrice"/>
         <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
         <result column="deduct_price" jdbcType="DECIMAL" property="deductPrice"/>
+        <result column="audit_user_id" jdbcType="VARCHAR" property="auditUserId"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
+        <result column="success_user_id" jdbcType="VARCHAR" property="successUserId"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
         <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
         <result column="url" jdbcType="VARCHAR" property="url"/>
@@ -48,8 +50,10 @@
         settle_price,
         actual_price,
         deduct_price,
+        audit_user_id,
         audit_user,
         audit_phone,
+        success_user_id,
         success_user,
         success_phone,
         url,
@@ -79,6 +83,8 @@
         kll.deduct_price  deductPrice,
         kll.audit_phone   auditPhone,
         kll.audit_user    auditUser,
+        kll.audit_user_id    auditUserId,
+        kll.success_user_id  successUserId,
         kll.success_phone successPhone,
         kll.success_user  successUser,
         kll.url,
@@ -95,30 +101,31 @@
     </sql>
     <select id="shipperSelect" resultType="com.sckw.payment.model.dto.LedgerShipperDto">
         select kll.id,
-               kll.l_ledger_no   lLedgerNo,
+               kll.l_ledger_no     lLedgerNo,
                kll.name,
-               kll.start_time    startTime,
-               kll.end_time      endTime,
-               kll.tax_rate      taxRate,
+               kll.start_time      startTime,
+               kll.end_time        endTime,
+               kll.tax_rate        taxRate,
                kll.trading,
-               kll.total_price   totalPrice,
-               kll.ex_tax_price  exTaxPrice,
-               kll.settle_price  settlePrice,
-               kll.actual_price  actualPrice,
-               kll.deduct_price  deductPrice,
-               kll.success_phone successPhone,
-               kll.success_user  successUser,
+               kll.total_price     totalPrice,
+               kll.ex_tax_price    exTaxPrice,
+               kll.settle_price    settlePrice,
+               kll.actual_price    actualPrice,
+               kll.deduct_price    deductPrice,
+               kll.success_user_id successUserId,
+               kll.success_phone   successPhone,
+               kll.success_user    successUser,
                kll.url,
-               kll.generate_time generateTime,
-               kll.receipt_time  receiptTime,
+               kll.generate_time   generateTime,
+               kll.receipt_time    receiptTime,
                kll.remark,
                kll.status,
-               kll.create_by     createBy,
-               kllu.top_ent_id   checkEntId,
+               kll.create_by       createBy,
+               kllu.top_ent_id     checkEntId,
                kllu.contacts,
                kllu.phone,
-               kllu.firm_name    firmName,
-               kll.order_count   orderCount
+               kllu.firm_name      firmName,
+               kll.order_count     orderCount
         from kwp_ledger_logistics kll
                  inner join kwp_ledger_logistics_unit kllu
                             on kll.id = kllu.l_ledger_id and kllu.del_flag = 0 and
@@ -196,6 +203,8 @@
                kll.deduct_price  AS deductPrice,
                kll.audit_phone   AS auditPhone,
                kll.audit_user    AS auditUser,
+               kll.audit_user_id    auditUserId,
+               kll.success_user_id  successUserId,
                kll.success_phone AS successPhone,
                kll.success_user  AS successUser,
                kll.url           AS url,
@@ -254,6 +263,8 @@
                kll.deduct_price  AS deductPrice,
                kll.audit_phone      auditPhone,
                kll.audit_user       auditUser,
+               kll.audit_user_id    auditUserId,
+               kll.success_user_id  successUserId,
                kll.success_phone AS successPhone,
                kll.success_user  AS successUser,
                kll.url           AS url,
@@ -797,4 +808,4 @@
             </choose>
         </where>
     </select>
-</mapper>
+</mapper>

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

@@ -18,7 +18,9 @@
         <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
         <result column="deduct_price" jdbcType="DECIMAL" property="deductPrice"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
+        <result column="audit_user_id" jdbcType="VARCHAR" property="auditUserId"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
+        <result column="success_user_id" jdbcType="VARCHAR" property="successUserId"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
         <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
         <result column="generate_time" jdbcType="TIMESTAMP" property="generateTime"/>
@@ -48,8 +50,10 @@
         settle_price,
         actual_price,
         deduct_price,
+        audit_user_id,
         audit_user,
         audit_phone,
+        success_user_id,
         success_user,
         success_phone,
         generate_time,
@@ -79,6 +83,7 @@
         klt.deduct_price  deductPrice,
         klt.audit_phone   auditPhone,
         klt.audit_user    auditUser,
+        klt.audit_user_id auditUserId,
         klt.url,
         klt.generate_time generateTime,
         klt.receipt_time  receiptTime,
@@ -92,29 +97,30 @@
     </sql>
     <sql id="purchase_col">
         klt.id,
-        klt.t_ledger_no   tLedgerNo,
+        klt.t_ledger_no     tLedgerNo,
         klt.name,
-        klt.start_time    startTime,
-        klt.end_time      endTime,
-        klt.tax_rate      taxRate,
+        klt.start_time      startTime,
+        klt.end_time        endTime,
+        klt.tax_rate        taxRate,
         klt.trading,
-        klt.total_price   totalPrice,
-        klt.ex_tax_price  exTaxPrice,
-        klt.settle_price  settlePrice,
-        klt.actual_price  actualPrice,
-        klt.deduct_price  deductPrice,
-        klt.success_phone successPhone,
-        klt.success_user  successUser,
+        klt.total_price     totalPrice,
+        klt.ex_tax_price    exTaxPrice,
+        klt.settle_price    settlePrice,
+        klt.actual_price    actualPrice,
+        klt.deduct_price    deductPrice,
+        klt.success_phone   successPhone,
+        klt.success_user    successUser,
+        klt.success_user_id successUserId,
         klt.url,
-        klt.generate_time generateTime,
-        klt.receipt_time  receiptTime,
+        klt.generate_time   generateTime,
+        klt.receipt_time    receiptTime,
         klt.remark,
-        klt.create_by     createBy,
+        klt.create_by       createBy,
         klt.status,
         kltu.contacts,
         kltu.phone,
-        kltu.firm_name    firmName,
-        klt.order_count   orderCount
+        kltu.firm_name      firmName,
+        klt.order_count     orderCount
     </sql>
     <!--销售2 采购1-->
     <select id="sellList" resultType="com.sckw.payment.model.dto.LedgerSellDto">
@@ -180,32 +186,34 @@
     </select>
     <select id="list" resultType="com.sckw.payment.model.vo.LedgerSell">
         select klt.id,
-               klt.t_ledger_no   tLedgerNo,
+               klt.t_ledger_no     tLedgerNo,
                klt.name,
-               klt.start_time    startTime,
-               klt.end_time      endTime,
-               klt.tax_rate      taxRate,
+               klt.start_time      startTime,
+               klt.end_time        endTime,
+               klt.tax_rate        taxRate,
                klt.trading,
-               klt.total_price   totalPrice,
-               klt.ex_tax_price  exTaxPrice,
-               klt.settle_price  settlePrice,
-               klt.actual_price  actualPrice,
-               klt.deduct_price  deductPrice,
-               klt.audit_phone   auditPhone,
-               klt.audit_user    auditUser,
-               klt.success_user  successUser,
-               klt.success_phone successPhone,
+               klt.total_price     totalPrice,
+               klt.ex_tax_price    exTaxPrice,
+               klt.settle_price    settlePrice,
+               klt.actual_price    actualPrice,
+               klt.deduct_price    deductPrice,
+               klt.audit_phone     auditPhone,
+               klt.audit_user      auditUser,
+               klt.audit_user_id   auditUserId,
+               klt.success_user_id successUserId,
+               klt.success_user    successUser,
+               klt.success_phone   successPhone,
                klt.url,
-               klt.generate_time generateTime,
-               klt.receipt_time  receiptTime,
+               klt.generate_time   generateTime,
+               klt.receipt_time    receiptTime,
                klt.remark,
                klt.status,
-               klt.create_by     createBy,
+               klt.create_by       createBy,
                kltu.contacts,
                kltu.phone,
-               kltu.firm_name    purchaseFirmName,
-               kltu2.firm_name   sellFirmName,
-               klt.order_count   orderCount
+               kltu.firm_name      purchaseFirmName,
+               kltu2.firm_name     sellFirmName,
+               klt.order_count     orderCount
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu
                             on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and
@@ -246,32 +254,34 @@
     </select>
     <select id="selectIds" resultType="com.sckw.payment.model.vo.LedgerSell">
         select klt.id,
-               klt.t_ledger_no   tLedgerNo,
+               klt.t_ledger_no     tLedgerNo,
                klt.name,
-               klt.start_time    startTime,
-               klt.end_time      endTime,
-               klt.tax_rate      taxRate,
+               klt.start_time      startTime,
+               klt.end_time        endTime,
+               klt.tax_rate        taxRate,
                klt.trading,
-               klt.total_price   totalPrice,
-               klt.ex_tax_price  exTaxPrice,
-               klt.settle_price  settlePrice,
-               klt.actual_price  actualPrice,
-               klt.deduct_price  deductPrice,
-               klt.audit_phone   auditPhone,
-               klt.audit_user    auditUser,
-               klt.success_user  successUser,
-               klt.success_phone successPhone,
+               klt.total_price     totalPrice,
+               klt.ex_tax_price    exTaxPrice,
+               klt.settle_price    settlePrice,
+               klt.actual_price    actualPrice,
+               klt.deduct_price    deductPrice,
+               klt.audit_phone     auditPhone,
+               klt.audit_user      auditUser,
+               klt.audit_user_id   auditUserId,
+               klt.success_user_id successUserId,
+               klt.success_user    successUser,
+               klt.success_phone   successPhone,
                klt.url,
-               klt.generate_time generateTime,
-               klt.receipt_time  receiptTime,
+               klt.generate_time   generateTime,
+               klt.receipt_time    receiptTime,
                klt.remark,
                klt.status,
-               klt.create_by     createBy,
+               klt.create_by       createBy,
                kltu.contacts,
                kltu.phone,
-               kltu.firm_name    purchaseFirmName,
-               kltu2.firm_name   sellFirmName,
-               klt.order_count   orderCount
+               kltu.firm_name      purchaseFirmName,
+               kltu2.firm_name     sellFirmName,
+               klt.order_count     orderCount
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu
                             on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and
@@ -677,6 +687,7 @@
                klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
+               klt.audit_user_id auditUserId,
                klt.url,
                klt.generate_time generateTime,
                klt.receipt_time  receiptTime,
@@ -713,6 +724,7 @@
                klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
+               klt.audit_user_id    auditUserId,
                klt.url,
                klt.generate_time generateTime,
                klt.receipt_time  receiptTime,
@@ -736,31 +748,33 @@
     </select>
     <select id="selectId" resultType="com.sckw.payment.model.dto.LedgerTradeDto">
         select klt.id,
-               klt.t_ledger_no   tLedgerNo,
+               klt.t_ledger_no     tLedgerNo,
                klt.name,
-               klt.start_time    startTime,
-               klt.end_time      endTime,
-               klt.tax_rate      taxRate,
+               klt.start_time      startTime,
+               klt.end_time        endTime,
+               klt.tax_rate        taxRate,
                klt.trading,
-               klt.total_price   totalPrice,
-               klt.ex_tax_price  exTaxPrice,
-               klt.settle_price  settlePrice,
-               klt.actual_price  actualPrice,
-               klt.deduct_price  deductPrice,
-               klt.audit_phone   auditPhone,
-               klt.audit_user    auditUser,
-               klt.success_user  successUser,
-               klt.success_phone successPhone,
+               klt.total_price     totalPrice,
+               klt.ex_tax_price    exTaxPrice,
+               klt.settle_price    settlePrice,
+               klt.actual_price    actualPrice,
+               klt.deduct_price    deductPrice,
+               klt.audit_phone     auditPhone,
+               klt.audit_user      auditUser,
+               klt.audit_user_id   auditUserId,
+               klt.success_user_id successUserId,
+               klt.success_user    successUser,
+               klt.success_phone   successPhone,
                klt.url,
-               klt.generate_time generateTime,
-               klt.receipt_time  receiptTime,
+               klt.generate_time   generateTime,
+               klt.receipt_time    receiptTime,
                klt.remark,
                klt.status,
                kltu.contacts,
-               kltu.top_ent_id   purchaseEntId,
+               kltu.top_ent_id     purchaseEntId,
                kltu.phone,
-               kltu.firm_name    firmName,
-               klt.order_count   orderCount
+               kltu.firm_name      firmName,
+               klt.order_count     orderCount
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu on klt.id = kltu.t_ledger_id and kltu.del_flag = 0
         <where>
@@ -926,4 +940,4 @@
             </choose>
         </where>
     </select>
-</mapper>
+</mapper>

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

@@ -16,6 +16,8 @@
         <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="audit_user_id" jdbcType="VARCHAR" property="auditUserId"/>
+        <result column="success_user_id" jdbcType="VARCHAR" property="successUserId"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
         <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
         <result column="status" jdbcType="INTEGER" property="status"/>
@@ -39,6 +41,8 @@
         trading,
         audit_user,
         audit_phone,
+        audit_user_id,
+        success_user_id,
         success_user,
         success_phone,
         status,
@@ -584,4 +588,4 @@
         WHERE ksl.del_flag = 0
         GROUP BY kllu.top_ent_id
     </select>
-</mapper>
+</mapper>

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

@@ -14,6 +14,8 @@
         <result column="receipt_time" jdbcType="TIMESTAMP" property="receiptTime"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
+        <result column="audit_user_id" jdbcType="VARCHAR" property="auditUserId"/>
+        <result column="success_user_id" jdbcType="VARCHAR" property="successUserId"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
         <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
         <result column="trading" jdbcType="VARCHAR" property="trading"/>
@@ -37,9 +39,11 @@
         receipt_time,
         audit_user,
         audit_phone,
+        audit_user_id,
+        success_user_id,
         success_user,
-        trading,
         success_phone,
+        trading,
         remark,
         `status`,
         create_by,
@@ -627,4 +631,4 @@
             </choose>
         </where>
     </select>
-</mapper>
+</mapper>