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/resources/mapper/UserPointsMerchandiseMapper.xml | 2 +-
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 2 +-
2 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 a276027..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());
diff --git a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
index bf457a0..2cba3eb 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
@@ -34,7 +34,7 @@
consumeAmount
FROM t_user_points_merchandise pm
LEFT JOIN t_points_merchandise tm ON tm.id = pm.pointsMerchandiseId
- WHERE pm.pointsMerchandiseId IN(
+ WHERE pm.payStatus = 2 and pm.state = 1 and pm.pointsMerchandiseId IN(
SELECT id
FROM t_points_merchandise WHERE redemptionMethod IN (2,3)
--
Gitblit v1.7.1