diff --git a/src/main/java/com/jmfy/controller/PayController.java b/src/main/java/com/jmfy/controller/PayController.java index 2a50c03..4c9da6c 100644 --- a/src/main/java/com/jmfy/controller/PayController.java +++ b/src/main/java/com/jmfy/controller/PayController.java @@ -1970,7 +1970,7 @@ public class PayController { Double amountDouble = defaultAmount * 100; //充值中心充值,订单号需要现生成 if(payChannel.equals("WINGA")){ - payres = payHandler.processOrderWithoutOrderId(String.valueOf(userId), orderId, productId,amountDouble.intValue(),defaultCurrency,payChannel); //充值中心充值,订单号需要现生成 + payres = payHandler.processOrderWithoutOrderId(String.valueOf(userId), Integer.parseInt(serverId),orderId, productId,amountDouble.intValue(),defaultCurrency,payChannel); //充值中心充值,订单号需要现生成 }else{ //extInfo为游戏订单号 if(StringUtils.isEmpty(extInfo)){ diff --git a/src/main/java/com/jmfy/handler/PayHandler.java b/src/main/java/com/jmfy/handler/PayHandler.java index 1bb342e..8cf411b 100644 --- a/src/main/java/com/jmfy/handler/PayHandler.java +++ b/src/main/java/com/jmfy/handler/PayHandler.java @@ -209,7 +209,7 @@ public class PayHandler { * @return * @throws Exception */ - public int processOrderWithoutOrderId(String openId,String cpOrderNo,String productId,int amount, String currencyCode,String payChannel) throws Exception { + public int processOrderWithoutOrderId(String openId,int serverId,String cpOrderNo,String productId,int amount, String currencyCode,String payChannel) throws Exception { //以渠道订单号为cp订单号 PayVo payVo = payDao.getOder(cpOrderNo); //如果订单已经存在直接返回成功 @@ -219,7 +219,7 @@ public class PayHandler { } }else{ //初始化一个订单 - payVo = this.createOrder(openId, amount, cpOrderNo, amount,productId,currencyCode); + payVo = this.createOrder(openId, serverId, cpOrderNo, amount,productId,currencyCode); } //初始化失败,返回失败 if(payVo == null) { @@ -227,7 +227,7 @@ public class PayHandler { return -1; } String orderId = payVo.getBillno(); - int serverId = payVo.getRegion(); + serverId = payVo.getRegion(); int uid = payVo.getUid(); String goodsId = payVo.getPay_item(); MarkedVo marked = new MarkedVo();