From e82c8c746df1bfa1cab545dff6c4ca29fea5a410 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 18:49:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..511c4dd 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,21 @@
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(TLineUp::getCode, lineUp.getCode())
+ .lt(lineUp!=null,TLineUp::getCode, lineUp.getCode())
.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