| | |
| | | |
| | | |
| | | @PutMapping("/cancelOrder/{orderId}") |
| | | @ApiOperation(value = "取消订单操作", tags = {"管理后台-订单管理"}) |
| | | @ApiOperation(value = "取消订单操作", tags = {"后台-订单管理"}) |
| | | public R cancelOrder(@PathVariable("orderId") Long orderId) { |
| | | return orderService.cancelOrder(orderId); |
| | | } |
| | |
| | | |
| | | |
| | | @GetMapping("/getOrderPageList") |
| | | @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", }) |
| | | public R<PageInfo<OrderPageListVo>> getOrderPageList(OrderPageList orderPageList) { |
| | | @ApiOperation(value = "获取订单列表", tags = {"后台-订单管理", }) |
| | | public R<PageInfo<OrderManagePageListVO>> getOrderPageList(OrderPageList orderPageList) { |
| | | return R.ok(orderService.getOrderPageList(orderPageList)); |
| | | } |
| | | |
| | |
| | | */ |
| | | @GetMapping("/exportExpress") |
| | | public void exportExpress(HttpServletResponse response, OrderPageList orderPage) { |
| | | //搜索条件,用户姓名 |
| | | /* //搜索条件,用户姓名 |
| | | if (StringUtils.isNotEmpty(orderPage.getUserName())) { |
| | | List<AppUser> data = appUserClient.getAppUserByNameNoFilter(orderPage.getUserName()).getData(); |
| | | List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList()); |
| | |
| | | } else { |
| | | orderPage.setAppUserIds(collect); |
| | | } |
| | | } |
| | | }*/ |
| | | //搜索条件,用户电话 |
| | | if (StringUtils.isNotEmpty(orderPage.getPhone())) { |
| | | List<AppUser> data = appUserClient.getAppUserByPhoneNoFilter(orderPage.getPhone()).getData(); |