优化代码

java110

2021-09-03 7c6e90dcb144f4c2dee4053ef6aa9531c23e5254

 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&notifyId=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&notifyId=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);
    }