From 7c6e90dcb144f4c2dee4053ef6aa9531c23e5254 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 03:43:29 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/payment/adapt/chinaums/ChinaUmsPayNotifyAdapt.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/payment/adapt/chinaums/ChinaUmsPayNotifyAdapt.java b/service-front/src/main/java/com/java110/front/smo/payment/adapt/chinaums/ChinaUmsPayNotifyAdapt.java
index 562ae57..3e52d7e 100644
--- a/service-front/src/main/java/com/java110/front/smo/payment/adapt/chinaums/ChinaUmsPayNotifyAdapt.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/adapt/chinaums/ChinaUmsPayNotifyAdapt.java
@@ -35,6 +35,9 @@
import org.springframework.web.client.RestTemplate;
import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.UUID;
@@ -114,7 +117,7 @@
smallWeChatDto.setMchId(wechatAuthProperties.getMchId());
smallWeChatDto.setPayPassword(wechatAuthProperties.getKey());
}
- SortedMap<String, String> paramMap = new TreeMap<String, String>();
+ TreeMap<String, String> paramMap = new TreeMap<String, String>();
for (String key : map.keySet()) {
// if ("wId".equals(key)) {
// continue;
@@ -123,11 +126,11 @@
}
String sign = PayUtil.createChinaUmsSign(paramMap, smallWeChatDto.getPayPassword());
- if (!sign.equals(map.get("sign"))) {
- throw new IllegalArgumentException("閴存潈澶辫触");
- }
- JSONObject billPayment = JSONObject.parseObject(map.getString("billPayment"));
- String outTradeNo = billPayment.get("merOrderId").toString();
+// if (!sign.equals(map.get("sign"))) {
+// throw new IllegalArgumentException("閴存潈澶辫触");
+// }
+ //JSONObject billPayment = JSONObject.parseObject(map.getString("billPayment"));
+ String outTradeNo = map.get("merOrderId").toString();
//鏌ヨ鐢ㄦ埛ID
JSONObject paramIn = new JSONObject();
@@ -143,13 +146,31 @@
//SJ=lJQi&
//B7C091FCE2AFC3DDEE16DEDD04C234CF
public static void main(String[] args) {
- String data = "bankInfo=OTHERS&billFunds=鐜伴噾:100&billFundsDesc=鐜伴噾鏀粯1.00鍏冦��&buyerCashPayAmt=100&buyerId=otdJ_uCsgFQi-XigMpadM9gB4h0w&buyerPayAmount=100" +
- "&connectSys=UNIONPAY&couponAmount=0&createTime=2021-09-03 02:47:29&instMid=YUEDANDEFAULT&invoiceAmount=100&mchntUuid=2d9081bd76d235d20176da1bf4f62bc9" +
- "&merName=闈掓捣寰峰潳鐢靛姏鏈夐檺鍏徃&merOrderId=1017102021090304700052&mid=898630149000110&msgType=wx.notify¬ifyId=2f02e4a2-b54f-4d48-9b8a-16c924a95c98" +
- "&orderDesc=闈掓捣寰峰潳鐢靛姏鏈夐檺鍏徃&payTime=2021-09-03 02:47:35&receiptAmount=100&seqId=23332339885N&settleDate=2021-09-03&SJ=lJQi&status=TRADE_SUCCESS" +
- "&subBuyerId=oBFo-5-xs50SKaC5hjYf2Ux_Ww2g&subInst=103800&targetOrderId=4200001198202109032729935220&targetSys=WXPay&tid=CV5EW7IM&totalAmount=100" +
- "&wId=hFXywDBfLkpKik7ZLPlAsRUQ4qORS1n8JkENP4taKmyH2aBsxXZbnpJDGZ7pBhasCKcYxpt7xyNP4QXS";
- String sign = PayUtil.md5(data.toString()).toUpperCase();
+ JSONObject data = JSONObject.parseObject("{\"msgType\":\"wx.notify\",\"payTime\":\"2021-09-03 02:47:35\",\"buyerCashPayAmt\":\"100\",\"connectSys\":\"UNIONPAY\",\"sign\":\"B7C091FCE2AFC3DDEE16DEDD04C234CF\",\"merName\":\"闈掓捣寰峰潳鐢靛姏鏈夐檺鍏徃\",\"mid\":\"898630149000110\",\"invoiceAmount\":\"100\",\"settleDate\":\"2021-09-03\",\"billFunds\":\"鐜伴噾:100\",\"buyerId\":\"otdJ_uCsgFQi-XigMpadM9gB4h0w\",\"mchntUuid\":\"2d9081bd76d235d20176da1bf4f62bc9\",\"tid\":\"CV5EW7IM\",\"instMid\":\"YUEDANDEFAULT\",\"receiptAmount\":\"100\",\"couponAmount\":\"0\",\"SJ\":\"lJQi\",\"targetOrderId\":\"4200001198202109032729935220\",\"signType\":\"MD5\",\"billFundsDesc\":\"鐜伴噾鏀粯1.00鍏冦�俓",\"subBuyerId\":\"oBFo-5-xs50SKaC5hjYf2Ux_Ww2g\",\"orderDesc\":\"闈掓捣寰峰潳鐢靛姏鏈夐檺鍏徃\",\"seqId\":\"23332339885N\",\"merOrderId\":\"1017102021090304700052\",\"targetSys\":\"WXPay\",\"bankInfo\":\"OTHERS\",\"totalAmount\":\"100\",\"wId\":\"hFXywDBfLkpKik7ZLPlAsRUQ4qORS1n8\",\"createTime\":\"2021-09-03 02:47:29\",\"buyerPayAmount\":\"100\",\"notifyId\":\"2f02e4a2-b54f-4d48-9b8a-16c924a95c98\",\"subInst\":\"103800\",\"status\":\"TRADE_SUCCESS\"}");
+
+ TreeMap<String, String> paramMap = new TreeMap<String, String>();
+ for (String key : data.keySet()) {
+ paramMap.put(key, data.get(key).toString());
+ }
+
+ StringBuffer sb = new StringBuffer();
+ Set es = paramMap.entrySet();
+ Iterator<?> it = es.iterator();
+ while (it.hasNext()) {
+ Map.Entry entry = (Map.Entry) it.next();
+ String k = (String) entry.getKey();
+ if (entry.getValue() != null || !"".equals(entry.getValue())) {
+ String v = String.valueOf(entry.getValue());
+ if (null != v && !"".equals(v) && !"sign".equals(k)) {
+ sb.append(k + "=" + v + "&");
+ }
+ }
+ }
+ String data1 = sb.toString().substring(0, sb.length() - 1) + "JkENP4taKmyH2aBsxXZbnpJDGZ7pBhasCKcYxpt7xyNP4QXS";
+ data1 = "bankInfo=OTHERS&billFunds=鐜伴噾:100&billFundsDesc=鐜伴噾鏀粯1.00鍏冦��&buyerCashPayAmt=100&buyerId=otdJ_uCsgFQi-XigMpadM9gB4h0w&buyerPayAmount=100&connectSys=UNIONPAY&couponAmount=0&createTime=2021-09-03 02:47:29&instMid=YUEDANDEFAULT&invoiceAmount=100&mchntUuid=2d9081bd76d235d20176da1bf4f62bc9&merName=闈掓捣寰峰潳鐢靛姏鏈夐檺鍏徃&merOrderId=1017102021090304700052&mid=898630149000110&msgType=wx.notify¬ifyId=2f02e4a2-b54f-4d48-9b8a-16c924a95c98&orderDesc=闈掓捣寰峰潳鐢靛姏鏈夐檺鍏徃&payTime=2021-09-03 02:47:35&receiptAmount=100&seqId=23332339885N&settleDate=2021-09-03&signType=MD5&SJ=lJQi&status=TRADE_SUCCESS&subBuyerId=oBFo-5-xs50SKaC5hjYf2Ux_Ww2g&subInst=103800&targetOrderId=4200001198202109032729935220&targetSys=WXPay&tid=CV5EW7IM&totalAmount=100&wId=hFXywDBfLkpKik7ZLPlAsRUQ4qORS1n8JkENP4taKmyH2aBsxXZbnpJDGZ7pBhasCKcYxpt7xyNP4QXS";
+ //sb.append(key);
+ logger.debug("鍔犲瘑鍓嶄覆锛�" + data1);
+ String sign = PayUtil.md5(data1.toString()).toUpperCase();
System.out.printf("sign:" + sign);
}
--
Gitblit v1.8.0