| | |
|---|
| | | |
|---|
| | | 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.fail("订单不存在"); |
|---|
| | | } |
|---|
| | | if(order.getState() == 7){ |
|---|
| | | order.setState(2); |
|---|
| | | 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(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
