需求

src/main/java/com/gree/mall/manager/controller/order/OrderShareController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.rmi.RemoteException;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -39,7 +40,7 @@ public class OrderShareController {
             @ApiParam(value = "订单号", required = false) @RequestParam(required = false) String orderId,
             @ApiParam(value = "用户名", required = false) @RequestParam(required = false) String workUserName,
             @ApiParam(value = "手机号", required = false) @RequestParam(required = false) String phone,
-            @ApiParam(value = "结算状态: ING=结算中  OVER=已结算  CANCEL=已取消 EXCEPTION=异常结算", required = false) @RequestParam(required = false) String status,
+            @ApiParam(value = "结算状态: ING=结算中  OVER=已结算  CANCEL=已取消 EXCEPTION=异常结算", required = false) @RequestParam(required = false) List<String> status,
             @ApiParam(value = "开始创建时间", required = false) @RequestParam(required = false) String startTime,
             @ApiParam(value = "结束创建时间", required = false) @RequestParam(required = false) String endTime,
             @ApiParam(value = "开始结算时间", required = false) @RequestParam(required = false) String startSettleTime,

src/main/java/com/gree/mall/manager/logic/order/OrderShareLogic.java

@@ -58,7 +58,7 @@ public class OrderShareLogic {
     private final OrderRefundService orderRefundService;
 
 
-    public IPage<OrderShare> list(HttpServletRequest request,String userId, String websitId, String orderShareId, String orderId, String workUserName, String phone, String status,
+    public IPage<OrderShare> list(HttpServletRequest request,String userId, String websitId, String orderShareId, String orderId, String workUserName, String phone, List<String> status,
                                   String startTime, String endTime, String startSettleTime, String endSettleTime, String position,
                                   String startPayTime,String endPayTime, String payType, Integer pageNo, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
@@ -72,7 +72,7 @@ public class OrderShareLogic {
                 .eq(StringUtils.isNotEmpty(websitId), OrderShare::getWebsitId, websitId)
                 .like(StringUtils.isNotEmpty(workUserName), OrderShare::getWorkUserName, workUserName)
                 .like(StringUtils.isNotEmpty(phone), OrderShare::getPhone, phone)
-                .eq(StringUtils.isNotEmpty(status), OrderShare::getStatus, status)
+                .in(CollectionUtils.isNotEmpty(status), OrderShare::getStatus, status)
                 .between(StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime), OrderShare::getCreateTime, startTime, endTime)
                 .between(StringUtils.isNotEmpty(startSettleTime) && StringUtils.isNotEmpty(endSettleTime), OrderShare::getSettleTime, startSettleTime, endSettleTime)
                 .between(StringUtils.isNotEmpty(startPayTime) && StringUtils.isNotEmpty(endPayTime),OrderShare::getPayTime,startPayTime,endPayTime)