bug修改

无关风月

2025-01-23 c3019597126f19e8508bd22e7da3a39058033510

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

@@ -19,6 +19,8 @@

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;

/**
 * <p>
@@ -52,6 +54,7 @@
    public ApiResult add(@Validated @RequestBody TLineUp dto) {
        // 获取当天该门店的排号
        long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
                .likeRight(TLineUp::getCreateTime, LocalDate.now())
                .eq(TLineUp::getStoreId, dto.getStoreId()));
        dto.setStatus(1);
        dto.setUserId(loginInfoUtil.getUserId());
@@ -64,24 +67,33 @@
    @GetMapping(value = "/getUserLineUpByStoreId")
    public ApiResult getUserLineUpByStoreId(@RequestParam Integer storeId) {
        long userId = loginInfoUtil.getUserId();
        List<Integer> list = Arrays.asList(1, 2);

        TLineUp lineUp = tLineUpService.getOne(Wrappers.lambdaQuery(TLineUp.class)
                .eq(TLineUp::getUserId, userId)
                .eq(TLineUp::getStoreId, storeId)
                .eq(TLineUp::getStatus, 1)
                .in(TLineUp::getStatus, list)
                .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)
                    .lt(lineUp!=null,TLineUp::getCode, lineUp.getCode())
                    .likeRight(TLineUp::getCreateTime, LocalDate.now()));
            tLineUpVO.setLinUpCount(count);

        long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
                .eq(TLineUp::getStoreId, storeId)
                .eq(TLineUp::getStatus, 1)
                .lt(TLineUp::getCode, lineUp.getCode())
                .likeRight(TLineUp::getCreateTime, LocalDate.now()));
        tLineUpVO.setLinUpCount(count);
        }else{
            long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
                    .eq(TLineUp::getStoreId, storeId)
                    .eq(TLineUp::getStatus, 1)
                    .likeRight(TLineUp::getCreateTime, LocalDate.now()));
            tLineUpVO.setLinUpCount(count);
        }
        return ApiResult.success(tLineUpVO);
    }

    @ApiOperation(value = "取消排号")
    @GetMapping(value = "/cancelLineUp")
    public ApiResult cancelLineUp(@RequestParam Integer id) {