From 0030edda8dddc17162fcba92aed4d215bd874859 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 17:44:02 +0800
Subject: [PATCH] 分账
---
ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml | 2 +-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java | 2 +-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 3 ---
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java
index 17275ed..2bbaedf 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java
@@ -23,7 +23,7 @@
private WxPayProperties properties;
// 分账特约商户
- private static String PLATFORM_TY_MAC_ID = "2000002410402479";
+ private static String PLATFORM_TY_MAC_ID = "1650744551";
public static String getPlatformTyMacId() {
return PLATFORM_TY_MAC_ID;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index cd51a6f..a615df6 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -1583,9 +1583,6 @@
// 平台特约商户号，用户平台收取服务费
String platformTyMacId = WxPayConfiguration.getPlatformTyMacId();
- if(StringUtils.isEmpty(platformTyMacId)){
- platformTyMacId = "2000002410402479";
- }
R<String> resultMch = remoteShopService.getShopSubMchId(shopId);
String subMchId = resultMch.getData();
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
index c752b4e..d954cea 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
@@ -39,7 +39,7 @@
appId: wxb7f0ea286fc4e535
mchId: 1631381314
mchKey: J8v9JDHKJYDHW9bdk30o2bdjy6z9mn1A
- platformTyMacId: 2000002410402479
+ platformTyMacId: 1650744551
subAppId: #服务商模式下的子商户公众账号ID
subMchId: #服务商模式下的子商户号
keyPath: /home/cert/apiclient_cert.p12
--
Gitblit v1.7.1