结算导出接口完善，结算关联列表接口完善

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerLogisticsController.java

@@ -4,9 +4,9 @@ import com.sckw.core.model.page.PageRes;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.vo.LedgerLogistics;
+import com.sckw.payment.model.vo.excel.LedgerLogisticsExport;
 import com.sckw.payment.model.vo.req.LedgerListReq;
 import com.sckw.payment.model.vo.req.LogisticsReq;
-import com.sckw.payment.model.vo.res.LedgerLogisticsVo;
 import com.sckw.payment.service.operate.LedgerLogisticsService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
@@ -34,14 +34,12 @@ public class LedgerLogisticsController {
 
 
     /**
-     *
-     *
      * @param logisticsReq 物流订单查询参数
      * @return
      */
     @PostMapping("list")
     public HttpResult list(@RequestBody LogisticsReq logisticsReq) {
-        return HttpResult.ok(ledgerLogisticsService.list(logisticsReq));
+        return HttpResult.ok(ledgerLogisticsService.list(logisticsReq, false));
     }
 
     /**
@@ -68,8 +66,6 @@ public class LedgerLogisticsController {
     }
 
     /**
-     *
-     *
      * @param logisticsReq 物流订单查询参数
      * @return 物流对账单统计数据
      */
@@ -90,7 +86,7 @@ public class LedgerLogisticsController {
     public HttpResult export(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
         List<LedgerLogistics> list;
         if (CollectionUtils.isEmpty(logisticsReq.getIdList())) {
-            PageRes<LedgerLogistics> pageResult = ledgerLogisticsService.list(logisticsReq);
+            PageRes<LedgerLogistics> pageResult = ledgerLogisticsService.list(logisticsReq, true);
             list = pageResult.getList();
         } else {
             list = ledgerLogisticsService.selectList(logisticsReq.getIdList());
@@ -98,13 +94,13 @@ public class LedgerLogisticsController {
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");
         }
-        List<LedgerLogisticsVo> collect = list.stream().map(a -> {
-            LedgerLogisticsVo ledgerLogisticsVo = new LedgerLogisticsVo();
+        List<LedgerLogisticsExport> collect = list.stream().map(a -> {
+            LedgerLogisticsExport ledgerLogisticsVo = new LedgerLogisticsExport();
             BeanUtils.copyProperties(a, ledgerLogisticsVo);
             return ledgerLogisticsVo;
         }).collect(Collectors.toList());
 
-        ExcelUtil.downData(response, LedgerLogisticsVo.class, collect);
+        ExcelUtil.downData(response, LedgerLogisticsExport.class, collect);
         return null;
     }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerTradeController.java

@@ -4,9 +4,9 @@ import com.sckw.core.model.page.PageRes;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.vo.LedgerSell;
+import com.sckw.payment.model.vo.excel.LedgerTradeExport;
 import com.sckw.payment.model.vo.req.LedgerListReq;
 import com.sckw.payment.model.vo.req.TradeReq;
-import com.sckw.payment.model.vo.res.LedgerTradeVo;
 import com.sckw.payment.service.operate.LedgerTradeService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
@@ -33,8 +33,6 @@ public class LedgerTradeController {
 
 
     /**
-     *
-     *
      * @param tradeReq
      * @return
      */
@@ -44,7 +42,6 @@ public class LedgerTradeController {
     }
 
     /**
-     *
      * @param ledgerListReq 对账单id
      * @return
      */
@@ -55,7 +52,6 @@ public class LedgerTradeController {
 
 
     /**
-     *
      * @param id 对账单id
      * @return
      */
@@ -70,12 +66,11 @@ public class LedgerTradeController {
      * @return
      */
     @PostMapping("count")
-    public HttpResult count(@RequestBody  TradeReq tradeReq) {
+    public HttpResult count(@RequestBody TradeReq tradeReq) {
         return HttpResult.ok(ledgerTradeService.orderCount(tradeReq));
     }
 
 
-
     /**
      * 导出 todo
      *
@@ -84,8 +79,8 @@ public class LedgerTradeController {
      * @return
      */
     @PostMapping("export")
-    public HttpResult export(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
-        List<LedgerSell> list = null;
+    public HttpResult export(HttpServletResponse response, @RequestBody TradeReq tradeReq) {
+        List<LedgerSell> list;
 
         if (CollectionUtils.isEmpty(tradeReq.getIdList())) {
             tradeReq.setPage(0);
@@ -93,18 +88,18 @@ public class LedgerTradeController {
             PageRes<LedgerSell> pageResult = ledgerTradeService.list(tradeReq);
             list = pageResult.getList();
         } else {
-//            list = ledgerTradeService.selectSellList(tradeReq.getIdList());
+            list = ledgerTradeService.queryIds(tradeReq.getIdList());
         }
 
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");
         }
-        List<LedgerTradeVo> collect = list.stream().map(a -> {
-            LedgerTradeVo ledgerTradeVo = new LedgerTradeVo();
+        List<LedgerTradeExport> collect = list.stream().map(a -> {
+            LedgerTradeExport ledgerTradeVo = new LedgerTradeExport();
             BeanUtils.copyProperties(a, ledgerTradeVo);
             return ledgerTradeVo;
         }).collect(Collectors.toList());
-        ExcelUtil.downData(response, LedgerTradeVo.class, collect);
+        ExcelUtil.downData(response, LedgerTradeExport.class, collect);
         return null;
     }
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementLogisticsController.java

@@ -3,7 +3,7 @@ package com.sckw.payment.controller.operate;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.constant.LogisticsUnitType;
-import com.sckw.payment.model.dto.SettlementLogisticsDto;
+import com.sckw.payment.model.vo.SettlementLogistics;
 import com.sckw.payment.model.vo.req.SettlementReq;
 import com.sckw.payment.model.vo.res.SettlementLogisticsVo;
 import com.sckw.payment.service.operate.SettlementLogisticsService;
@@ -34,21 +34,41 @@ public class SettlementLogisticsController {
     @Resource
     private SettlementLogisticsService settlementLogisticsService;
 
+    /**
+     * 结算列表
+     *
+     * @param settlementReq
+     * @return
+     */
     @PostMapping("list")
     public HttpResult list(@RequestBody @Valid SettlementReq settlementReq) {
         return HttpResult.ok(settlementLogisticsService.list(settlementReq));
     }
 
+    /**
+     * 结算统计
+     *
+     * @param settlementReq
+     * @return
+     */
     @PostMapping("count")
     public HttpResult count(@RequestBody @Valid SettlementReq settlementReq) {
         return HttpResult.ok(settlementLogisticsService.count(settlementReq));
     }
 
+    /**
+     * 导出
+     *
+     * @param response
+     * @param settlementReq
+     * @return
+     */
     @PostMapping("export")
     public HttpResult export(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
         settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
-        List<SettlementLogisticsDto> list;
-        list = settlementLogisticsService.selectList(settlementReq);
+        settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
+        List<SettlementLogistics> list;
+        list = settlementLogisticsService.exportList(settlementReq);
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");
         }

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

@@ -68,6 +68,13 @@ public interface KwpLedgerLogisticsMapper extends BaseMapper<KwpLedgerLogistics>
 
 
     List<LedgerShipperDto> selectShipperIds(@Param("ids") List<Long> ids);
+
+    /**
+     * 运营端通过ids查询，导出数据
+     *
+     * @param ids
+     * @return
+     */
     List<LedgerLogistics> selectIds(@Param("ids") List<Long> ids);
 
     /**

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

@@ -77,4 +77,12 @@ public interface KwpLedgerTradeMapper extends BaseMapper<KwpLedgerTrade> {
     List<String> selectJoin(@Param("entId") Long entId, @Param("entTarget") Long entTarget);
 
     LedgerSize countSize(@Param("entId") Long entId);
+
+    /**
+     * 运营端通过ids查询，导出数据
+     *
+     * @param ids
+     * @return
+     */
+    List<LedgerSell> selectIds(@Param("ids") List<Long> ids);
 }

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

@@ -46,6 +46,7 @@ public interface KwpSettlementLogisticsMapper extends BaseMapper<KwpSettlementLo
      * @date 2023-07-24 16:23
      */
     Long getCountList(@Param("settlementReq") SettlementReq settlementReq);
+
     Map<String, Long> count(@Param("settlementReq") SettlementReq settlementReq);
 
     /**
@@ -80,6 +81,15 @@ public interface KwpSettlementLogisticsMapper extends BaseMapper<KwpSettlementLo
      */
     List<SettlementLogisticsDto> selectLogisticsList(@Param("settlementReq") SettlementReq settlementReq, @Param("ids") List<Long> ids);
 
+    /**
+     * 运营端根据条件导出数据
+     *
+     * @param settlementReq
+     * @param ids
+     * @return
+     */
+    List<SettlementLogistics> exportList(@Param("settlementReq") SettlementReq settlementReq, @Param("ids") List<Long> ids);
+
     List<LedgerUnitDto> getListById(@Param("id") Long id);
 
     /**

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

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
- * 对账-贸易订单 销售方
+ * 对账-贸易订单 运营端
  *
  * @author xucaiqin
  * @date 2023-07-10 18:11:24
@@ -79,14 +79,24 @@ public class LedgerSell implements ILedger {
     private BigDecimal actualPrice;
 
     /**
-     * 对账审核人电话
+     * 对账采购财务联系人名称
+     */
+    private String auditUser;
+
+    /**
+     * 对账采购财务联系人电话
      */
     private String auditPhone;
 
     /**
-     * 对账审核人名称
+     * 对账销售财务联系人名称
      */
-    private String auditUser;
+    private String successUser;
+
+    /**
+     * 对账销售财务联系人电话
+     */
+    private String successPhone;
 
     /**
      * 对账清单凭证

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

@@ -0,0 +1,151 @@
+package com.sckw.payment.model.vo.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.excel.annotation.ExcelContext;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 对账-物流订单-运营端
+ *
+ * @author xucaiqin
+ * @date 2023-07-11 15:17:12
+ */
+@Getter
+@Setter
+@ExcelContext(fileName = "物流对账单表", sheetName = "物流对账单表")
+public class LedgerLogisticsExport {
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "序号")
+    private Long id;
+    /**
+     * 状态（待对账、对账中、已对账、已完成、已取消、已退回）
+     */
+    @ExcelProperty(value = "状态")
+    private String statusLabel;
+    /**
+     * 物流对账单编号
+     */
+    @ExcelProperty(value = "物流对账单编号")
+    private String lLedgerNo;
+
+    /**
+     * 对账单名称
+     */
+    @ExcelProperty(value = "对账单名称")
+    private String name;
+
+    /**
+     * 托运单位
+     */
+    @ExcelProperty(value = "托运单位")
+    private String shipperFirmName;
+
+    /**
+     * 承运单位
+     */
+    @ExcelProperty(value = "承运单位")
+    private String carrierFirmName;
+
+    /**
+     * 订单数量
+     */
+    @ExcelProperty(value = "订单数量")
+    private Integer orderCount;
+//    /**
+//     * 开始日期
+//     */
+//    @ExcelProperty(value = "开始日期")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private LocalDateTime startTime;
+//
+//    /**
+//     * 结束日期
+//     */
+//    @ExcelProperty(value = "结束日期")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private LocalDateTime endTime;
+
+    /**
+     * 付款方式(预付款、货到付款）
+     */
+    @ExcelProperty(value = "付款方式")
+    private String tradingLabel;
+
+    /**
+     * 发票税率（%）
+     */
+    @ExcelProperty(value = "发票税率（%）")
+    private String taxRateLabel;
+
+
+    /**
+     * 总应收/元
+     */
+    @ExcelProperty(value = "总应收/元")
+    private BigDecimal totalPrice;
+
+//    /**
+//     * 实际结算金额
+//     */
+//    @ExcelProperty(value = "实际结算金额")
+//    private BigDecimal settlePrice;
+
+    /**
+     * 已收款/元
+     */
+    @ExcelProperty(value = "已收款/元")
+    private BigDecimal actualPrice;
+
+    /**
+     * 托运方财务联系方式
+     */
+    @ExcelProperty(value = "托运方财务联系方式")
+    private String auditPhone;
+
+    /**
+     * 托运方财务联系人
+     */
+    @ExcelProperty(value = "托运方财务联系人")
+    private String auditUser;
+    /**
+     * 承运方财务联系人
+     */
+    @ExcelProperty(value = "承运方财务联系人")
+    private String successUser;
+    /**
+     * 承运方财务联系方式
+     */
+    @ExcelProperty(value = "承运方财务联系方式")
+    private String successPhone;
+//
+//    /**
+//     * 对账清单凭证
+//     */
+//    @ExcelProperty(value = "对账清单凭证")
+//    private String url;
+    /**
+     * 生成时间
+     */
+    @ExcelProperty(value = "生成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime generateTime;
+    @ExcelProperty(value = "预计收款日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime receiptTime;
+
+    @ExcelProperty(value = "提交人")
+    private String createByName;
+
+}

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

@@ -0,0 +1,147 @@
+package com.sckw.payment.model.vo.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.excel.annotation.ExcelContext;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 对账-贸易订单 运营端
+ *
+ * @author xucaiqin
+ * @date 2023-07-11 15:17:12
+ */
+@Getter
+@Setter
+@ExcelContext(fileName = "贸易对账单表", sheetName = "贸易对账单表")
+public class LedgerTradeExport {
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "序号")
+    private Long id;
+    /**
+     * 状态（待对账、对账中、已对账、已完成、已取消、已退回）
+     */
+    @ExcelProperty(value = "状态")
+    private String statusLabel;
+
+    /**
+     * 贸易对账单编号
+     */
+    @ExcelProperty(value = "贸易对账单编号")
+    private String tLedgerNo;
+
+    /**
+     * 对账单名称
+     */
+    @ExcelProperty(value = "对账单名称")
+    private String name;
+
+    /**
+     * 采购单位
+     */
+    @ExcelProperty(value = "采购单位")
+    private String purchaseFirmName;
+    /**
+     * 销售单位
+     */
+    @ExcelProperty(value = "销售单位")
+    private String sellFirmName;
+    /**
+     * 订单数量
+     */
+    @ExcelProperty(value = "订单数量")
+    private Integer orderCount;
+
+
+//    /**
+//     * 开始日期
+//     */
+//    @ExcelProperty(value = "开始日期")
+//    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    private LocalDateTime startTime;
+//
+//    /**
+//     * 结束日期
+//     */
+//    @ExcelProperty(value = "结束日期")
+//    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    private LocalDateTime endTime;
+    /**
+     * 付款方式(预付款、货到付款）
+     */
+    @ExcelProperty(value = "付款方式")
+    private String tradingLabel;
+
+    /**
+     * 发票税率（%）
+     */
+    @ExcelProperty(value = "发票税率（%）")
+    private String taxRateLabel;
+
+    /**
+     * 总应收/元
+     */
+    @ExcelProperty(value = "总应收/元")
+    private BigDecimal totalPrice;
+
+//    /**
+//     * 实际结算金额
+//     */
+//    @ExcelProperty(value = "实际结算金额")
+//    private BigDecimal settlePrice;
+
+    /**
+     * 已收款/元
+     */
+    @ExcelProperty(value = "已收款/元")
+    private BigDecimal actualPrice;
+
+    /**
+     * 对账采购财务联系人名称
+     */
+    @ExcelProperty(value = "采购财务联系人")
+    private String auditUser;
+
+    /**
+     * 对账采购财务联系人电话
+     */
+    @ExcelProperty(value = "采购财务联系方式")
+    private String auditPhone;
+
+    /**
+     * 对账销售财务联系人名称
+     */
+    @ExcelProperty(value = "销售财务联系人")
+    private String successUser;
+
+    /**
+     * 对账销售财务联系人电话
+     */
+    @ExcelProperty(value = "销售财务联系方式")
+    private String successPhone;
+
+    /**
+     * 预计收款日期
+     */
+    @ExcelProperty(value = "预计收款日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime receiptTime;
+    /**
+     * 提交人
+     */
+    @ExcelProperty(value = "提交人")
+    private String createByName;
+
+    /**
+     * 生成时间
+     */
+    @ExcelProperty(value = "生成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime generateTime;
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/LedgerLogisticsService.java

@@ -12,6 +12,7 @@ import com.sckw.payment.dao.KwpLedgerLogisticsMapper;
 import com.sckw.payment.model.KwpLedgerLogistics;
 import com.sckw.payment.model.KwpLedgerLogisticsOrder;
 import com.sckw.payment.model.constant.LedgerEnum;
+import com.sckw.payment.model.constant.LogisticsUnitType;
 import com.sckw.payment.model.dto.ILedger;
 import com.sckw.payment.model.vo.LedgerLogistics;
 import com.sckw.payment.model.vo.req.LedgerListReq;
@@ -91,9 +92,13 @@ public class LedgerLogisticsService extends AbsLedger {
      * @param logisticsReq
      * @return 托运方对账订单分页数据
      */
-    public PageRes<LedgerLogistics> list(LogisticsReq logisticsReq) {
+    public PageRes<LedgerLogistics> list(LogisticsReq logisticsReq,boolean export) {
         fillPara(logisticsReq);
-        PageHelper.startPage(logisticsReq.getPage(), logisticsReq.getPageSize());
+        logisticsReq.setUnitType(LogisticsUnitType.SHIPPER);
+        logisticsReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
+        if(!export){
+            PageHelper.startPage(logisticsReq.getPage(), logisticsReq.getPageSize());
+        }
         List<LedgerLogistics> kwpLedgerLogisticsList = logisticsMapper.list(logisticsReq);
         PageInfo<LedgerLogistics> ledgerShipperDtoPageInfo = new PageInfo<>(kwpLedgerLogisticsList);
         //字典转换

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/LedgerTradeService.java

@@ -18,7 +18,6 @@ import com.sckw.payment.model.KwpLedgerTradeOrder;
 import com.sckw.payment.model.constant.LedgerEnum;
 import com.sckw.payment.model.constant.TradeUnitType;
 import com.sckw.payment.model.dto.ILedger;
-import com.sckw.payment.model.dto.LedgerSellDto;
 import com.sckw.payment.model.dto.OrderDto;
 import com.sckw.payment.model.vo.LedgerSell;
 import com.sckw.payment.model.vo.req.LedgerListReq;
@@ -142,56 +141,6 @@ public class LedgerTradeService extends AbsLedger {
         return res;
     }
 
-    /**
-     * 根据id查询对账单列表
-     *
-     * @param ids 对账单id列表
-     * @return 对账单数据
-     */
-    public List<LedgerSellDto> selectSellList(List<Long> ids) {
-        if (CollectionUtils.isEmpty(ids)) {
-            return new ArrayList<>();
-        }
-        List<LedgerSellDto> ledgerTradeDto = tradeMapper.selectSellIds(ids);
-        changeDict(ledgerTradeDto);
-        return ledgerTradeDto;
-    }
-
-    private LedgerTradeDetailVo getDetail(KwpLedgerTrade ledgerTradeDto) {
-        List<KwpLedgerTradeOrder> kwpLedgerTradeOrders = tradeOrderService.queryList(ledgerTradeDto.getId());
-        LedgerTradeDetailVo ledgerTradeDetailVo = new LedgerTradeDetailVo();
-        ledgerTradeDetailVo.setId(ledgerTradeDto.getId());
-        ledgerTradeDetailVo.setTLedgerNo(ledgerTradeDto.getTLedgerNo());
-        ledgerTradeDetailVo.setName(ledgerTradeDto.getName());
-        SysDictResDto trading = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TRADE_TYPE.getType(), ledgerTradeDto.getTrading());
-        ledgerTradeDetailVo.setTrading(ledgerTradeDto.getTrading());
-        ledgerTradeDetailVo.setTradingLabel(Objects.nonNull(trading) ? trading.getLabel() : "");
-        SysDictResDto taxRate = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TAX_RATE.getType(), String.valueOf(ledgerTradeDto.getTaxRate()));
-        ledgerTradeDetailVo.setTaxRate(ledgerTradeDto.getTaxRate());
-        ledgerTradeDetailVo.setTaxRateLabel(Objects.nonNull(taxRate) ? taxRate.getLabel() : "");
-        ledgerTradeDetailVo.setTotalPrice(ledgerTradeDto.getTotalPrice());
-        ledgerTradeDetailVo.setSettlePrice(ledgerTradeDto.getSettlePrice());
-        ledgerTradeDetailVo.setActualPrice(ledgerTradeDto.getActualPrice());
-        ledgerTradeDetailVo.setStartTime(ledgerTradeDto.getStartTime());
-        ledgerTradeDetailVo.setEndTime(ledgerTradeDto.getEndTime());
-        ledgerTradeDetailVo.setRemark(ledgerTradeDto.getRemark());
-        List<Long> collect = kwpLedgerTradeOrders.stream().map(KwpLedgerTradeOrder::getTOrderId).toList();
-        List<OrderDto> detailRes = new ArrayList<>();
-        OrderDetailRes orderDetailById;
-        //查询贸易订单详情
-        for (Long aLong : collect) {
-            try {
-                orderDetailById = tradeOrderInfoService.getOrderDetailById(aLong);
-            } catch (Exception e) {
-                log.error("不存在该订单！tradeOrderInfoService.getOrderDetailById({})", aLong, e);
-                continue;
-            }
-            detailRes.add(changeOrder(orderDetailById));
-        }
-        ledgerTradeDetailVo.setOrderList(detailRes);
-        return ledgerTradeDetailVo;
-    }
-
     private OrderDto changeOrder(OrderDetailRes orderDetailRes) {
         OrderDto orderDto = new OrderDto();
         BeanUtils.copyProperties(orderDetailRes, orderDto);
@@ -249,6 +198,41 @@ public class LedgerTradeService extends AbsLedger {
         return orderDto;
     }
 
+    private LedgerTradeDetailVo getDetail(KwpLedgerTrade ledgerTradeDto) {
+        List<KwpLedgerTradeOrder> kwpLedgerTradeOrders = tradeOrderService.queryList(ledgerTradeDto.getId());
+        LedgerTradeDetailVo ledgerTradeDetailVo = new LedgerTradeDetailVo();
+        ledgerTradeDetailVo.setId(ledgerTradeDto.getId());
+        ledgerTradeDetailVo.setTLedgerNo(ledgerTradeDto.getTLedgerNo());
+        ledgerTradeDetailVo.setName(ledgerTradeDto.getName());
+        SysDictResDto trading = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TRADE_TYPE.getType(), ledgerTradeDto.getTrading());
+        ledgerTradeDetailVo.setTrading(ledgerTradeDto.getTrading());
+        ledgerTradeDetailVo.setTradingLabel(Objects.nonNull(trading) ? trading.getLabel() : "");
+        SysDictResDto taxRate = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TAX_RATE.getType(), String.valueOf(ledgerTradeDto.getTaxRate()));
+        ledgerTradeDetailVo.setTaxRate(ledgerTradeDto.getTaxRate());
+        ledgerTradeDetailVo.setTaxRateLabel(Objects.nonNull(taxRate) ? taxRate.getLabel() : "");
+        ledgerTradeDetailVo.setTotalPrice(ledgerTradeDto.getTotalPrice());
+        ledgerTradeDetailVo.setSettlePrice(ledgerTradeDto.getSettlePrice());
+        ledgerTradeDetailVo.setActualPrice(ledgerTradeDto.getActualPrice());
+        ledgerTradeDetailVo.setStartTime(ledgerTradeDto.getStartTime());
+        ledgerTradeDetailVo.setEndTime(ledgerTradeDto.getEndTime());
+        ledgerTradeDetailVo.setRemark(ledgerTradeDto.getRemark());
+        List<Long> collect = kwpLedgerTradeOrders.stream().map(KwpLedgerTradeOrder::getTOrderId).toList();
+        List<OrderDto> detailRes = new ArrayList<>();
+        OrderDetailRes orderDetailById;
+        //查询贸易订单详情
+        for (Long aLong : collect) {
+            try {
+                orderDetailById = tradeOrderInfoService.getOrderDetailById(aLong);
+            } catch (Exception e) {
+                log.error("不存在该订单！tradeOrderInfoService.getOrderDetailById({})", aLong, e);
+                continue;
+            }
+            detailRes.add(changeOrder(orderDetailById));
+        }
+        ledgerTradeDetailVo.setOrderList(detailRes);
+        return ledgerTradeDetailVo;
+    }
+
     /**
      * 查询对账单详情
      *
@@ -277,5 +261,15 @@ public class LedgerTradeService extends AbsLedger {
         return PageRes.build(pageInfo, detailRes);
     }
 
-
+    /**
+     * 运营端通过ids查询需要导出的数据
+     *
+     * @param idList
+     * @return
+     */
+    public List<LedgerSell> queryIds(List<Long> idList) {
+        List<LedgerSell> ledgerSells = tradeMapper.selectIds(idList);
+        changeDict(ledgerSells);
+        return ledgerSells;
+    }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/SettlementLogisticsService.java

@@ -9,7 +9,6 @@ import com.sckw.core.utils.StringTimeUtil;
 import com.sckw.payment.dao.KwpSettlementLogisticsMapper;
 import com.sckw.payment.model.constant.LogisticsUnitType;
 import com.sckw.payment.model.constant.SettlementEnum;
-import com.sckw.payment.model.dto.SettlementLogisticsDto;
 import com.sckw.payment.model.vo.SettlementLogistics;
 import com.sckw.payment.model.vo.req.SettlementReq;
 import com.sckw.payment.model.vo.res.SettlementLogisticsSumVo;
@@ -77,9 +76,9 @@ public class SettlementLogisticsService {
     }
 
 
-    public List<SettlementLogisticsDto> selectList(SettlementReq settlementReq) {
+    public List<SettlementLogistics> exportList(SettlementReq settlementReq) {
         validSettlementReq(settlementReq);
-        return settlementLogisticsMapper.selectLogisticsList(settlementReq, settlementReq.getIdList());
+        return settlementLogisticsMapper.exportList(settlementReq, settlementReq.getIdList());
     }
 
 

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

@@ -152,32 +152,38 @@
     </select>
     <select id="list" resultType="com.sckw.payment.model.vo.LedgerLogistics">
         SELECT kll.id,
-               MAX(kll.l_ledger_no)                                                 AS lLedgerNo,
-               MAX(kll.name)                                                        AS name,
-               MAX(kll.start_time)                                                  AS startTime,
-               MAX(kll.end_time)                                                    AS endTime,
-               MAX(kll.tax_rate)                                                    AS taxRate,
-               MAX(kll.trading)                                                     AS trading,
-               MAX(kll.total_price)                                                 AS totalPrice,
-               MAX(kll.ex_tax_price)                                                AS exTaxPrice,
-               MAX(kll.settle_price)                                                AS settlePrice,
-               MAX(kll.actual_price)                                                AS actualPrice,
-               MAX(kll.success_phone)                                               AS successPhone,
-               MAX(kll.success_user)                                                AS successUser,
-               MAX(kll.url)                                                         AS url,
-               MAX(kll.generate_time)                                               AS generateTime,
-               MAX(kll.receipt_time)                                                AS receiptTime,
-               MAX(kll.remark)                                                      AS remark,
-               MAX(kll.status)                                                      AS status,
-               MAX(kll.order_count)                                                 AS orderCount,
-               MAX(kll.create_by)                                                   AS createBy,
-               MAX(CASE WHEN kllu.unit_type = 1 THEN kllu.top_ent_id ELSE NULL END) AS shipperEntId,
-               MAX(CASE WHEN kllu.unit_type = 1 THEN kllu.firm_name ELSE NULL END)  AS shipperFirmName,
-               MAX(CASE WHEN kllu.unit_type = 2 THEN kllu.top_ent_id ELSE NULL END) AS carrierEntId,
-               MAX(CASE WHEN kllu.unit_type = 2 THEN kllu.firm_name ELSE NULL END)  AS carrierFirmName
+               kll.l_ledger_no   AS lLedgerNo,
+               kll.name          AS name,
+               kll.start_time    AS startTime,
+               kll.end_time      AS endTime,
+               kll.tax_rate      AS taxRate,
+               kll.trading       AS trading,
+               kll.total_price   AS totalPrice,
+               kll.ex_tax_price  AS exTaxPrice,
+               kll.settle_price  AS settlePrice,
+               kll.actual_price  AS actualPrice,
+               kll.audit_phone      auditPhone,
+               kll.audit_user       auditUser,
+               kll.success_phone AS successPhone,
+               kll.success_user  AS successUser,
+               kll.url           AS url,
+               kll.generate_time AS generateTime,
+               kll.receipt_time  AS receiptTime,
+               kll.remark        AS remark,
+               kll.status        AS status,
+               kll.order_count   AS orderCount,
+               kll.create_by     AS createBy,
+               kllu.top_ent_id   AS shipperEntId,
+               kllu.firm_name    AS shipperFirmName,
+               kllu2.top_ent_id  AS carrierEntId,
+               kllu2.firm_name   AS carrierFirmName
         FROM kwp_ledger_logistics kll
-                 INNER JOIN kwp_ledger_logistics_unit kllu
-                            ON kll.id = kllu.l_ledger_id AND kllu.del_flag = 0
+                 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}
+                 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}
         <where>
             kll.del_flag = 0
             <if test="logisticsReq.status != null">
@@ -194,41 +200,47 @@
                 and (
                             kll.l_ledger_no like concat('%', #{logisticsReq.keywords,jdbcType=VARCHAR}, '%')
                         or kllu.firm_name like concat('%', #{logisticsReq.keywords,jdbcType=VARCHAR}, '%')
+                        or kllu2.firm_name like concat('%', #{logisticsReq.keywords,jdbcType=VARCHAR}, '%')
                         or kllu.contacts like concat('%', #{logisticsReq.keywords,jdbcType=VARCHAR}, '%')
                     )
             </if>
         </where>
-        GROUP BY kll.id
-        order by generateTime desc
+        order by kll.generate_time desc
     </select>
     <select id="selectIds" resultType="com.sckw.payment.model.vo.LedgerLogistics">
         SELECT kll.id,
-               MAX(kll.l_ledger_no)                                                 AS lLedgerNo,
-               MAX(kll.name)                                                        AS name,
-               MAX(kll.start_time)                                                  AS startTime,
-               MAX(kll.end_time)                                                    AS endTime,
-               MAX(kll.tax_rate)                                                    AS taxRate,
-               MAX(kll.trading)                                                     AS trading,
-               MAX(kll.total_price)                                                 AS totalPrice,
-               MAX(kll.ex_tax_price)                                                AS exTaxPrice,
-               MAX(kll.settle_price)                                                AS settlePrice,
-               MAX(kll.actual_price)                                                AS actualPrice,
-               MAX(kll.success_phone)                                               AS successPhone,
-               MAX(kll.success_user)                                                AS successUser,
-               MAX(kll.url)                                                         AS url,
-               MAX(kll.generate_time)                                               AS generateTime,
-               MAX(kll.receipt_time)                                                AS receiptTime,
-               MAX(kll.remark)                                                      AS remark,
-               MAX(kll.status)                                                      AS status,
-               MAX(kll.order_count)                                                 AS orderCount,
-               MAX(kll.create_by)                                                   AS createBy,
-               MAX(CASE WHEN kllu.unit_type = 1 THEN kllu.top_ent_id ELSE NULL END) AS shipperEntId,
-               MAX(CASE WHEN kllu.unit_type = 1 THEN kllu.firm_name ELSE NULL END)  AS shipperFirmName,
-               MAX(CASE WHEN kllu.unit_type = 2 THEN kllu.top_ent_id ELSE NULL END) AS carrierEntId,
-               MAX(CASE WHEN kllu.unit_type = 2 THEN kllu.firm_name ELSE NULL END)  AS carrierFirmName
+               kll.l_ledger_no   AS lLedgerNo,
+               kll.name          AS name,
+               kll.start_time    AS startTime,
+               kll.end_time      AS endTime,
+               kll.tax_rate      AS taxRate,
+               kll.trading       AS trading,
+               kll.total_price   AS totalPrice,
+               kll.ex_tax_price  AS exTaxPrice,
+               kll.settle_price  AS settlePrice,
+               kll.actual_price  AS actualPrice,
+               kll.audit_phone      auditPhone,
+               kll.audit_user       auditUser,
+               kll.success_phone AS successPhone,
+               kll.success_user  AS successUser,
+               kll.url           AS url,
+               kll.generate_time AS generateTime,
+               kll.receipt_time  AS receiptTime,
+               kll.remark        AS remark,
+               kll.status        AS status,
+               kll.order_count   AS orderCount,
+               kll.create_by     AS createBy,
+               kllu.top_ent_id   AS shipperEntId,
+               kllu.firm_name    AS shipperFirmName,
+               kllu2.top_ent_id  AS carrierEntId,
+               kllu2.firm_name   AS carrierFirmName
         FROM kwp_ledger_logistics kll
-                 INNER JOIN kwp_ledger_logistics_unit kllu
-                            ON kll.id = kllu.l_ledger_id AND kllu.del_flag = 0
+                 inner join kwp_ledger_logistics_unit kllu
+                            on kll.id = kllu.l_ledger_id and kllu.del_flag = 0 and
+                               kllu.unit_type = 1
+                 inner join kwp_ledger_logistics_unit kllu2
+                            on kll.id = kllu2.l_ledger_id and kllu2.del_flag = 0 and
+                               kllu2.unit_type = 2
         <where>
             kll.del_flag = 0
               and kll.id in
@@ -236,8 +248,6 @@
                 #{id,jdbcType=BIGINT}
             </foreach>
         </where>
-        GROUP BY kll.id
-        order by generateTime desc
     </select>
     <select id="countSum" resultType="com.sckw.payment.model.vo.res.LedgerCountSumVo">
         select IFNULL(count(1), 0)  "ledgerCount",

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

@@ -166,6 +166,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,
@@ -215,6 +217,47 @@
         </where>
         order by klt.generate_time desc
     </select>
+   <select id="selectIds" resultType="com.sckw.payment.model.vo.LedgerSell">
+       select klt.id,
+              klt.t_ledger_no   tLedgerNo,
+              klt.name,
+              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.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,
+              klt.remark,
+              klt.status,
+              klt.create_by     createBy,
+              kltu.contacts,
+              kltu.phone,
+              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
+                              kltu.unit_type = 1
+                inner join kwp_ledger_trade_unit kltu2
+                           on klt.id = kltu2.t_ledger_id and kltu2.del_flag = 0 and kltu2.unit_type = 2
+       <where>
+           klt.del_flag = 0
+             and klt.id in
+           <foreach collection="ids" item="id" close=")" open="(" separator=",">
+               #{id,jdbcType=BIGINT}
+           </foreach>
+       </where>
+   </select>
     <select id="purchaseList" resultType="com.sckw.payment.model.dto.LedgerPurchaseDto">
         select
         <include refid="purchase_col"/>

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

@@ -250,10 +250,10 @@
             </if>
             <if test="settlementReq.keywords != null and settlementReq.keywords != ''">
                 and (l.name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
-                or lu.firm_name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
-                or lu2.firm_name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
-                or s.sl_order_no like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
-                )
+                    or lu.firm_name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
+                    or lu2.firm_name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
+                    or s.sl_order_no like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
+                    )
             </if>
         </where>
         ) a
@@ -282,9 +282,9 @@
         from kwp_settlement_logistics ksl
                  inner join kwp_ledger_logistics l on ksl.l_ledger_id = l.id and l.del_flag = 0
                  inner join kwp_ledger_logistics_unit lu on ksl.l_ledger_id = lu.l_ledger_id and lu.del_flag = 0
-        and lu.unit_type = #{settlementReq.unitType,jdbcType=INTEGER}
+            and lu.unit_type = #{settlementReq.unitType,jdbcType=INTEGER}
                  inner join kwp_ledger_logistics_unit lu2 on ksl.l_ledger_id = lu2.l_ledger_id and lu2.del_flag = 0
-        and lu2.unit_type = #{settlementReq.unitTypeTwo,jdbcType=INTEGER}
+            and lu2.unit_type = #{settlementReq.unitTypeTwo,jdbcType=INTEGER}
         <where>
             ksl.del_flag = 0
             <if test="settlementReq.status != null and settlementReq.status != 0">
@@ -359,6 +359,73 @@
         </where>
         order by s.update_time desc
     </select>
+    <select id="exportList" resultType="com.sckw.payment.model.vo.SettlementLogistics">
+        select s.id,
+               s.ent_id                       as entId,
+               s.l_ledger_id                  as lLedgerId,
+               s.sl_order_no                  as slOrderNo,
+               s.total_price                  as totalPrice,
+               s.actual_price                 as actualPrice,
+               s.total_price - s.actual_price as waitPrice,
+               l.settle_price                 as settlePrice,
+               l.name,
+               l.l_ledger_no                  as lLedgerNo,
+               l.trading                      as trading,
+               l.url,
+               lu.firm_name                   as shipperFirmName,
+               lu2.firm_name                  as carrierFirmName,
+               s.remark,
+               s.audit_user                   as auditUser,
+               s.audit_phone                  as auditPhone,
+               s.success_user                 as successUser,
+               s.success_phone                as successPhone,
+               s.status,
+               s.receipt_time                 as receiptTime,
+               s.create_by                    as createBy,
+               s.create_time                  as createTime,
+               s.update_by                    as updateBy,
+               s.update_time                  as updateTime
+        from kwp_settlement_logistics s
+                 inner join kwp_ledger_logistics l on s.l_ledger_id = l.id and l.del_flag = 0
+                 inner join kwp_ledger_logistics_unit lu on s.l_ledger_id = lu.l_ledger_id and lu.del_flag = 0 and
+                                                            lu.unit_type = #{settlementReq.unitType,jdbcType=INTEGER}
+                 inner join kwp_ledger_logistics_unit lu2
+                            on s.l_ledger_id = lu2.l_ledger_id and lu2.del_flag = 0 and lu2.unit_type =
+                                                                                        #{settlementReq.unitTypeTwo,jdbcType=INTEGER}
+        <where>
+            s.del_flag = 0
+            <choose>
+                <when test="ids != null and ids.size() > 0">
+                    and s.id in
+                    <foreach collection="ids" item="id" close=")" open="(" separator=",">
+                        #{id,jdbcType=BIGINT}
+                    </foreach>
+                </when>
+                <otherwise>
+                    <if test="settlementReq.status != null and settlementReq.status != 0">
+                        and s.status = #{settlementReq.status}
+                    </if>
+                    <if test="settlementReq.trading != null and settlementReq.trading != ''">
+                        and l.trading = #{settlementReq.trading,jdbcType=VARCHAR}
+                    </if>
+                    <if test="settlementReq.startCreateTime != null and settlementReq.startCreateTime != ''  and settlementReq.endCreateTime != null  and settlementReq.endCreateTime != ''">
+                        and s.create_time between #{settlementReq.startCreateTime,jdbcType=TIMESTAMP} and #{settlementReq.endCreateTime,jdbcType=TIMESTAMP}
+                    </if>
+                    <if test="settlementReq.startReceiptTime != null and settlementReq.endReceiptTime != null">
+                        and s.receipt_time between #{settlementReq.startReceiptTime,jdbcType=TIMESTAMP} and #{settlementReq.endReceiptTime,jdbcType=TIMESTAMP}
+                    </if>
+                    <if test="settlementReq.keywords != null and settlementReq.keywords != ''">
+                        and (l.name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
+                            or lu.firm_name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
+                            or lu2.firm_name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
+                            or s.sl_order_no like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
+                            )
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+        order by s.update_time desc
+    </select>
 
     <select id="getListById" resultType="com.sckw.payment.model.dto.LedgerUnitDto">
         select kltu.top_ent_id,

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

@@ -298,7 +298,6 @@
                                                            kltu2.unit_type = 1
         <where>
             kst.del_flag = 0
-              and kltu2.top_ent_id = #{settlementReq.entId,jdbcType=INTEGER}
             <if test="settlementReq.keywords != null and settlementReq.keywords != ''">
                 and (
                             klt.name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')