|
@@ -97,10 +97,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
String orderNum = this.getOrderNum(userData.getUserId());
|
|
|
//用户已有订单数
|
|
|
int count = super.count(new LambdaQueryWrapper<Order>().eq(Order::getGameId, gameId).eq(Order::getUserId, userId));
|
|
|
- //设置订单号
|
|
|
- payParam.setOrderId(orderNum);
|
|
|
//构造订单
|
|
|
- return super.save(Order.builder()
|
|
|
+ super.save(Order.builder()
|
|
|
.orderId(orderNum)
|
|
|
.agentId(promoChannelService.getAgentIdByChannel(userData.getChannel()))
|
|
|
.cpId(game.getCpId())
|
|
@@ -131,6 +129,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
.roleLevel(gameUserRole.getRoleLevel())
|
|
|
.roleVipLevel(gameUserRole.getRoleVipLevel())
|
|
|
.build());
|
|
|
+ //设置订单号
|
|
|
+ payParam.setOrderId(orderNum);
|
|
|
+ //返回
|
|
|
+ return Boolean.TRUE;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -155,7 +157,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
} else {
|
|
|
str = String.format("%0" + subStrLength + "d", userId);
|
|
|
}
|
|
|
- return localDate + randomNumeric + str;
|
|
|
+ return localDate + str + randomNumeric;
|
|
|
}
|
|
|
|
|
|
@Override
|