二手家电回收
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2025-04-22 0846753b50b65e8974b3860e6064c38be9c114a9 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java


@@ -807,7 +807,7 @@




        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")


@@ -907,6 +907,7 @@


            return R.fail("订单不存在");


        }


        order.setSubsidy(recycleSubsidy);


        order.setOrderMoney(order.getOrderMoney().add(recycleSubsidy));


        orderService.updateById(order);


        return R.ok();


    }