Merge branch 'hz_master' into base-modify

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

@@ -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) {
+            if (payWay == 1&&type!=3) {
                 JSONObject temp = JSON.parseObject(jsParam);
                 return JsonResultUtil.createSuccessResultWithObj(temp);
             } else {