| | |
|---|
| | | */ |
|---|
| | | @ApiOperation(value = "订单列表-批量修改订单时间", tags = {"后台-订单管理[2.0]"}) |
|---|
| | | @GetMapping(value = "/batchUpdateTime") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(value = "多个id ',' 拼接", name = "ids", dataType = "String", required = true), |
|---|
| | | @ApiImplicitParam(value = "修改上门时间", name = "time", dataType = "String", required = true), |
|---|
| | | }) |
|---|
| | | public R<Boolean> batchUpdateTime(@RequestParam("ids") String ids, @RequestParam("time") String time) { |
|---|
| | | List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList()); |
|---|
| | | List<Order> list = orderService.lambdaQuery().in(Order::getId, idList).list(); |
|---|
| | |
|---|
| | | */ |
|---|
| | | @ApiOperation(value = "师傅端-订单列表", tags = {"师傅端"}) |
|---|
| | | @GetMapping(value = "/orderListWorker") |
|---|
| | | public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state, |
|---|
| | | public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,@RequestParam("searchValues") String searchValues, |
|---|
| | | @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, |
|---|
| | | @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { |
|---|
| | | return R.ok(orderService.orderListWorker(userId, state, pageNum, pageSize)); |
|---|
| | | return R.ok(orderService.orderListWorker(userId, state, searchValues,pageNum, pageSize)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | |
|---|
| | | |
|---|
| | | QueryWrapper<Order> wrapper = new QueryWrapper<>(); |
|---|
| | | wrapper.eq("server_id", workerId) |
|---|
| | | .in("state", 1, 2) |
|---|
| | | .in("state", 1, 2,7) |
|---|
| | | .eq("is_delete", Constants.ZERO) |
|---|
| | | .eq("DATE(time)", todayStr) // 添加这一行来筛选当天的订单 |
|---|
| | | .orderByAsc("CASE WHEN topSort IS NULL THEN 1 ELSE 0 END") |
|---|
| | |
|---|
| | | return R.ok(orderService.placeOrder(userOrderRequest)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 师傅端-打电话 |
|---|
| | | */ |
|---|
| | | @ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"}) |
|---|
| | | @GetMapping(value = "/call") |
|---|
| | | public R<String> call(@RequestParam("orderId") String orderId) { |
|---|
| | | Order order = orderService.getById(orderId); |
|---|
| | | if(Objects.isNull(order)){ |
|---|
| | | return R.fail("订单不存在"); |
|---|
| | | } |
|---|
| | | if(order.getState() == 7){ |
|---|
| | | order.setState(1); |
|---|
| | | orderService.updateById(order); |
|---|
| | | } |
|---|
| | | return R.ok(); |
|---|
| | | } |
|---|
| | | /** |
|---|
| | | * 领取补贴金 |
|---|
| | | */ |
|---|
| | | @GetMapping(value = "/receiving") |
|---|
| | | public R<String> receiving(@RequestParam("orderId")String orderId, @RequestParam("recycleSubsidy")BigDecimal recycleSubsidy) { |
|---|
| | | Order order = orderService.getById(orderId); |
|---|
| | | if(Objects.isNull(order)){ |
|---|
| | | return R.fail("订单不存在"); |
|---|
| | | } |
|---|
| | | order.setSubsidy(recycleSubsidy); |
|---|
| | | order.setOrderMoney(order.getOrderMoney().add(recycleSubsidy)); |
|---|
| | | orderService.updateById(order); |
|---|
| | | return R.ok(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
