From 083bed1be51dc21792a245b035b50dfef0a24db3 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 19:07:18 +0800
Subject: [PATCH] update
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 16 ++++++++++++++--
1 files changed, 14 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..c959663 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(); // 移除符合条件的商品
}
}
@@ -447,6 +447,16 @@
detailsResponse.setEndTime(simpleDateFormat.format(merchandise.getEndTime()));
detailsResponse.setUseStatus(pointsMerchandise.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(merchandise.getType());
+ if(merchandise.getType()==3){
+ detailsResponse.setUserId(appUserId);
+ if(merchandise.getUseScope()==1){
+ detailsResponse.setSid(0);
+ }else if(merchandise.getUseScope()==2){
+
+ }else if(merchandise.getUseScope()==3){
+
+ }
+ }
responses.add(detailsResponse);
}
detailsVo.setDetailsResponses(responses);
@@ -712,6 +722,8 @@
vo.setSort(byId.getSort());
vo.setContent(byId.getRedemptionInstructions());
}
+ int count = userPointsMerchandiseService.count(new LambdaQueryWrapper<UserPointsMerchandise>().eq(UserPointsMerchandise::getPointsMerchandiseId, pointMercharsId));
+ vo.setNum(count);
return vo;
}
--
Gitblit v1.7.1