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-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java |  156 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 92 insertions(+), 64 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index 9219575..4ab5f6f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -1,5 +1,9 @@
 package com.dsh.account.service.impl;
 
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipayTradeOrderSettleRequest;
+import com.alipay.api.response.AlipayTradeOrderSettleResponse;
 import com.alipay.api.response.AlipayTradeQueryResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -39,6 +43,7 @@
 import com.dsh.account.service.TCourseInfoRecordService;
 import com.dsh.account.service.TStudentService;
 import com.dsh.account.util.*;
+import com.dsh.account.util.wx.WxV3PayConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -394,7 +399,7 @@
         try {
             switch (request.getPayType()) {
                 case 1:
-                    return WeChatPayment(code, request.getPayAmount(), hour);
+                    return WeChatPayment(code, request.getPayAmount(), hour,request.getLessonId());
                 case 2:
                     return AlipayPayment(code, request.getPayAmount(), hour);
                 case 3:
@@ -419,63 +424,36 @@
     }
 
 
-    public ResultUtil WeChatPayment(String code, BigDecimal amount, Integer hour) throws Exception {
-        ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, amount.toString(),
-                "/base/coursePackage/wechatPaymentCallback", "APP", "");
-        if (weixinpay.getCode() == 200) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        int num = 1;
-                        int wait = 0;
-                        while (num <= 10) {
-                            int min = 5000;
-                            wait += (min * num);
-                            Thread.sleep(wait);
-                            TCoursePackagePayment coursePackagePayment = couPayClient.getCoursePackagePaymentByCode(code);
-                            if (coursePackagePayment.getPayStatus() == 2) {
-                                break;
-                            }
-                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
-                            if (resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1) {
-                                /**
-                                 * SUCCESS—支付成功,
-                                 * REFUND—转入退款,
-                                 * NOTPAY—未支付,
-                                 * CLOSED—已关闭,
-                                 * REVOKED—已撤销(刷卡支付),
-                                 * USERPAYING--用户支付中,
-                                 * PAYERROR--支付失败(其他原因,如银行返回失败)
-                                 */
-                                Map<String, String> data1 = resultUtil.getData();
-                                String s = data1.get("trade_state");
-                                String transaction_id = data1.get("transaction_id");
-                                if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
-                                    coursePackagePayment.setState(3);
-                                    couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
-                                    break;
-                                }
-                                if ("SUCCESS".equals(s)) {
-                                    coursePackagePayment.setPayStatus(2);
-                                    coursePackagePayment.setTotalClassHours(hour);
-                                    coursePackagePayment.setLaveClassHours(hour);
-                                    coursePackagePayment.setOrderNumber(transaction_id);
-                                    couPayClient.updatePaymentCoursePackage(coursePackagePayment);
-                                    break;
-                                }
-                                if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
-                                    num++;
-                                }
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }).start();
+    public ResultUtil WeChatPayment(String code, BigDecimal amount, Integer hour,Integer lessonId) throws Exception {
+        // 判断这个课包是属于哪个运营商的
+        CoursePackage coursePackage = coursePackageClient.queryCoursePackageById(lessonId);
+        Integer storeId = coursePackage.getStoreId();
+        Store store = storeClient.queryStoreById(storeId);
+        int isFenZhang= 1;
+        String merchantNumber = "";
+        if (store.getOperatorId()==null || store.getOperatorId()==0){
+            // 平台
+            isFenZhang = 0;
         }
-        return weixinpay;
+        if (isFenZhang == 1) {
+            String s2 = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
+            System.err.println("微信商户号"+s2);
+
+            if(!StringUtils.hasLength(s2)){
+                return ResultUtil.error("运营商未配置微信商户号,获取支付失败!");
+            }
+            ResultUtil weixinpay = payMoneyUtil.weixinpayV3(s2,"课包续费",
+                    code,"/base/coursePackage/wechatPaymentCallback1",
+                   amount.toString());
+            return weixinpay;
+
+        }else{
+            ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, amount.toString(),
+                    "/base/coursePackage/wechatPaymentCallback", "APP", "");
+
+            return weixinpay;
+        }
+
     }
     private String smid = "2088330203191220";//平台支付宝商户号
     public ResultUtil AlipayPayment(String code, BigDecimal amount, Integer hour) {
@@ -486,14 +464,15 @@
         Integer storeId = coursePackage.getStoreId();
         Store store = storeClient.queryStoreById(storeId);
         String smid1= "";
-        if (store.getOperatorId()==null){
+        if (store.getOperatorId()==null || store.getOperatorId()==0){
             // 平台
             smid1 = smid;
         }else{
-            String smidByOperatorId = storeClient.getSMIDByOperatorId(store.getOperatorId());
-            smid1 = smidByOperatorId;
+            smid1  = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
         }
-
+        if (!StringUtils.hasLength(smid1)){
+            return ResultUtil.error("运营商未配置支付宝商户号,获取支付失败!");
+        }
         ResultUtil alipay = payMoneyUtil.alipay(smid1,"课包续费", "课包续费", "", code, amount.toString(),
                 "/base/coursePackage/alipayPaymentCallback");
         if (alipay.getCode() == 200) {
@@ -542,14 +521,19 @@
                                     Integer storeId = coursePackage.getStoreId();
                                     Store store = storeClient.queryStoreById(storeId);
                                     String smid1= "";
-                                    if (store.getOperatorId()==null){
+                                    if (store.getOperatorId()==null || store.getOperatorId() == 0){
                                         // 平台
                                         smid1 = smid;
+                                        // 属于平台 不做资金冻结 不做分账处理
+//                                        payMoneyUtil.confirm(smid1,code,tradeNo,amount.toString());
                                     }else{
                                         String smidByOperatorId = storeClient.getSMIDByOperatorId(store.getOperatorId());
                                         smid1 = smidByOperatorId;
+                                        payMoneyUtil.confirm1(smid1,code,tradeNo,amount.toString());
+                                        // 分账处理
+                                        extracted(store.getOperatorId(), amount, tradeNo);
                                     }
-                                    payMoneyUtil.confirm(smid1,code,tradeNo,amount.toString());
+                                    
                                     break;
                                 }
                                 if ("WAIT_BUYER_PAY".equals(tradeStatus)) {
@@ -565,7 +549,51 @@
         }
         return alipay;
     }
-
+    private void extracted(Integer operatorId, BigDecimal coursePackageOrder1, String tradeNo) throws Exception {
+        // 分账
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+                "2021004105665036",
+                "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==",
+                "json", "GBK",
+                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB",
+                "RSA2");
+        AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
+        String randomCode = UUIDUtil.getRandomCode(16);
+        String proportionByOperatorId1 = storeClient.getProportionByOperatorId(operatorId);
+        // 支付宝分账比例
+        String s1 = proportionByOperatorId1.split(",")[1];
+        double i = Double.parseDouble(s1);
+        double v = i * 0.01;
+        BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(v));
+        // 分账金额
+        BigDecimal bigDecimal2 = coursePackageOrder1.multiply(bigDecimal1).setScale(2, RoundingMode.DOWN);
+        request.setBizContent("{" +
+                "  \"out_request_no\":\"" + randomCode + "\"," +
+                "  \"trade_no\":\"" + tradeNo + "\"," +
+                "  \"royalty_parameters\":[" +
+                "    {" +
+                "      \"royalty_type\":\"transfer\"," +
+                "      \"trans_out\":\"" + storeClient.getSMIDByOperatorId(operatorId)+ "\"," +
+                "      \"trans_out_type\":\"userId\"," +
+                "      \"trans_in_type\":\"userId\"," +
+                "      \"trans_in\":\"" + smid + "\"," +
+                "      \"amount\":" + bigDecimal2 + "," +
+                "      \"desc\":\"平台服务费\"," +
+                "      \"royalty_scene\":\"平台服务费\"," +
+                "    }" +
+                "  ]," +
+                "  \"extend_params\":{" +
+                "    \"royalty_finish\":\"true\"" +
+                "  }," +
+                "  \"royalty_mode\":\"async\"" +
+                "}");
+        AlipayTradeOrderSettleResponse response = alipayClient.execute(request);
+        if (response.isSuccess()) {
+            System.out.println("调用成功");
+        } else {
+            System.out.println("调用失败");
+        }
+    }
     public int PlaypaiGoldPayment(String code, ClasspaymentRequest request) {
         PlayPaiGoldCoursePackage paiGoldCoursePackage = new PlayPaiGoldCoursePackage();
         paiGoldCoursePackage.setCoursePackageId(request.getLessonId());

--
Gitblit v1.7.1