From 818e8d1810bcdcbeae5a948ecd115ff0ce5a1f54 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 17:56:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index ee69822..a83c0f5 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -221,6 +221,7 @@
PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 1));
if(paymentCompetition.getPayStatus() == 1){
+ paymentCompetition.setAppUserId(null);
paymentCompetition.setPayStatus(2);
paymentCompetition.setPayTime(new Date());
paymentCompetition.setPayOrderNo(transaction_id);
@@ -258,6 +259,7 @@
PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 2));
if(paymentCompetition.getPayStatus() == 1){
+ paymentCompetition.setAppUserId(null);
paymentCompetition.setPayStatus(2);
paymentCompetition.setPayTime(new Date());
paymentCompetition.setPayOrderNo(trade_no);
--
Gitblit v1.7.1