From 13e1a53b65a82c5d5fd07691144ae5da34171959 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 10:03:44 +0800
Subject: [PATCH] 修改查询bug
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 5 +----
1 files changed, 1 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 7709f2d..aefa073 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
@@ -639,7 +639,7 @@
detailsVo.setGoodName(coursePackage.getName());
detailsVo.setBelongsScope(merchandise.getUserPopulation());
int coursePackageNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
- .eq("pointsMerchandiseId", merchandise.getId()));
+ .eq("pointsMerchandiseId", merchandise.getId()).eq("payStatus", 2).eq("state", 1));
detailsVo.setRedeemedNum(coursePackageNums);
detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - coursePackageNums, 0));
detailsVo.setPerLimit(merchandise.getPickUpQuantity());
@@ -926,14 +926,11 @@
String endDate = dateFormat.format(end);
detailsResponse.setStartTime(startDate);
detailsResponse.setEndTime(startDate);
-
Date now = new Date();
Calendar cal1 = Calendar.getInstance();
cal1.setTime(pointsMerchandise.getInsertTime());
-
Calendar cal2 = Calendar.getInstance();
cal2.setTime(now);
-
// Compare the year, month, and day of the two Calendar instances
boolean isSameDate = cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH) &&
--
Gitblit v1.7.1