From 5dc40fcd64b0513150f1d8335ab849e6d8cdc28e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 04 七月 2025 19:42:49 +0800
Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付

---
 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java |   87 ++++++++++++++++++++++++++++++-------------
 1 files changed, 60 insertions(+), 27 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 70acfbd..b52f889 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
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.poi.excel.ExcelUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -26,6 +27,8 @@
 import com.dsh.competition.service.IPaymentCompetitionService;
 import com.dsh.competition.service.UserCompetitionService;
 import com.dsh.competition.util.*;
+import com.dsh.competition.util.wx.WxV3PayConfig;
+import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -38,9 +41,11 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -440,6 +445,61 @@
      * @param response
      */
     @ResponseBody
+    @PostMapping("/base/competition/weChatPaymentCompetitionCallback1")
+    public void weChatPaymentCompetitionCallback1(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            System.err.println("微信回调");
+            System.err.println("请求" + request);
+            BufferedReader reader = request.getReader();
+            String string1 = reader.toString();
+            System.err.println("请求reader" + string1);
+            StringBuilder requestBody = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                requestBody.append(line);
+            }
+            System.err.println("全部请求体" + requestBody);
+            JSONObject jsonObject = JSONObject.parseObject(requestBody.toString());
+            JSONObject resource = jsonObject.getJSONObject("resource");
+
+            AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
+            String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
+                    resource.getString("ciphertext"));
+            System.err.println("微信解密的字符串信息" + decryptedData);
+            JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData);
+            String code = jsonInfo.getString("out_trade_no");
+            String transaction_id = jsonInfo.getString("transaction_id");
+            String trade_state = jsonInfo.getString("trade_state");
+            if (trade_state.equals("SUCCESS")) {
+                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);
+                    paymentCompetitionService.updateById(paymentCompetition);
+                    Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
+                    competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
+                    cttService.updateById(competition);
+                }
+
+
+                PrintWriter out = response.getWriter();
+                out.write("SUCCESS");
+                out.flush();
+                out.close();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    /**
+     * 报名赛事微信支付回调
+     *
+     * @param request
+     * @param response
+     */
+    @ResponseBody
     @PostMapping("/base/competition/weChatPaymentCompetitionCallback")
     public void weChatPaymentCompetitionCallback(HttpServletRequest request, HttpServletResponse response) {
         try {
@@ -460,34 +520,7 @@
                     Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
                     competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
                     cttService.updateById(competition);
-                    if (competition.getOperatorId()!=null && competition.getOperatorId()!=0){
-                        // 休眠两分钟后再调用分账接口 避免提示订单正在处理中
-                        Thread.sleep(120000);
-                        // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
-                        String proportionByOperatorId = storeClient.getProportionByOperatorId(competition.getOperatorId());
-                        String[] split = proportionByOperatorId.split(",");
-                        String s1 = split[0];
-                        if (!s1.equals("未设置")){
-                            BigDecimal bigDecimal = new BigDecimal(s1);
-                            // 分账比例
-                            BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
-                            // 微信商户号
-                            String s2 = storeClient.getmerchantNumberByOperatorId(competition.getOperatorId());
-                            String nonce_str = UUIDUtil.getRandomCode(16);
-                            paymentCompetition.setFenzhangOrderNo(nonce_str);
-                            BigDecimal bigDecimal2 = new BigDecimal(paymentCompetition.getAmount());
-                            ResultUtil fenzhang = payMoneyUtil.fenzhang(transaction_id, bigDecimal2.multiply(bigDecimal1), s2,nonce_str,"报名赛事分账");
-                            if (!fenzhang.getCode().equals(200)){
-                                System.err.println("分账失败 原因是:"+fenzhang.getData()+"-"+fenzhang.getMsg());
-                            }else{
-                                paymentCompetition.setFenzhangNo(fenzhang.getData().toString());
-                                paymentCompetition.setFenzhangAmount(bigDecimal2.multiply(bigDecimal1));
-                                paymentCompetitionService.updateById(paymentCompetition);
-                            }
-                        }
-                    }
                 }
-
 
                 PrintWriter out = response.getWriter();
                 out.write(result);

--
Gitblit v1.7.1