From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 4ba2cd2..9394121 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -295,11 +295,11 @@
cIds.add(pointsMerchandiseCity.getPointsMerchandiseId());
}
- if (cIds.size()>0) {
+// if (cIds.size()>0) {
List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
.eq("state", 1)
- .eq("shelves", 1).in("id", cIds)
+ .eq("shelves", 1)
.gt("endTime", new Date()));
if (merchandises.size() > 0){
for (PointsMerchandise merchandise : merchandises) {
@@ -311,7 +311,7 @@
integralCommodity.setGoodsType(merchandise.getType());
commodity.add(integralCommodity);
}
- }
+// }
}
System.out.println(commodity);
@@ -881,10 +881,10 @@
// Print the result
if (isSameDate) {
-
} else {
System.out.println("The two dates do not have the same date.");
detailsResponse.setUseStatus(3);
+
}
@@ -1186,8 +1186,10 @@
}else {
detailsVo.setUseType(1);
detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
- StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
- detailsVo.setWriteOffName(courseOfStore.getStoreName());
+ if (byId.getStoreId()!=null) {
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
+ detailsVo.setWriteOffName(courseOfStore.getStoreName());
+ }
}
switch (pmdsServiceById.getUseScope()){
case 1:
--
Gitblit v1.7.1