From c89257be6b734b7b7bbeb199634de918f2faec8a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 02 一月 2025 09:23:07 +0800
Subject: [PATCH] 定时任务
---
manage/src/main/java/com/jilongda/manage/controller/TOrderController.java | 1 -
applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java | 4 ++++
manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java | 8 ++++++--
applet/src/main/resources/mapping/TCouponReceiveMapper.xml | 3 ++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java b/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java
index 5cd8836..11d9750 100644
--- a/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java
+++ b/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java
@@ -43,6 +43,10 @@
if(appUser.getStatus()!=1){
throw new ServiceException("账号被冻结,请联系管理员");
}
+ appUser.setPhone(appletUserDecodeData.getPhoneNumber());
+ appUser.setAvatar(StringUtils.hasLength(appUser.getAvatar())?appUser.getAvatar():"");
+ appUser.setName(StringUtils.hasLength(appUser.getName())?appUser.getName(): RptUtils.around(appletUserDecodeData.getPhoneNumber(),3,4));
+ this.updateById(appUser);
}
return appUser;
}
diff --git a/applet/src/main/resources/mapping/TCouponReceiveMapper.xml b/applet/src/main/resources/mapping/TCouponReceiveMapper.xml
index e026d56..ab645b6 100644
--- a/applet/src/main/resources/mapping/TCouponReceiveMapper.xml
+++ b/applet/src/main/resources/mapping/TCouponReceiveMapper.xml
@@ -33,9 +33,10 @@
<if test="query.userId != null">
and tcr.userId = #{query.userId}
</if>
+ and tcr.status=1
AND tcr.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
</where>
- ORDER BY tcr.status ASC,tcr.createTime DESC
+ ORDER BY tcr.createTime DESC
</select>
</mapper>
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java
index 89f6c70..e17eff1 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java
@@ -39,10 +39,14 @@
PageInfo<TLineUp> res = lineUpService.pageList(query);
return ApiResult.success(res);
}
- @ApiOperation(value = "查询当前排队人数",tags = "排号a管理")
+ @ApiOperation(value = "查询当前排队人数",tags = "排号管理")
@GetMapping(value = "/getCount")
public ApiResult getCount(@RequestParam Integer storeId) {
- return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStoreId,storeId).eq(TLineUp::getStatus,1).list().size());
+ if (storeId!=null){
+ return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStoreId,storeId).eq(TLineUp::getStatus,1).list().size());
+ }else{
+ return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStatus,1).list().size());
+ }
}
@ApiOperation(value = "取消排队",tags = "排号管理")
@GetMapping(value = "/cancel")
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
index 2ed18f8..545c00c 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
@@ -180,7 +180,6 @@
dto.setPhone(byId.getPhone());
}
orderService.save(dto);
-
List<TOptometryDetail> optometryDetails = dto.getOptometryDetails();
if (!CollectionUtils.isEmpty(optometryDetails)){
for (TOptometryDetail optometryDetail : optometryDetails) {
--
Gitblit v1.7.1