ids问题处理

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/vo/BasePara.java

@@ -1,5 +1,6 @@
 package com.sckw.core.model.vo;
 
+import com.sckw.core.model.base.IdsList;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +13,7 @@ import java.io.Serializable;
  */
 @Getter
 @Setter
-public class BasePara implements Serializable {
+public class BasePara implements IdsList, Serializable {
     @Serial
     private static final long serialVersionUID = 1881051859375157819L;
     /**

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

@@ -2,7 +2,6 @@ package com.sckw.payment.controller;
 
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.page.PageRes;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.dto.ILedger;
@@ -31,12 +30,10 @@ public class KwpLedgerLogisticsController {
     private KwpLedgerLogisticsService kwpLedgerLogisticsService;
 
     private void fill(LogisticsSendReq logisticsSendReq) {
-        String ids = logisticsSendReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(logisticsSendReq.getIdList())) {
             throw new BusinessException("物流订单不能为空");
         }
-        logisticsSendReq.setOrders(longs);
+        logisticsSendReq.setOrders(logisticsSendReq.getIdList());
     }
 
     /**
@@ -206,14 +203,12 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("exportShipper")
     public HttpResult exportShipper(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        String ids = logisticsReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(logisticsReq.getIdList())) {
             PageRes<ILedger> pageResult = kwpLedgerLogisticsService.shipperList(logisticsReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerLogisticsService.selectShipperList(longs);
+            list = kwpLedgerLogisticsService.selectShipperList(logisticsReq.getIdList());
         }
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");
@@ -237,15 +232,13 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("exportCarrier")
     public HttpResult exportCarrier(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        String ids = logisticsReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(logisticsReq.getIdList())) {
             PageRes<ILedger> pageResult = kwpLedgerLogisticsService.carrierList(logisticsReq);
             list = pageResult.getList();
 
         } else {
-            list = kwpLedgerLogisticsService.selectCarrierList(longs);
+            list = kwpLedgerLogisticsService.selectCarrierList(logisticsReq.getIdList());
         }
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");

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

@@ -2,7 +2,6 @@ package com.sckw.payment.controller;
 
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.page.PageRes;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.dto.ILedger;
@@ -34,12 +33,10 @@ public class KwpLedgerTradeController {
     private KwpLedgerTradeService kwpLedgerTradeService;
 
     private void fill(TradeSendReq tradeSendReq) {
-        String ids = tradeSendReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(tradeSendReq.getIdList())) {
             throw new BusinessException("销售订单不能为空");
         }
-        tradeSendReq.setOrders(longs);
+        tradeSendReq.setOrders(tradeSendReq.getIdList());
     }
 
     /**
@@ -137,7 +134,7 @@ public class KwpLedgerTradeController {
      * @return
      */
     @DeleteMapping("delete")
-    public HttpResult delete(@NotBlank(message = "id不能为空")String id) {
+    public HttpResult delete(@NotBlank(message = "id不能为空") String id) {
         return HttpResult.ok(kwpLedgerTradeService.remove(Long.valueOf(id)));
     }
 
@@ -148,7 +145,7 @@ public class KwpLedgerTradeController {
      * @return
      */
     @PostMapping("back")
-    public HttpResult back(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+    public HttpResult back(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
         return HttpResult.ok(kwpLedgerTradeService.backOrder(Long.valueOf(id)));
     }
 
@@ -170,7 +167,7 @@ public class KwpLedgerTradeController {
      * @return
      */
     @GetMapping("queryBack")
-    public HttpResult queryBack(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+    public HttpResult queryBack(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
         return HttpResult.ok(kwpLedgerTradeService.queryBack(Long.valueOf(id)));
     }
 
@@ -209,14 +206,12 @@ public class KwpLedgerTradeController {
     @PostMapping("sellExport")
     public HttpResult sellExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
         List<ILedger> list;
-        String ids = tradeReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
 
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(tradeReq.getIdList())) {
             PageRes<ILedger> pageResult = kwpLedgerTradeService.sellList(tradeReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerTradeService.selectSellList(longs);
+            list = kwpLedgerTradeService.selectSellList(tradeReq.getIdList());
         }
 
         if (CollectionUtils.isEmpty(list)) {
@@ -241,14 +236,11 @@ public class KwpLedgerTradeController {
     @PostMapping("purchaseExport")
     public HttpResult purchaseExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
         List<ILedger> list;
-        String ids = tradeReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
-
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(tradeReq.getIdList())) {
             PageRes<ILedger> pageResult = kwpLedgerTradeService.purchaseList(tradeReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerTradeService.selectPurchaseList(longs);
+            list = kwpLedgerTradeService.selectPurchaseList(tradeReq.getIdList());
         }
 
         if (CollectionUtils.isEmpty(list)) {

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

@@ -1,13 +1,11 @@
 package com.sckw.payment.controller;
 
-import com.sckw.core.exception.BusinessException;
 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.constant.LogisticsUnitType;
 import com.sckw.payment.model.dto.SettlementLogisticsDto;
 import com.sckw.payment.model.vo.req.SettlementReq;
-import com.sckw.payment.model.vo.req.SettlementWalletReq;
 import com.sckw.payment.model.vo.res.SettlementLogisticsVo;
 import com.sckw.payment.service.KwpSettlementLogisticsService;
 import jakarta.annotation.Resource;
@@ -38,6 +36,7 @@ public class KwpSettlementLogisticsController {
     //   ========= 运费收款 承运方 =========
     @PostMapping(name = "运费收款-物流订单列表", path = "pageListCollection")
     public HttpResult pageSelectCollection(@RequestBody @Valid SettlementReq settlementReq) {
+        List<Long> idList = settlementReq.getIdList();
         return HttpResult.ok(kwpSettlementLogisticsService.pageSelectCollection(settlementReq));
     }
 
@@ -54,16 +53,16 @@ public class KwpSettlementLogisticsController {
     @PostMapping(name = "运费收款-根据条件导出物流订单表数据", path = "exportCollection")
     public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
         List<SettlementLogisticsDto> list;
-        if (CollectionUtils.isEmpty(settlementReq.getIds()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
+        if (CollectionUtils.isEmpty(settlementReq.getIdList()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
             //有page、pageSize，无ids
             PageRes<SettlementLogisticsDto> pageResult = kwpSettlementLogisticsService.pageSelectCollection(settlementReq);
             list = pageResult.getList();
-        } else if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+        } else if (CollectionUtils.isEmpty(settlementReq.getIdList())) {
             //无page、pageSize，无ids
             list = kwpSettlementLogisticsService.selectList(LogisticsUnitType.CARRIER);
         } else {
             //有ids
-            list = kwpSettlementLogisticsService.selectList(settlementReq.getIds());
+            list = kwpSettlementLogisticsService.selectList(settlementReq.getIdList());
         }
         return this.export(response, list);
     }
@@ -88,16 +87,16 @@ public class KwpSettlementLogisticsController {
     @PostMapping(name = "运费付款-根据条件导出物流订单表数据", path = "exportPayment")
     public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
         List<SettlementLogisticsDto> list;
-        if (CollectionUtils.isEmpty(settlementReq.getIds()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
+        if (CollectionUtils.isEmpty(settlementReq.getIdList()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
             //有page、pageSize，无ids
             PageRes<SettlementLogisticsDto> pageResult = kwpSettlementLogisticsService.pageSelectPayment(settlementReq);
             list = pageResult.getList();
-        } else if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+        } else if (CollectionUtils.isEmpty(settlementReq.getIdList())) {
             //无page、pageSize，无ids
             list = kwpSettlementLogisticsService.selectList(LogisticsUnitType.SHIPPER);
         } else {
             //有ids
-            list = kwpSettlementLogisticsService.selectList(settlementReq.getIds());
+            list = kwpSettlementLogisticsService.selectList(settlementReq.getIdList());
         }
         return this.export(response, list);
     }

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

@@ -43,11 +43,11 @@ public class KwpSettlementTradeController {
     @PostMapping(name = "收款-根据ids导出销售结算单列表", path = "exportCollection")
     public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
         List<SettlementTradeDto> list;
-        if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+        if (CollectionUtils.isEmpty(settlementReq.getIdList())) {
             PageRes<SettlementTradeDto> pageResult = kwpSettlementTradeService.pageListCollection(settlementReq);
             list = pageResult.getList();
         } else {
-            list = kwpSettlementTradeService.selectList(settlementReq.getIds());
+            list = kwpSettlementTradeService.selectList(settlementReq.getIdList());
         }
         return this.export(response, list);
     }
@@ -72,11 +72,11 @@ public class KwpSettlementTradeController {
     @PostMapping(name = "付款-根据ids导出采购结算单列表", path = "exportPayment")
     public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
         List<SettlementTradeDto> list;
-        if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+        if (CollectionUtils.isEmpty(settlementReq.getIdList())) {
             PageRes<SettlementTradeDto> pageResult = kwpSettlementTradeService.pageListPayment(settlementReq);
             list = pageResult.getList();
         } else {
-            list = kwpSettlementTradeService.selectList(settlementReq.getIds());
+            list = kwpSettlementTradeService.selectList(settlementReq.getIdList());
         }
         return this.export(response, list);
     }

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

@@ -1,5 +1,6 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.core.model.base.IdsList;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
@@ -14,7 +15,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class LedgerConfirmReq {
+public class LedgerConfirmReq implements IdsList {
     @NotNull(message = "id不能为空")
     private String id;
     /**

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

@@ -1,6 +1,7 @@
 package com.sckw.payment.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.IdsList;
 import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,7 +17,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class LogisticsSendReq {
+public class LogisticsSendReq implements IdsList {
 
     private String id;
     /**

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

@@ -9,7 +9,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * @author Aick Spt
@@ -18,8 +17,8 @@ import java.util.List;
 @Getter
 @Setter
 public class SettlementReq extends BasePara {
-//    @Serial
-//    private static final long serialVersionUID = 5328731681168692784L;
+    @Serial
+    private static final long serialVersionUID = 6537008434516489423L;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -46,6 +45,5 @@ public class SettlementReq extends BasePara {
      */
     private Integer status;
 
-
-    private List<Long> ids;
+    private String ids;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.payment.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.IdsList;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.PositiveOrZero;
@@ -21,7 +22,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class TradeSendReq {
+public class TradeSendReq implements IdsList {
 
     private String id;
     /**