From 2493985a5bdfc6496381b39de0f9713b79c2e51d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 25f4833..cbb978c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1831,6 +1831,9 @@
@Override
public ResultUtil exchangeAddPaymentCallback(String code, String orderNumber,Integer payType) {
List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code);
+ if(userPointsMerchandises.get(0).getPayStatus() == 2){
+ return ResultUtil.success();
+ }
if (userPointsMerchandises.size() > 1){
for (int i = 0; i < userPointsMerchandises.size(); i++) {
userPointsMerchandises.get(i).setOrderNumber(orderNumber+ "-" + (i+1));
--
Gitblit v1.7.1