From b0254c5a17b3915eb00fdcb33f0eea222cff78ee Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 06 三月 2024 15:06:54 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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