需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/pay/SettlementOrderController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -29,7 +30,7 @@ public class SettlementOrderController {
     @PostMapping("/list/pageV2")
     @ApiOperation(value = "结算单列表")
     public ResponseHelper<IPage<SettlementOrder>> pageV2(
-            @ApiParam(required = false, value = "结算状态: WAIT = 待结算 WAIT_ING 可提现 ING=提现中   OVER=已到账  ") @RequestParam(required = false) String status,
+            @ApiParam(required = false, value = "结算状态: WAIT = 待结算 WAIT_ING 可提现 ING=提现中   OVER=已到账  ") @RequestParam(required = false) List<String> status,
             @ApiParam(required = false, value = "开始时间") @RequestParam(required = false) String startTime,
             @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime,
             @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -851,12 +851,12 @@ public class PayOrderLogic {
                 .orderByAsc(GoodsCategory::getSortNum).list();
     }
 
-    public IPage<SettlementOrder> pageSettlementV2(String status, String startTime, String endTime, Integer pageNum, Integer pageSize) {
+    public IPage<SettlementOrder> pageSettlementV2(List<String> status, String startTime, String endTime, Integer pageNum, Integer pageSize) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 
 
         return settlementOrderService.lambdaQuery()
-                .eq(!StringUtil.isEmpty(status),SettlementOrder::getStatus,status)
+                .in(!CollectionUtils.isEmpty(status),SettlementOrder::getStatus,status)
                 .eq(SettlementOrder::getWorkerId,currentCompanyWechat.getUserId())
                 .between(!StringUtil.isEmpty(startTime),SettlementOrder::getCreateTime,startTime,endTime)
                 .in(SettlementOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())