From a1e4cfc3de4f3f3f3956b769bc7af40d097c8a4c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 15:12:57 +0800
Subject: [PATCH] 修改bug
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 50e420e..20ff43d 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
@@ -213,12 +213,12 @@
list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
.eq("state", 1)
- .eq("shelves",1));
+ .eq("shelves",1).le("startTime",new Date()).ge("endTime",new Date()));
if (list.size() > 0 ){
Iterator<PointsMerchandise> iterator = list.iterator();
while (iterator.hasNext()) {
PointsMerchandise merchandise = iterator.next();
- if (merchandise.getUseScope() == 2 && (!Objects.equals(merchandise.getCityCode(), cityCode) && !Objects.equals(merchandise.getProvinceCode(), provinceCode))) {
+ if (merchandise.getUseScope() == 2 && (!cityCode.equals(merchandise.getCityCode()) || !provinceCode.equals(merchandise.getProvinceCode()))) {
iterator.remove(); // 移除符合条件的商品
}
}
--
Gitblit v1.7.1