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

---
 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentServiceImpl.java
index 8789d3c..02622b7 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentServiceImpl.java
@@ -70,6 +70,7 @@
         //开始处理退款
         //免费
         if(worldCupPayment.getPayType() == 0){
+            worldCupPayment.setWorldCupId(null);
             worldCupPayment.setRefundOrderNo("");
             worldCupPayment.setRefundTime(new Date());
             worldCupPayment.setPayStatus(3);
@@ -99,6 +100,7 @@
             }
             if("10000".equals(map.get("code"))){
                 String trade_no = map.get("trade_no");
+                worldCupPayment.setWorldCupId(null);
                 worldCupPayment.setRefundTime(new Date());
                 worldCupPayment.setRefundOrderNo(trade_no);
                 worldCupPayment.setPayStatus(3);
@@ -111,6 +113,7 @@
             AppUser appUser = appUserClient.getAppUser(appUserId);
             appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() + multiply.intValue());
             appUserClient.updateAppUser(appUser);
+            worldCupPayment.setWorldCupId(null);
             worldCupPayment.setRefundTime(new Date());
             worldCupPayment.setRefundOrderNo("");
             worldCupPayment.setPayStatus(3);
@@ -123,6 +126,7 @@
                 DeductionClassHourList deductionClassHourList = JSON.parseObject(content, DeductionClassHourList.class);
                 coursePackageOrderStudentClient.backspaceClassHour(deductionClassHourList);
             }
+            worldCupPayment.setWorldCupId(null);
             worldCupPayment.setRefundTime(new Date());
             worldCupPayment.setRefundOrderNo("");
             worldCupPayment.setPayStatus(3);

--
Gitblit v1.7.1