xuhy
2025-04-30 fd345592daef5f203af84eeb4fa33fd989a2ba66
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
@@ -807,7 +808,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,8 +908,20 @@
            return R.fail("订单不存在");
        }
        order.setSubsidy(recycleSubsidy);
        order.setOrderMoney(order.getOrderMoney().add(recycleSubsidy));
        orderService.updateById(order);
        return R.ok();
    }
    /**
     * 领取补贴金
     */
    @GetMapping(value = "/getTodayOrderData")
    public R<List<Order>> getTodayOrderData() {
        List<Order> orders = orderService.list(Wrappers.lambdaQuery(Order.class)
                .eq(Order::getTime, LocalDate.now())
                .eq(Order::getIsDelete, 0));
        return R.ok(orders);
    }
}