|
@@ -137,7 +137,7 @@ public class OrderController {
|
|
@ResourceAuth(value = AuthConstant.User, type = AuthType.User)
|
|
@ResourceAuth(value = AuthConstant.User, type = AuthType.User)
|
|
public ResultContent<Page<OrderResultModel>> userSearch(@RequestBody UserSeachOrderModel userSeachOrderModel) {
|
|
public ResultContent<Page<OrderResultModel>> userSearch(@RequestBody UserSeachOrderModel userSeachOrderModel) {
|
|
|
|
|
|
- return orderServiceImp.userSearch(userSeachOrderModel, page(userSeachOrderModel));
|
|
|
|
|
|
+ return orderServiceImp.userSearch(userSeachOrderModel);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation("app订单详情")
|
|
@ApiOperation("app订单详情")
|
|
@@ -165,7 +165,7 @@ public class OrderController {
|
|
@ResourceAuth(value = "admin", type = AuthType.Enterprise)
|
|
@ResourceAuth(value = "admin", type = AuthType.Enterprise)
|
|
@ResourceAuth(value = "admin", type = AuthType.Project)
|
|
@ResourceAuth(value = "admin", type = AuthType.Project)
|
|
public ResultContent<Page<OrderResult2Model>> shopSearch(@RequestBody AdminSeachOrderModel seachOrderModel) {
|
|
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)
|
|
@ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
|
|
public ResultContent<Page<OrderResult2Model>> platformSearch(@RequestBody AdminSeachOrderModel seachOrderModel) {
|
|
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);
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|