From eb6b6dbb35a9f029e0b7d269773685c19fd40976 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 11 七月 2024 10:47:51 +0800
Subject: [PATCH] 玩湃微信商户认证代码

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
index 39e2c5b..f9eb7cc 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -288,9 +288,9 @@
         return ResultUtil.success();
     }
 
-
+    private String smid = "2088330203191220";//平台支付宝商户号
     private ResultUtil AlipayPayment(String code, BigDecimal amount) {
-        ResultUtil alipay = payMoneyUtil.alipay("玩湃币充值", "玩湃币充值", "", code, amount.toString(),
+        ResultUtil alipay = payMoneyUtil.alipay(smid,"玩湃币充值", "玩湃币充值", "", code, amount.toString(),
                 "/base/recharge/alipayRechargeCallback");
         if (alipay.getCode() == 200) {
             new Thread(new Runnable() {
@@ -328,15 +328,21 @@
                                 if ("TRADE_CLOSED".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus) || num == 10) {
                                     records.setState(3);
                                     rereMapper.deleteById(records.getId());
+                                    if ("TRADE_FINISHED".equals(tradeStatus)) {
+                                        // todo 资金结算
+                                        payMoneyUtil.confirm(smid,code,tradeNo,amount.toString());
+                                        break;
+                                    }
                                     break;
                                 }
+
                                 if ("TRADE_SUCCESS".equals(tradeStatus)) {
                                     records.setAppUserId(null);
                                     records.setPayStatus(2);
                                     records.setPayTime(new Date());
                                     records.setOrderNumber(tradeNo);
                                     rereMapper.updateById(records);
-
+                                    payMoneyUtil.confirm(smid,code,tradeNo,amount.toString());
                                     RechargeRecords rechargeRecords = rereMapper.selectOne(new QueryWrapper<RechargeRecords>()
                                             .eq("code", code));
                                     if (rechargeRecords.getPayStatus() == 2) {

--
Gitblit v1.7.1