Merge branch 'master' into debug

# Conflicts:
#	sp-server/src/main/java/com/pj/api/jh/service/JhService.java
#	sp-server/src/main/java/com/pj/api/wx/service/WxService.java

sp-server/src/main/java/com/pj/api/jh/service/JhService.java

@@ -163,16 +163,4 @@ public class JhService {
                 .setCompleteDate(bo.getSuccessTime());
         tbOrderService.updateById(tbOrder);
     }
-
-    public void refund(String outTradeNo) {
-        String url = jhConfig.getServerUrl() + "/uaps-web-gateway/refund/initRefund";
-        Map<String, Object> params = new HashMap<>();
-        params.put("businessMerchantNo", jhConfig.getBusinessMerchantNo());
-        params.put("outTradeNo", outTradeNo);
-        params.put("businessMerchantNo", jhConfig.getBusinessMerchantNo());
-        params.put("businessMerchantNo", jhConfig.getBusinessMerchantNo());
-
-    }
-
-
 }