app端对账详情中，缺少财务联系人字段

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

@@ -70,7 +70,23 @@ public class LedgerLogisticsDto implements ILedger {
      */
     private String trading;
     private String tradingLabel;
+    /**
+     * 对账托运方财务联系人电话
+     */
+    private String auditPhone;
 
+    /**
+     * 对账托运方财务联系人名称
+     */
+    private String auditUser;
+    /**
+     * 对账承运方财务联系人名称
+     */
+    private String successUser;
+    /**
+     * 对账承运方财务联系人电话
+     */
+    private String successPhone;
 
     /**
      * 总应收/元

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

@@ -85,6 +85,14 @@ public class LedgerTradeDto implements ILedger {
      * 对账采购财务联系人名称
      */
     private String auditUser;
+    /**
+     * 对账销售财务联系人名称
+     */
+    private String successUser;
+    /**
+     * 对账销售财务联系人电话
+     */
+    private String successPhone;
 
     /**
      * 对账清单凭证

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

@@ -43,5 +43,11 @@ public class LedgerLogisticsDetailVo {
     private List<LogisticsOrderDTO> orderList = new ArrayList<>();
     private String remark;
 
+    /**
+     * 承运方或托运方财务联系人信息
+     */
+    private String user;
+    private String phone;
+
 
 }

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

@@ -41,5 +41,10 @@ public class LedgerTradeDetailVo {
 
     private List<OrderDto> orderList;
     private String remark;
+    /**
+     * 销售联系人或采购联系人信息
+     */
+    private String phone;
+    private String user;
 
 }

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

@@ -604,7 +604,17 @@ public class KwpLedgerLogisticsService extends AbsLedger {
     public LedgerLogisticsDetailVo queryDetail(Long id, Integer unitType) {
         LedgerLogisticsDto ledgerLogisticsDto = logisticsMapper.selectId(id, unitType);
         orderCheck(ledgerLogisticsDto);
-        return getLedgerLogisticsDetailVo(ledgerLogisticsDto);
+        LedgerLogisticsDetailVo detailVo = getLedgerLogisticsDetailVo(ledgerLogisticsDto);
+        //1-托运方 展示
+        if (unitType == 1) {
+            detailVo.setUser(ledgerLogisticsDto.getAuditUser());
+            detailVo.setPhone(ledgerLogisticsDto.getAuditPhone());
+        } else {
+            //对账发起方
+            detailVo.setUser(ledgerLogisticsDto.getSuccessUser());
+            detailVo.setPhone(ledgerLogisticsDto.getSuccessPhone());
+        }
+        return detailVo;
     }
 
     /**

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

@@ -714,7 +714,16 @@ public class KwpLedgerTradeService extends AbsLedger {
         LedgerTradeDto ledgerTradeDto = tradeMapper.selectId(id, unitType);
         orderCheck(ledgerTradeDto);
         //查询对账单关联的贸易订单
-        return getDetail(ledgerTradeDto);
+        LedgerTradeDetailVo detail = getDetail(ledgerTradeDto);
+        //1-采购(销售方查询数据，展示)
+        if (unitType == 1) {
+            detail.setUser(ledgerTradeDto.getAuditUser());
+            detail.setPhone(ledgerTradeDto.getAuditPhone());
+        } else {
+            detail.setUser(ledgerTradeDto.getSuccessUser());
+            detail.setPhone(ledgerTradeDto.getSuccessPhone());
+        }
+        return detail;
     }
 
     public PageRes<OrderDto> orderList(LedgerListReq ledgerListReq) {

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

@@ -151,13 +151,15 @@
         order by kll.generate_time desc
     </select>
     <select id="countSum" resultType="com.sckw.payment.model.vo.res.LedgerCountSumVo">
-        select count(1)             "ledgerCount",
-        sum(kll.total_price) "totalPrice"
+        select IFNULL(count(1), 0)  "ledgerCount",
+               sum(kll.total_price) "totalPrice"
         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

@@ -197,7 +197,7 @@
         order by klt.generate_time desc
     </select>
     <select id="countSum" resultType="com.sckw.payment.model.vo.res.LedgerCountSumVo">
-        select count(1)             "ledgerCount",
+        select IFNULL(count(1), 0)  "ledgerCount",
                sum(klt.total_price) "totalPrice"
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu
@@ -362,6 +362,8 @@
                klt.actual_price  actualPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
+               klt.success_user    successUser,
+               klt.success_phone    successPhone,
                klt.url,
                klt.generate_time generateTime,
                klt.receipt_time  receiptTime,