Merge branch 'hz_master' into base-modify

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -116,7 +116,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
             jsParam = generateAliPayment(orderPayVo, notifyUrl);
         }else if (type == 3 && payWay == 1){
             sellerAccount = SystemConfig.APP_PARTNER;
-            jsParam=WXPay.getPackage( amount+"",orderPayVo.getBody(),notify_url,trade_no,orderPayVo.getBuyerIp(),orderPayVo.getBuyerAccount(), wy_appid,wy_secret);
+            jsParam = WXPay.webPay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), orderPayVo.getBuyerAccount(),wy_appid);
         }
         log.info("报名费回调路径jsParam:" + jsParam);
         if (!StringUtils.isBlank(jsParam)) {
@@ -131,7 +131,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
                 log.error("---下单---order_no=====" + order_no + "----异常---msg===" + e.getMessage());
                 return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
             }
-            if (payWay == 1&&type!=3) {
+            if (payWay == 1) {
                 JSONObject temp = JSON.parseObject(jsParam);
                 return JsonResultUtil.createSuccessResultWithObj(temp);
             } else {