From b4c77c0839258280044cf65a15471fa3c20d465f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 十一月 2023 09:12:38 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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..3d96cac 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);
+
}
--
Gitblit v1.7.1