From 277d0e97ca1acf1727ce4fbb97049ef4707315ed Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 29 七月 2024 13:34:43 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/WXPay.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/WXPay.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/WXPay.java
index 7ec78f2..dade2af 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/WXPay.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/WXPay.java
@@ -1,17 +1,17 @@
-package com.tencent;
+package com.ruoyi.order.util.tencent;
import java.util.Map;
-import com.tencent.common.Configure;
-import com.tencent.common.WXPayConfig;
-import com.tencent.common.WXPayConstants;
-import com.tencent.common.WXPayConstants.SignType;
-import com.tencent.common.WXPayUtil;
+import com.ruoyi.order.util.tencent.common.Configure;
+import com.ruoyi.order.util.tencent.common.WXPayConfig;
+import com.ruoyi.order.util.tencent.common.WXPayConstants;
+import com.ruoyi.order.util.tencent.common.WXPayUtil;
+import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData;
+import com.ruoyi.order.util.tencent.protocol.WXPayRequest;
+import com.ruoyi.order.util.tencent.service.RefundService;
+import com.ruoyi.order.util.tencent.service.UnifiedorderService;
import com.tencent.protocol.RefundReqData;
-import com.tencent.protocol.UnifiedorderReqData;
-import com.tencent.protocol.WXPayRequest;
-import com.tencent.service.RefundService;
-import com.tencent.service.UnifiedorderService;
+
/**
* SDK总入口
*/
@@ -21,7 +21,7 @@
public class WXPay {
private WXPayConfig config;
- private SignType signType;
+ private WXPayConstants.SignType signType;
private boolean autoReport;
private boolean useSandbox;
private String notifyUrl;
@@ -54,10 +54,10 @@
this.autoReport = autoReport;
this.useSandbox = useSandbox;
if (useSandbox) {
- this.signType = SignType.MD5; // 沙箱环境
+ this.signType = WXPayConstants.SignType.MD5; // 沙箱环境
}
else {
- this.signType = SignType.HMACSHA256;
+ this.signType = WXPayConstants.SignType.HMACSHA256;
}
this.wxPayRequest = new WXPayRequest(config);
}
@@ -84,7 +84,7 @@
/**
* 请求统一下单服务
*/
- public static String requestUnifiedorderService(Integer apptype,UnifiedorderReqData unifiedorderReqData) throws Exception{
+ public static String requestUnifiedorderService(Integer apptype, UnifiedorderReqData unifiedorderReqData) throws Exception{
return new UnifiedorderService(apptype).request(unifiedorderReqData);
}
@@ -219,12 +219,12 @@
* @throws Exception
*/
public Map<String, String> fillRequestData(Map<String, String> reqData) throws Exception {
- reqData.put("appid", Configure.getAppid());
+ reqData.put("appid", Configure.getAppid());
reqData.put("mch_id", Configure.getMchid());
reqData.put("nonce_str", WXPayUtil.generateUUID());
reqData.put("sign_type", WXPayConstants.MD5);
//reqData.put("sign_type", WXPayConstants.HMACSHA256);
- reqData.put("sign", WXPayUtil.generateSignature(reqData, Configure.getKey(), SignType.MD5));
+ reqData.put("sign", WXPayUtil.generateSignature(reqData, Configure.getKey(), WXPayConstants.SignType.MD5));
return reqData;
}
--
Gitblit v1.7.1