Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-11 fdb089cb8bee6099efcbd7b0ca2672c63cbb6784

 utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java

@@ -6,6 +6,7 @@
import java.util.HashMap;

import java.util.Map;



import org.dom4j.DocumentException;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.StringUtil;

import org.yeshi.utils.entity.wx.RedPackParams;

@@ -266,8 +267,27 @@
      map.put("out_trade_no", orderNo);

      map.put("sign", WXUtil.getSignMD5(map, app.getMchKey()));

      String result = HttpUtil.post("https://api.mch.weixin.qq.com/pay/orderquery", WXUtil.loadWXMessage(map));

      System.out.println("订单查询结果:" + result);

      Map<String, String> resultMap = WXUtil.parseXML(result);

      try {

         try {

            result = new String(result.getBytes("GBK"), "UTF-8");

         } catch (UnsupportedEncodingException e1) {

            e1.printStackTrace();

         }

         System.out.println("订单查询结果:" + new String(result.getBytes("GBK"), "UTF-8"));

      } catch (UnsupportedEncodingException e) {

         e.printStackTrace();

      }

      Map<String, String> resultMap = null;

      try {

         resultMap = WXUtil.parseXML(result);

      } catch (Exception e) {

         try {

            result = new String(result.getBytes("GBK"), "UTF-8");

         } catch (UnsupportedEncodingException e1) {

            e1.printStackTrace();

         }

         resultMap = WXUtil.parseXML(result);

      }

      if ("SUCCESS".equalsIgnoreCase(resultMap.get("return_code"))

            && "SUCCESS".equalsIgnoreCase(resultMap.get("result_code"))) {

         if ("SUCCESS".equalsIgnoreCase(resultMap.get("trade_state")))// 支付成功

@@ -281,7 +301,8 @@


   /**

    * 

    * @param refundOrderNo -退款单号

    * @param refundOrderNo

    *            -退款单号

    * @param app

    * @return

    * @throws WXOrderException

@@ -295,7 +316,17 @@
      map.put("sign", WXUtil.getSignMD5(map, app.getMchKey()));

      String result = HttpUtil.post("https://api.mch.weixin.qq.com/pay/refundquery", WXUtil.loadWXMessage(map));

      System.out.println("订单查询结果:" + result);

      Map<String, String> resultMap = WXUtil.parseXML(result);

      Map<String, String> resultMap = null;

      try {

         resultMap = WXUtil.parseXML(result);

      } catch (Exception e) {

         try {

            result = new String(result.getBytes("GBK"), "UTF-8");

         } catch (UnsupportedEncodingException e1) {

            e1.printStackTrace();

         }

         resultMap = WXUtil.parseXML(result);

      }

      if ("SUCCESS".equalsIgnoreCase(resultMap.get("return_code"))

            && "SUCCESS".equalsIgnoreCase(resultMap.get("result_code"))) {

         if ("SUCCESS".equalsIgnoreCase(resultMap.get("refund_status_0")))// 退款成功