调整支付回调

src/main/java/com/minpay/common/pay/ShouhuoPay.java

@@ -199,7 +199,26 @@ public class ShouhuoPay implements IMINAction{
 
 				notify_url = notify_url + "/ShouhuoPay/personalPayCallBack";
 				String turntablePage = Service.lookup(IPublicService.class).getSysParValue(user.getChannel() + "_SHOUHUO_TURNTABLE_PAGE");
-				turntablePage = turntablePage.concat("orderId="+orderId).concat("&equId="+ordInf.getEquipmentId()).concat("#/pages/turntable/turntable");
+				String turnPage ="";
+				String gameRule = ordInf.getGameRule(); //游戏规则
+				String proType = ordInf.getProType(); //交易类型
+				if("00".equals(proType)){ //商品交易类别:00正常商品，01抽奖商品，02：充值
+					turnPage = Service.lookup(IPublicService.class).getSysParValue(user.getChannel() + "__SHOUHUO_DIRECTBUY_PAGE");
+				}else if("01".equals(proType)){
+					if("0".equals(gameRule)){ //幸运购
+						turnPage = Service.lookup(IPublicService.class).getSysParValue(user.getChannel() + "__SHOUHUO_GAMEBUYING_PAGE");
+					}else{
+						turnPage = Service.lookup(IPublicService.class).getSysParValue(user.getChannel() + "__SHOUHUO_GAMEBUYING_PAGE");
+					}if("1".equals(gameRule)){
+						throw new MINBusinessException("游戏类型异常");
+					}
+
+				}else{
+					throw new MINBusinessException("交易类型异常");
+				}
+
+				turntablePage = turntablePage.concat("orderId="+orderId).concat("&equId="+ordInf.getEquipmentId()).concat(turnPage);
+
 				Huilianpay prePay = new Huilianpay();
 				IHuilianPayService huilianPayService = new HuilianPayServiceImpl();
 				if("91".equals(payType)){

src/main/java/com/minpay/shouhuo/orderaction/PayManageAction.java

@@ -167,6 +167,7 @@ public class PayManageAction implements IMINAction {
 				if(equipmentInf == null) {
 					throw new MINBusinessException("没有找到此售货机");
 				}
+
 				String branchid = equipmentInf.getBranchid();
 				//查询商户开通了那个支付渠道
 				String pay_channel = Service.lookup(IPublicService.class).getSysParValue( "PAY_CHANNEL");
@@ -181,7 +182,8 @@ public class PayManageAction implements IMINAction {
 					pay_channel = "09";
 				}
 				String turntablePage = Service.lookup(IPublicService.class).getSysParValue(user.getChannel() + "_SHOUHUO_TURNTABLE_PAGE");
-				turntablePage = turntablePage.concat("orderId="+ordId);
+				String turnPage = Service.lookup(IPublicService.class).getSysParValue(user.getChannel() + "__SHOUHUO_BALANCE_PAGE");
+				turntablePage = turntablePage.concat("orderId="+ordId).concat("&equId="+ordInf.getEquipmentId()).concat(turnPage);
 				Huilianpay prePay = new Huilianpay();
 				IHuilianPayService huilianPayService = new HuilianPayServiceImpl();
 				if("91".equals(payType)){