generated from root/miduo_server
修改发货中心充值
parent
a8ae5876c8
commit
da6ef1c63d
|
@ -1970,7 +1970,7 @@ public class PayController {
|
||||||
Double amountDouble = defaultAmount * 100;
|
Double amountDouble = defaultAmount * 100;
|
||||||
//充值中心充值,订单号需要现生成
|
//充值中心充值,订单号需要现生成
|
||||||
if(payChannel.equals("WINGA")){
|
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{
|
}else{
|
||||||
//extInfo为游戏订单号
|
//extInfo为游戏订单号
|
||||||
if(StringUtils.isEmpty(extInfo)){
|
if(StringUtils.isEmpty(extInfo)){
|
||||||
|
|
|
@ -209,7 +209,7 @@ public class PayHandler {
|
||||||
* @return
|
* @return
|
||||||
* @throws Exception
|
* @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订单号
|
//以渠道订单号为cp订单号
|
||||||
PayVo payVo = payDao.getOder(cpOrderNo);
|
PayVo payVo = payDao.getOder(cpOrderNo);
|
||||||
//如果订单已经存在直接返回成功
|
//如果订单已经存在直接返回成功
|
||||||
|
@ -219,7 +219,7 @@ public class PayHandler {
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
//初始化一个订单
|
//初始化一个订单
|
||||||
payVo = this.createOrder(openId, amount, cpOrderNo, amount,productId,currencyCode);
|
payVo = this.createOrder(openId, serverId, cpOrderNo, amount,productId,currencyCode);
|
||||||
}
|
}
|
||||||
//初始化失败,返回失败
|
//初始化失败,返回失败
|
||||||
if(payVo == null) {
|
if(payVo == null) {
|
||||||
|
@ -227,7 +227,7 @@ public class PayHandler {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
String orderId = payVo.getBillno();
|
String orderId = payVo.getBillno();
|
||||||
int serverId = payVo.getRegion();
|
serverId = payVo.getRegion();
|
||||||
int uid = payVo.getUid();
|
int uid = payVo.getUid();
|
||||||
String goodsId = payVo.getPay_item();
|
String goodsId = payVo.getPay_item();
|
||||||
MarkedVo marked = new MarkedVo();
|
MarkedVo marked = new MarkedVo();
|
||||||
|
|
Loading…
Reference in New Issue