Merge remote-tracking branch 'origin/master'

xuhy

2024-12-31 e013e819f7d544c5c8c59e69ce42c3d10e2215e6

Merge remote-tracking branch 'origin/master'

 applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java

@@ -71,8 +71,9 @@
                .orderByDesc(TLineUp::getCreateTime)
                .last("LIMIT 1"));
        TLineUpVO tLineUpVO = new TLineUpVO();
        BeanUtils.copyProperties(lineUp, tLineUpVO);

        if (lineUp!=null){
            BeanUtils.copyProperties(lineUp, tLineUpVO);
        }
        long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
                .eq(TLineUp::getStoreId, storeId)
                .eq(TLineUp::getStatus, 1)

 manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java

@@ -22,7 +22,9 @@
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;

@@ -58,6 +60,7 @@
    private LoginInfoUtil loginInfoUtil;
    @Autowired
    private TOptometryService optometryService;

    @ApiOperation(value = "核算订单分页列表")
    @PostMapping(value = "/pageList")
    public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
@@ -96,7 +99,7 @@
        res.setUserId(byId.getUserId());
        res.setOptometryId(byId.getOptometryId());
        List<TOptometryDetail> list = optometryDetailService.lambdaQuery().eq(TOptometryDetail::getOrderId, id)
                .eq(TOptometryDetail::getType, 1).list();
                .eq(TOptometryDetail::getType,  1).list();
        res.setOptometryDetails(list);
        List<TOrderGoods> orderGoods = orderGoodsService.lambdaQuery()
                .eq(TOrderGoods::getOrderId, id).list();

 manage/src/main/java/com/jilongda/manage/utils/TaskUtil.java

@@ -21,12 +21,12 @@
    @Resource
    private TLineUpService lineUpService;

    // 每天晚上9点执行的定时任务
    // 每天晚上11点执行的定时任务
    @Scheduled(cron = "0 0 23 * * ?")
    public void taskNineDay() {
        try {
            System.err.println("执行每天晚上定时任务 排号修改状态");
            List<TLineUp> list = lineUpService.lambdaQuery().eq(TLineUp::getStatus, 1).list();
            List<TLineUp> list = lineUpService.lambdaQuery().ne(TLineUp::getStatus, 3).list();
            for (TLineUp tLineUp : list) {
                tLineUp.setStatus(5);
            }