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-activity/src/main/java/com/dsh/activity/controller/HuiminController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index 3654a0b..fb252be 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -28,6 +28,7 @@
 import com.dsh.activity.model.response.*;
 import com.dsh.activity.service.*;
 import com.dsh.activity.util.*;
+import com.dsh.activity.util.wx.WxV3PayConfig;
 import com.google.gson.Gson;
 import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
@@ -84,6 +85,8 @@
     @Autowired
     private TokenUtil tokenUtil;
     private String smid = "2088330203191220";//平台支付宝商户号
+    // todo 待申请
+    private String smidVx = "2088330203191220";//平台微信商户号
 
 
     /**
@@ -159,11 +162,14 @@
             BigDecimal bigDecimal = new BigDecimal(studentIds.split(",").length);
             switch (payType) {
                 case 1:
-                    return payMoneyUtil.weixinpay("购买玩湃惠民卡" + "-" + 0, "", tPayHuimin.getCode(), tPayHuimin.getSalesMoney().toString(),
+                    // todo 惠民卡收入属于平台商户 定死
+                    return payMoneyUtil.weixinpay("购买玩湃惠民卡", "", tPayHuimin.getCode(), tPayHuimin.getSalesMoney().toString(),
                             "/base/huimin/callBack/weixinPayHuiminCallback", "APP", "");
+//                return payMoneyUtil.weixinpayV3("1720719391","购买玩湃惠民卡",tPayHuimin.getCode(),
+//                        "/base/huimin/callBack/weixinPayHuiminCallback1",tPayHuimin.getSalesMoney().toString());
                 case 2:
                     String string = tPayHuimin.getSalesMoney().toString();
-                    return payMoneyUtil.alipay(smid, "购买玩湃惠民卡", "购买玩湃惠民卡", "", tPayHuimin.getCode(), string,
+                    return payMoneyUtil.alipay("2088670241691219", "购买玩湃惠民卡", "购买玩湃惠民卡", "", tPayHuimin.getCode(), string,
                             "/base/huimin/callBack/aliPayHuiminCallback");
             }
 

--
Gitblit v1.7.1