From 336cc1da02624db3d42ad09187b6b51b98ee35dc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 14:20:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
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