From 4e124926ee6ee682084466067ae37550fca475fa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 11:39:48 +0800
Subject: [PATCH] 代码提交 世界杯修改支付宝资金结算功能

---
 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java |  175 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 140 insertions(+), 35 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 db27a44..208c8bc 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;
@@ -20,12 +21,15 @@
 import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
 import com.dsh.competition.feignclient.model.*;
 import com.dsh.competition.feignclient.other.StoreClient;
+import com.dsh.competition.feignclient.other.model.Store;
 import com.dsh.competition.model.*;
 import com.dsh.competition.service.CompetitionService;
 import com.dsh.competition.service.IParticipantService;
 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 +42,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 +446,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 {
@@ -602,6 +663,64 @@
                     out.flush();
                     out.close();
                 }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    /**
+     * 取消已报名赛事后微信回退金额回调微信V3服务商版本
+     *
+     * @param request
+     * @param response
+     */
+    @ResponseBody
+    @PostMapping("/base/competition/weChatCancelPaymentCompetitionCallback1")
+    public void weChatCancelPaymentCompetitionCallback1(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 refund_status = jsonInfo.getString("refund_status");
+            String out_refund_no = jsonInfo.getString("out_refund_no");
+            if (refund_status.equals("SUCCESS")) {
+                PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>()
+                        .eq("code", code).eq("payType", 1));
+                if (paymentCompetition.getPayStatus() == 2) {
+                    paymentCompetition.setPayStatus(3);
+                    paymentCompetition.setRefundTime(new Date());
+                    paymentCompetition.setRefundOrderNo(out_refund_no);
+                    paymentCompetition.setAppUserId(null);
+                    paymentCompetitionService.updateById(paymentCompetition);
+
+                    Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
+                    competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
+                    cttService.updateById(competition);
+                    storeClient.addBackRecord(paymentCompetition.getAmount() + "_" + paymentCompetition.getAppUserId());
+
+                }
+                PrintWriter out = response.getWriter();
+                out.write("SUCCESS");
+                out.flush();
+                out.close();
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -799,46 +918,32 @@
                 String code = paymentCompetition.getCode();
                 Double amount = paymentCompetition.getAmount();
                 Competition competition = competitionService.getById(paymentCompetition.getCompetitionId());
-
-
+                Store store = storeClient.queryStoreById(Integer.valueOf(competition.getStoreId().split(",")[0]));
                 String payOrderNo = paymentCompetition.getPayOrderNo();
                 if (paymentCompetition.getPayType() == 1) {//微信支付
-                    if (StringUtils.hasLength(paymentCompetition.getFenzhangNo())){
-                        // 是分账订单 如果分账金额不为0 那么回退分账金额
-                        if (paymentCompetition.getFenzhangAmount()!=null && paymentCompetition.getFenzhangAmount().compareTo(BigDecimal.ZERO)>0){
-                            String randomCode = UUIDUtil.getRandomCode(16);
-                            String randomCode1 = UUIDUtil.getRandomCode(16);
-                            if (competition.getOperatorId()!=null && competition.getOperatorId()!=0){
-                                // 微信商户号
-                                String s2 =storeClient.getmerchantNumberByOperatorId(competition.getOperatorId());
-                                ResultUtil resultUtil = payMoneyUtil.fenzhangRefund(paymentCompetition.getFenzhangNo(), paymentCompetition.getFenzhangAmount(), s2, randomCode, randomCode1);
-                                if (!resultUtil.getCode().equals(500)){
-                                    System.err.println("分账回退失败 原因是:"+resultUtil.getMsg());
-                                }else{
-                                    paymentCompetition.setFenzhangRefundNo(resultUtil.getMsg());
-                                    paymentCompetitionService.updateById(paymentCompetition);
-                                }
-
-                            }
+                    if (store.getOperatorId()!=null && store.getOperatorId()!=0){
+                        String smidVx= storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
+                        if (!StringUtils.hasLength(smidVx)){
+                            System.err.println("运营商未配置微信商户号,获取支付失败!");
                         }
-                    }
-
-
-
-
-                    Map<String, String> map = payMoneyUtil.wxRefund(payOrderNo, code, amount.toString(), amount.toString(),
-                            "/base/competition/weChatCancelPaymentCompetitionCallback");
-                    String return_code = map.get("return_code");
-                    if (!"SUCCESS".equals(return_code)) {
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+                        String codeRefund = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);// 退款单号
+                        // 运营商退款
+                        payMoneyUtil.weixinRefundV3(smidVx, codeRefund, pay.getPayOrderNo(), pay.getAmount().toString(), "/base/competition/weChatCancelPaymentCompetitionCallback1");
+                    }else {
+                        Map<String, String> map = payMoneyUtil.wxRefund(payOrderNo, code, amount.toString(), amount.toString(),
+                                "/base/competition/weChatCancelPaymentCompetitionCallback");
+                        String return_code = map.get("return_code");
+                        if (!"SUCCESS".equals(return_code)) {
 //                        return ResultUtil.error(map.get("return_msg"));
-                        continue;
+                            continue;
+                        }
+                        String refund_id = map.get("refund_id");
+                        paymentCompetition.setRefundOrderNo(refund_id);
+                        paymentCompetition.setAppUserId(null);
+                        paymentCompetitionService.updateById(paymentCompetition);
+                        storeClient.addBackRecord(paymentCompetition.getAmount() + "_" + paymentCompetition.getAppUserId());
                     }
-                    String refund_id = map.get("refund_id");
-                    paymentCompetition.setRefundOrderNo(refund_id);
-                    paymentCompetition.setAppUserId(null);
-                    paymentCompetitionService.updateById(paymentCompetition);
-                    storeClient.addBackRecord(paymentCompetition.getAmount() + "_" + paymentCompetition.getAppUserId());
-
                 }
                 if (paymentCompetition.getPayType() == 2) {//支付宝支付
                     Map<String, String> map = payMoneyUtil.aliRefund(payOrderNo, amount.toString());

--
Gitblit v1.7.1