fix

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/OrderController.java

@@ -137,7 +137,7 @@ public class OrderController {
     @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
     public ResultContent<Page<OrderResultModel>> userSearch(@RequestBody UserSeachOrderModel userSeachOrderModel) {
 
-        return orderServiceImp.userSearch(userSeachOrderModel, page(userSeachOrderModel));
+        return orderServiceImp.userSearch(userSeachOrderModel);
     }
 
     @ApiOperation("app订单详情")
@@ -165,7 +165,7 @@ public class OrderController {
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
     @ResourceAuth(value = "admin", type = AuthType.Project)
     public ResultContent<Page<OrderResult2Model>> shopSearch(@RequestBody AdminSeachOrderModel seachOrderModel) {
-        return orderServiceImp.shopSearch(seachOrderModel, page(seachOrderModel));
+        return orderServiceImp.shopSearch(seachOrderModel);
     }
 
 
@@ -176,22 +176,9 @@ public class OrderController {
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     public ResultContent<Page<OrderResult2Model>> platformSearch(@RequestBody AdminSeachOrderModel seachOrderModel) {
 
-        return orderServiceImp.adminSearch(seachOrderModel, page(seachOrderModel));
+        return orderServiceImp.adminSearch(seachOrderModel);
     }
 
-    private Pageable page(Pages page) {
-        try {
-
-            return PageRequest.of(page.getPage(), page.getSize());
-        } catch (Exception e) {
-
-            log.info("PageUtile.page异常：{}", e.getMessage());
-
-        }
-        return PageRequest.of(0, 20);
-
-
-    }
 
 
 }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/OrderServiceImp.java

@@ -149,13 +149,13 @@ public class OrderServiceImp implements OrderService {
     }
 
 
-    public ResultContent userSearch(UserSeachOrderModel userSeachOrderModel, Pageable pageable) {
+    public ResultContent userSearch(UserSeachOrderModel userSeachOrderModel) {
         String userId = authHelper.getCurrentUser().getUserId();
         UserSeachOrder2Model userSeachOrder2Model = new UserSeachOrder2Model();
         BeanUtils.copyProperties(userSeachOrderModel, userSeachOrder2Model);
         userSeachOrder2Model.setUserId(userId);
 
-        return orderService2.userSearch(userSeachOrder2Model, pageable);
+        return orderService2.userSearch(userSeachOrder2Model);
     }
 
     public ResultContent goodsDetail(String id) {
@@ -169,13 +169,13 @@ public class OrderServiceImp implements OrderService {
         return orderService2.orderDetail(userId, orderNo);
     }
 
-    public ResultContent<Page<OrderResult2Model>> shopSearch(AdminSeachOrderModel adminSeachOrderModel, Pageable pageable) {
+    public ResultContent<Page<OrderResult2Model>> shopSearch(AdminSeachOrderModel adminSeachOrderModel) {
         adminSeachOrderModel.setShopId(authHelper.getEnterPriseId());
-        return orderService2.adminSearch(adminSeachOrderModel, pageable);
+        return orderService2.adminSearch(adminSeachOrderModel);
     }
 
-    public ResultContent<Page<OrderResult2Model>> adminSearch(AdminSeachOrderModel adminSeachOrderModel, Pageable pageable) {
-        return orderService2.adminSearch(adminSeachOrderModel, pageable);
+    public ResultContent<Page<OrderResult2Model>> adminSearch(AdminSeachOrderModel adminSeachOrderModel) {
+        return orderService2.adminSearch(adminSeachOrderModel);
     }