From 945c7091d1db4e156a7a2b5ccd24c888cbce40a5 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 31 十月 2022 14:11:04 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java
index 806778c..c47e924 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java
@@ -17,7 +17,7 @@
public class WxPayUtils {
public static String getUnifiedorder(String appid, String mchId, String payKey, String notifyUrl, String body,
- String openid, String outTradeNo, BigDecimal money) {
+ String openid, String outTradeNo, BigDecimal money,String attach) {
String nonceStr = PayUtil.makeUUID(32);
SortedMap<Object, Object> params = new TreeMap<>();
params.put("appid", appid);
@@ -26,6 +26,10 @@
params.put("nonce_str", nonceStr);
params.put("notify_url", notifyUrl);
params.put("openid", openid);
+ //附加数据
+ if(StringUtils.isNotEmpty(attach)){
+ params.put("attach", attach);
+ }
params.put("out_trade_no", outTradeNo);// 商品订单号
params.put("spbill_create_ip", PayUtil.getLocalIp());// 服务部署的ip
params.put("total_fee", PayUtil.moneyToIntegerStr(money));// 费用的参数转型
@@ -77,7 +81,7 @@
return parameters;
}
public static String h5pay(String appid, String mchId, String payKey, String notifyUrl, String body,
- String openid, String outTradeNo, BigDecimal money, String tradeType) {
+ String openid, String outTradeNo, BigDecimal money, String tradeType, String clientIp) {
String nonceStr = PayUtil.makeUUID(32);
SortedMap<Object, Object> params = new TreeMap<>();
params.put("appid", appid);
@@ -87,7 +91,7 @@
params.put("notify_url", notifyUrl);
params.put("openid", openid);
params.put("out_trade_no", outTradeNo);// 商品订单号
- params.put("spbill_create_ip", PayUtil.getLocalIp());// 服务部署的ip
+ params.put("spbill_create_ip", clientIp);// 用户真实ip
params.put("total_fee", PayUtil.moneyToIntegerStr(money));// 费用的参数转型
params.put("trade_type", tradeType);// 对接类型
params.put("sign", PayUtil.createSign(PayCpmstant.DEFAULT_ENCODING, params, payKey));// MD5签名
--
Gitblit v1.7.1