Merge remote-tracking branch 'origin/dev' into dev

rs-universal/rs-universal-server/src/main/java/com/upyuns/platform/rs/universal/biz/OrderPayBiz.java

@@ -119,20 +119,14 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
 		log.info("报名费回调路径notify_url:" + notify_url);
 		Integer payWay = orderPayVo.getPayWay() == null ? 1 : orderPayVo.getPayWay();
 		String sellerAccount = null;
-		if (type == 2 && payWay == 1) {
-			sellerAccount = SystemConfig.APP_PARTNER;
-			jsParam = WXPay.webPay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), orderPayVo.getBuyerAccount(), null);
-		} else if (type == 1 && payWay == 1) {
-			sellerAccount = SystemConfig.APP_PARTNER;
-			jsParam = WXPay.apppay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), 0);
-		} else if (type == 1 && payWay == 2) {
+		 if (payWay == 2) {//支付宝
 			sellerAccount = SystemConfig.ALIPAY_PID;
 			orderPayVo.setPayType(2);
 			jsParam = generateAliPayment(orderPayVo, notifyUrl);
-		} else if (type == 3 && payWay == 1) { //网页支付
+		} else if (payWay == 1) { //微信支付
 			sellerAccount = SystemConfig.APP_PARTNER;
 			jsParam = WXPay.getH5PayParam(amount + "", orderPayVo.getBuyerIp(), trade_no, orderPayVo.getBody(), orderPayVo.getBody(), orderPayVo.getBody(), notify_url);
-		} else if (type == 3 && payWay == 3) { //对公账户支付
+		} else if (payWay == 3) { //对公账户支付
 			sellerAccount = SystemConfig.APP_PARTNER;
 			//生成随机码