Merge branch 'dev' of http://git.sckaiwu.cn/17358629955/sckw-service-platform into dev

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

@@ -107,6 +107,17 @@ public class KwpLedgerLogistics {
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
+    /**
+     * 财务联系人(承运方)
+     */
+    @TableField(value = "success_user")
+    private String successUser;
+
+    /**
+     * 财务联系人电话(承运方)
+     */
+    @TableField(value = "success_phone")
+    private String successPhone;
 
     /**
      * 对账清单凭证

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

@@ -107,6 +107,17 @@ public class KwpLedgerTrade {
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
+    /**
+     * 财务联系人(销售方)
+     */
+    @TableField(value = "success_user")
+    private String successUser;
+
+    /**
+     * 财务联系人电话(销售方)
+     */
+    @TableField(value = "success_phone")
+    private String successPhone;
 
     /**
      * 生成时间

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

@@ -27,4 +27,8 @@ public interface ILedger {
 
 
     void setStatusLabel(String statusLabel);
+
+    Long getCreateBy();
+
+    void setCreateByName(String createByName);
 }

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

@@ -137,6 +137,11 @@ public class LedgerCarrierDto implements ILedger {
      */
     private String phone;
     private String firmName;
+    /**
+     * 创建人
+     */
+    private Long createBy;
+    private String createByName;
 
     /**
      * 订单数量

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

@@ -116,7 +116,11 @@ public class LedgerLogisticsDto implements ILedger {
      */
     private Integer status;
     private String statusLabel;
-
+    /**
+     * 创建人
+     */
+    private Long createBy;
+    private String createByName;
     /**
      * 客户联系人
      */

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

@@ -78,14 +78,14 @@ public class LedgerPurchaseDto implements ILedger {
     private BigDecimal actualPrice;
 
     /**
-     * 对账审核人电话
+     * 对账完成人电话(销售方)
      */
-    private String auditPhone;
+    private String successPhone;
 
     /**
-     * 对账审核人名称
+     * 对账完成人名称(销售方)
      */
-    private String auditUser;
+    private String successUser;
 
     /**
      * 对账清单凭证
@@ -116,6 +116,12 @@ public class LedgerPurchaseDto implements ILedger {
     private String phone;
     private String firmName;
 
+    /**
+     * 创建人
+     */
+    private Long createBy;
+    private String createByName;
+
     /**
      * 订单数量
      */

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

@@ -115,6 +115,11 @@ public class LedgerSellDto implements ILedger {
     private String contacts;
     private String phone;
     private String firmName;
+    /**
+     * 创建人
+     */
+    private Long createBy;
+    private String createByName;
 
     /**
      * 订单数量

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

@@ -76,14 +76,14 @@ public class LedgerShipperDto implements ILedger {
      */
     private BigDecimal actualPrice;
     /**
-     * 对账审核人电话
+     * 对账审核人电话（承运方）
      */
-    private String auditPhone;
+    private String successPhone;
 
     /**
-     * 对账审核人名称
+     * 对账审核人名称（承运方）
      */
-    private String auditUser;
+    private String successUser;
     /**
      * 对账清单凭证
      */
@@ -119,6 +119,11 @@ public class LedgerShipperDto implements ILedger {
      */
     private String phone;
     private String firmName;
+    /**
+     * 创建人
+     */
+    private Long createBy;
+    private String createByName;
 
     /**
      * 订单数量

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

@@ -114,7 +114,8 @@ public class LedgerTradeDto implements ILedger {
     private String contacts;
     private String phone;
     private String firmName;
-
+    private Long createBy;
+    private String createByName;
     /**
      * 订单数量
      */

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

@@ -58,14 +58,14 @@ public class SettlementPurchaseDto implements ISettlement {
     private Date receiptTime;
 
     /**
-     * 对账销售财务联系人名称
+     * 对账采购财务联系人名称
      */
-    private String successUser;
+    private String auditUser;
 
     /**
-     * 对账销售财务联系人电话
+     * 对账采购财务联系人电话
      */
-    private String successPhone;
+    private String auditPhone;
     /**
      * 交易方式
      */

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

@@ -57,14 +57,14 @@ public class SettlementSellDto implements ISettlement {
     private Date receiptTime;
 
     /**
-     * 对账采购财务联系人名称
+     * 对账销售财务联系人名称
      */
-    private String auditUser;
+    private String successUser;
 
     /**
-     * 对账采购财务联系人电话
+     * 对账销售财务联系人电话
      */
-    private String auditPhone;
+    private String successPhone;
 
     /**
      * 交易方式(预付款、货到付款）

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

@@ -31,6 +31,7 @@ import com.sckw.payment.model.vo.res.LedgerLogisticsDetailVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
+import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.transport.api.dubbo.TransportDubboService;
 import com.sckw.transport.api.model.dto.AccountCheckingBindDTO;
 import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
@@ -89,6 +90,11 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             logisticsDto.setTaxRateLabel(taxRateMap.get(String.valueOf(taxRate)));
 
             logisticsDto.setStatusLabel(LedgerEnum.getDesc(logisticsDto.getStatus()));
+
+            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(logisticsDto.getCreateBy());
+            if (Objects.nonNull(userCacheResDto)) {
+                logisticsDto.setCreateByName(userCacheResDto.getName());
+            }
         }
     }
 
@@ -491,6 +497,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             receiptTime = LocalDateTime.of(ledgerReq.getReceiptTime(), LocalTime.MIN);
             kwpLedgerLogistics.setReceiptTime(receiptTime);
         }
+        kwpLedgerLogistics.setSuccessPhone(ledgerReq.getSuccessPhone());
+        kwpLedgerLogistics.setSuccessUser(ledgerReq.getSuccessUser());
         kwpLedgerLogistics.setStatus(LedgerEnum.SUCCESS.getStatus());
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());

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

@@ -27,6 +27,7 @@ import com.sckw.payment.model.vo.res.LedgerTradeDetailVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
+import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
@@ -86,6 +87,10 @@ public class KwpLedgerTradeService extends AbsLedger {
             tradeDto.setTaxRateLabel(taxRateMap.get(String.valueOf(taxRate)));
 
             tradeDto.setStatusLabel(LedgerEnum.getDesc(tradeDto.getStatus()));
+            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(tradeDto.getCreateBy());
+            if (Objects.nonNull(userCacheResDto)) {
+                tradeDto.setCreateByName(userCacheResDto.getName());
+            }
         }
     }
 
@@ -500,6 +505,8 @@ public class KwpLedgerTradeService extends AbsLedger {
             receiptTime = LocalDateTime.of(ledgerReq.getReceiptTime(), LocalTime.MIN);
             kwpLedgerTrade.setReceiptTime(receiptTime);
         }
+        kwpLedgerTrade.setSuccessPhone(ledgerReq.getSuccessPhone());
+        kwpLedgerTrade.setSuccessUser(ledgerReq.getSuccessUser());
         kwpLedgerTrade.setStatus(LedgerEnum.SUCCESS.getStatus());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
@@ -757,7 +764,7 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @return
      */
     public List<String> checkOrder(Long entId, Long entTarget) {
-        return tradeMapper.selectJoin(entId,entTarget);
+        return tradeMapper.selectJoin(entId, entTarget);
     }
 
     /**

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

@@ -18,6 +18,8 @@
         <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <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="url" jdbcType="VARCHAR" property="url"/>
         <result column="generate_time" jdbcType="TIMESTAMP" property="generateTime"/>
         <result column="receipt_time" jdbcType="TIMESTAMP" property="receiptTime"/>
@@ -46,6 +48,8 @@
         actual_price,
         audit_user,
         audit_phone,
+        success_user,
+        success_phone,
         url,
         generate_time,
         receipt_time,
@@ -72,11 +76,14 @@
         kll.actual_price  actualPrice,
         kll.audit_phone   auditPhone,
         kll.audit_user    auditUser,
+        kll.success_phone successPhone,
+        kll.success_user  successUser,
         kll.url,
         kll.generate_time generateTime,
         kll.receipt_time  receiptTime,
         kll.remark,
         kll.status,
+        kll.create_by createBy,
         kllu.top_ent_id   checkEntId,
         kllu.contacts,
         kllu.phone,
@@ -84,13 +91,37 @@
         kll.order_count   orderCount
     </sql>
     <select id="shipperSelect" resultType="com.sckw.payment.model.dto.LedgerShipperDto">
-        select
-        <include refid="list_col"/>
+        select kll.id,
+               kll.l_ledger_no   lLedgerNo,
+               kll.name,
+               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.success_phone successPhone,
+               kll.success_user  successUser,
+               kll.url,
+               kll.generate_time generateTime,
+               kll.receipt_time  receiptTime,
+               kll.remark,
+               kll.status,
+               kll.create_by     createBy,
+               kllu.top_ent_id   checkEntId,
+               kllu.contacts,
+               kllu.phone,
+               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 kllu.unit_type = #{logisticsReq.unitType,jdbcType=INTEGER}
+                            on kll.id = kllu.l_ledger_id and kllu.del_flag = 0 and
+                               kllu.unit_type = #{logisticsReq.unitType,jdbcType=INTEGER}
                  inner join kwp_ledger_logistics_unit kllu2
-                            on kll.id = kllu2.l_ledger_id and kllu2.del_flag = 0 and kllu2.unit_type = #{logisticsReq.unitTypeTwo,jdbcType=INTEGER}
+                            on kll.id = kllu2.l_ledger_id and kllu2.del_flag = 0 and
+                               kllu2.unit_type = #{logisticsReq.unitTypeTwo,jdbcType=INTEGER}
         <where>
             kll.del_flag = 0
               and kllu2.top_ent_id = #{logisticsReq.entId,jdbcType=BIGINT}

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

@@ -18,6 +18,8 @@
         <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <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="generate_time" jdbcType="TIMESTAMP" property="generateTime"/>
         <result column="receipt_time" jdbcType="TIMESTAMP" property="receiptTime"/>
         <result column="url" jdbcType="VARCHAR" property="url"/>
@@ -46,6 +48,8 @@
         actual_price,
         audit_user,
         audit_phone,
+        success_user,
+        success_phone,
         generate_time,
         receipt_time,
         url,
@@ -77,6 +81,7 @@
         klt.receipt_time  receiptTime,
         klt.remark,
         klt.status,
+        klt.create_by     createBy,
         kltu.contacts,
         kltu.phone,
         kltu.firm_name    firmName,
@@ -94,12 +99,13 @@
         klt.ex_tax_price  exTaxPrice,
         klt.settle_price  settlePrice,
         klt.actual_price  actualPrice,
-        klt.audit_phone   auditPhone,
-        klt.audit_user    auditUser,
+        klt.success_phone   successPhone,
+        klt.success_user    successUser,
         klt.url,
         klt.generate_time generateTime,
         klt.receipt_time  receiptTime,
         klt.remark,
+        klt.create_by     createBy,
         klt.status,
         kltu.contacts,
         kltu.phone,