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

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementLogisticsController.java

@@ -52,8 +52,8 @@ public class KwpSettlementLogisticsController {
      */
     @PostMapping(name = "运费收款-根据条件导出物流订单表数据", path = "exportCollection")
     public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
-        settlementReq.setUnitType(LogisticsUnitType.CARRIER);
-        settlementReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
+        settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
+        settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
         List<SettlementLogisticsDto> list;
         list = kwpSettlementLogisticsService.selectList(settlementReq);
         return this.export(response, list);
@@ -85,8 +85,8 @@ public class KwpSettlementLogisticsController {
      */
     @PostMapping(name = "运费付款-根据条件导出物流订单表数据", path = "exportPayment")
     public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
-        settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
-        settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
+        settlementReq.setUnitType(LogisticsUnitType.CARRIER);
+        settlementReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
         List<SettlementLogisticsDto> list;
         list = kwpSettlementLogisticsService.selectList(settlementReq);
         return this.export(response, list);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementTradeMapper.java

@@ -37,6 +37,7 @@ public interface KwpSettlementTradeMapper extends BaseMapper<KwpSettlementTrade>
 
     /**
      * 运营端统计
+     *
      * @param settlementReq
      * @return
      */
@@ -46,6 +47,7 @@ public interface KwpSettlementTradeMapper extends BaseMapper<KwpSettlementTrade>
 
     /**
      * 运营端统计结算单数量
+     *
      * @param settlementReq
      * @return
      */
@@ -78,6 +80,21 @@ public interface KwpSettlementTradeMapper extends BaseMapper<KwpSettlementTrade>
 
     List<KwpSettlementRecord> queryRecord();
 
-    List<SettlementTradeDto> exportList(@Param("settlementReq")SettlementTradeReq settlementReq, @Param("idList")List<Long> idList);
-    List<SettlementTrade> operateExportList(@Param("settlementReq")SettlementTradeReq settlementReq, @Param("idList")List<Long> idList);
+    /**
+     * 导出数据查询
+     *
+     * @param settlementReq
+     * @param idList
+     * @return
+     */
+    List<SettlementTradeDto> exportList(@Param("settlementReq") SettlementTradeReq settlementReq, @Param("idList") List<Long> idList);
+
+    /**
+     * 运营端导出数据
+     *
+     * @param settlementReq
+     * @param idList
+     * @return
+     */
+    List<SettlementTrade> operateExportList(@Param("settlementReq") SettlementTradeReq settlementReq, @Param("idList") List<Long> idList);
 }

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

@@ -19,35 +19,43 @@ import java.util.Date;
 @ExcelContext(fileName = "物流结算订单列表", sheetName = "物流结算订单列表")
 public class SettlementLogisticsVo {
 
+    @ExcelProperty(value = "状态")
+    private String statusLabel;
     /**
-     * 主键
+     * 结算单编号
      */
-    @ExcelProperty(value = "主键")
-    private Long id;
+    @ExcelProperty(value = "结算单编号")
+    private String slOrderNo;
 
-    @ExcelProperty(value = "状态")
-    private String statusLabel;
     /**
-     * 对账单编号
+     * 生成时间
      */
-    @ExcelProperty(value = "对账单编号")
-    private String lLedgerNo;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "生成时间")
+    private Date createTime;
+
+    /**
+     * 客户单位
+     */
+    @ExcelProperty(value = "客户单位")
+    private String firmName;
+
     /**
      * 对账表名称
      */
     @ExcelProperty(value = "对账表名称")
     private String name;
     /**
-     * 结算单编号
+     * 对账单编号
      */
-    @ExcelProperty(value = "结算单编号")
-    private String slOrderNo;
-
+    @ExcelProperty(value = "对账单编号")
+    private String lLedgerNo;
     /**
-     * 剩余待还款
+     * 支付方式
      */
-    @ExcelProperty(value = "剩余待还款")
-    private BigDecimal waitPrice;
+    @ExcelProperty(value = "支付方式")
+    private String tradingLabel;
+
 
     /**
      * 实际应收/元
@@ -60,6 +68,11 @@ public class SettlementLogisticsVo {
      */
     @ExcelProperty(value = "当前收款/元")
     private BigDecimal actualPrice;
+    /**
+     * 剩余待还款
+     */
+    @ExcelProperty(value = "剩余待还款")
+    private BigDecimal waitPrice;
 
     /**
      * 预计收款日期
@@ -74,11 +87,6 @@ public class SettlementLogisticsVo {
 
     @ExcelProperty(value = "联系电话")
     private String phone;
-    /**
-     * 备注
-     */
-    @ExcelProperty(value = "备注")
-    private String remark;
 
     /**
      * 变更人
@@ -86,26 +94,9 @@ public class SettlementLogisticsVo {
     @ExcelProperty(value = "变更人")
     private String updateByLabel;
 
-    /**
-     * 生成时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "生成时间")
-    private Date createTime;
 
 
-    /**
-     * 交易方式
-     */
-    @ExcelProperty(value = "交易方式")
-    private String tradingLabel;
 
 
-    /**
-     * 客户单位
-     */
-    @ExcelProperty(value = "客户单位")
-    private String firmName;
-
 
 }

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

@@ -19,29 +19,44 @@ import java.util.Date;
 @Setter
 @ExcelContext(fileName = "贸易结算订单列表", sheetName = "贸易结算订单列表")
 public class SettlementTradeVo {
-    /**
-     * 对账单编号
-     */
-    @ExcelProperty(value = "对账单编号")
-    private String tLedgerNo;
 
+
+    @ExcelProperty(value = "状态")
+    private String statusLabel;
     /**
      * 结算单编号
      */
     @ExcelProperty(value = "结算单编号")
     private String stOrderNo;
-
     /**
-     * 名称
+     * 创建时间
      */
-    @ExcelProperty(value = "名称")
-    private String name;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "生成时间")
+    private Date createTime;
     /**
      * 客户名称
      */
     @ExcelProperty(value = "客户名称")
     private String firmName;
 
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "对账表名称")
+    private String name;
+    /**
+     * 对账单编号
+     */
+    @ExcelProperty(value = "对账单编号")
+    private String tLedgerNo;
+
+    /**
+     * 支付方式
+     */
+    @ExcelProperty(value = "支付方式")
+    private String tradingLabel;
+
 
     /**
      * 预计收款日期
@@ -50,30 +65,19 @@ public class SettlementTradeVo {
     @ExcelProperty(value = "预计收款日期")
     private Date receiptTime;
 
-
     /**
-     * 财务联系人
+     * 联系人
      */
-    @ExcelProperty(value = "财务联系人")
+    @ExcelProperty(value = "联系人")
     private String contacts;
 
     /**
-     * 联系人电话
+     * 联系电话
      */
-    @ExcelProperty(value = "联系人电话")
+    @ExcelProperty(value = "联系电话")
     private String phone;
 
 
-    @ExcelProperty(value = "状态")
-    private String statusLabel;
-
-
-    /**
-     * 交易方式
-     */
-    @ExcelProperty(value = "交易方式")
-    private String tradingLabel;
-
     /**
      * 实际应收/元
      */
@@ -96,12 +100,4 @@ public class SettlementTradeVo {
      */
     @ExcelProperty(value = "变更人")
     private String updateByLabel;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "创建时间")
-    private Date createTime;
-
 }

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

@@ -286,6 +286,13 @@ public class KwpSettlementTradeService {
         return settlementTradeMapper.sumMoneyType(entId, cur, pre, unitType);
     }
 
+    /**
+     * 管理端导出数据
+     *
+     * @param settlementReq
+     * @param idList
+     * @return
+     */
     public List<SettlementTradeVo> exportList(SettlementTradeReq settlementReq, List<Long> idList) {
         List<SettlementTradeDto> settlementTradeDtos = settlementTradeMapper.exportList(settlementReq, idList);
         if (CollectionUtils.isEmpty(settlementTradeDtos)) {

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

@@ -505,7 +505,6 @@
                kst.status,
                kst.st_order_no,
                klt.t_ledger_no                                    tLedgerNo,
-               kst.create_time,
                kst.receipt_time,
                cast(kst.actual_price as char)                     actualPrice,
                cast(kst.total_price as char)                      totalPrice,
@@ -518,13 +517,11 @@
                     else klt.success_phone end) as                phone,
                kst.create_by                                      createBy,
                kst.update_by                                      updateBy,
-               kst.create_time,
-               kst.t_ledger_id,
-               klt.id                                             ledgerId,
+               kst.create_time                                    createTime,
+               kst.update_time                                    updateTime,
                klt.name,
                klt.trading,
-               kltu.firm_name                                     firmName,
-               kst.update_by
+               kltu.firm_name                                     firmName
         from kwp_settlement_trade kst
                  inner join kwp_ledger_trade klt on kst.t_ledger_id = klt.id and klt.del_flag = 0
                  inner join kwp_ledger_trade_unit kltu on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and