changes

liuhaonan

2022-08-23 923c9cec3403ae2abcc523ea73918f243977e546

 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java

@@ -4,7 +4,7 @@
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import cn.dreampie.encription.EncriptionKit;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
@@ -16,6 +16,7 @@
import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.constant.WxPayConstants;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.IpUtil;
import com.sandu.ximon.admin.dto.wxquerydto.WxOrderDto;
@@ -43,7 +44,7 @@
public class WxFastPayService {

    private final com.github.binarywang.wxpay.service.WxPayService wxPayService;
    public static final String WECHAT_ORDER_PAY_CALLBACK_URL = "http://49.235.239.118:20012/callback/pay/wechatCallback";
    public static final String WECHAT_ORDER_PAY_CALLBACK_URL = "http://112.74.63.130:20017/callback/pay/wechatCallback";
    //微信订单状态查询
    public static final String WECHAT_ORDER_QUETY_URL = "https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/";
    public static final String WECHAT_ORDER_QUETY = "?mchid=";
@@ -78,11 +79,11 @@
     */
    @SuppressWarnings("rawtypes")
    private String createSign(String Key, SortedMap<Object, Object> parameters) {

        StringBuffer sb = new StringBuffer();
        Set es = parameters.entrySet();// 所有参与传参的参数按照accsii排序（升序）
        Iterator it = es.iterator();
        while (it.hasNext()) {
            Map.Entry entry = (Map.Entry) it.next();
        for (Object e : es) {
            Map.Entry entry = (Map.Entry) e;
            String k = (String) entry.getKey();
            Object v = entry.getValue();
            if (null != v && !"".equals(v) && !"sign".equals(k) && !"key".equals(k)) {
@@ -91,11 +92,35 @@
        }
        sb.append("key=" + Key);
        System.out.println("字符串拼接后是:" + sb.toString());
        String sign = EncriptionKit.encrypt(sb.toString()).toUpperCase();
        return sign;
        return SecureUtil.md5(sb.toString()).toUpperCase();
//        StringBuffer sb = new StringBuffer();
//        Set es = parameters.entrySet();// 所有参与传参的参数按照accsii排序（升序）
//        Iterator it = es.iterator();
//        while (it.hasNext()) {
//            Map.Entry entry = (Map.Entry) it.next();
//            String k = (String) entry.getKey();
//            Object v = entry.getValue();
//            if (null != v && !"".equals(v) && !"sign".equals(k) && !"key".equals(k)) {
//                sb.append(k + "=" + v + "&");
//            }
//        }
//        sb.append("key=" + Key);
//        System.out.println("字符串拼接后是:" + sb.toString());
//        String sign = EncriptionKit.encrypt(sb.toString()).toUpperCase();
//        return sign;
    }

    public WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData) {
        try {
            return wxPayService.parseOrderNotifyResult(xmlData);
        } catch (WxPayException e) {
            e.printStackTrace();
            throw new BusinessException("解析回调结果失败，" + e.getErrCodeDes());
        }
    }


    public WxPayOrderNotifyResult parseOrderNotifyResult(WxPayService wxPayService, String xmlData) {
        try {
            return wxPayService.parseOrderNotifyResult(xmlData);
        } catch (WxPayException e) {
@@ -239,20 +264,21 @@
            String time = String.valueOf(System.currentTimeMillis() / 1000);
            if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayUnifiedOrderResult.getResultCode())) {
                SortedMap<Object, Object> parameters = new TreeMap<>();
                parameters.put("appid", wxPayUnifiedOrderResult.getAppid());
                parameters.put("appId", wxPayUnifiedOrderResult.getAppid());

//                parameters.put("noncestr", wxPayUnifiedOrderResult.getNonceStr()); // 随机字符串
                parameters.put("partnerid", wxConfig.getMchId()); // 商户id
                parameters.put("nonceStr", wxPayUnifiedOrderResult.getNonceStr()); // 随机字符串
//                parameters.put("partnerid", wxConfig.getMchId()); // 商户id

                parameters.put("signType", WxPayConstants.SignType.MD5);
                //  parameters.put("out_trade_no", orderId);//商户订单号
                parameters.put("prepayid", wxPayUnifiedOrderResult.getPrepayId());
//                parameters.put("package", "Sign=WXPay");
//                parameters.put("timestamp", time);
//                parameters.put("prepayid", wxPayUnifiedOrderResult.getPrepayId());
                parameters.put("package", "prepay_id=" + wxPayUnifiedOrderResult.getPrepayId());
                parameters.put("timeStamp", time);

                String sign = createSign(wxConfig.getPrivateKey(), parameters);

                //hashMap.put("paySign", wechatSign);
                parameters.put("Sign", sign);
                parameters.put("paySign", sign);
                return parameters;
            } else {
                log.error("微信支付失败，{}", wxPayUnifiedOrderResult.getErrCodeDes());