From ff1be70b35a043a42ef7471c3ed9f10a9a736db0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 一月 2025 14:33:04 +0800
Subject: [PATCH] bug修改
---
applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
index def8b25..410183f 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
@@ -67,20 +67,28 @@
TLineUp lineUp = tLineUpService.getOne(Wrappers.lambdaQuery(TLineUp.class)
.eq(TLineUp::getUserId, userId)
.eq(TLineUp::getStoreId, storeId)
- .likeRight(TLineUp::getCreateTime, LocalDate.now())
+ .eq(TLineUp::getStatus, 1)
+ .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) {
--
Gitblit v1.7.1