|
@@ -71,7 +71,7 @@ import org.springframework.util.Assert;
|
|
|
*/
|
|
|
@Service
|
|
|
public class UserTicketOrderServiceImpl extends
|
|
|
- ServiceImpl<UserTicketOrderMapper, UserTicketOrder> implements IUserTicketOrderService {
|
|
|
+ ServiceImpl<UserTicketOrderMapper, UserTicketOrder> implements IUserTicketOrderService {
|
|
|
|
|
|
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
|
|
|
|
|
@@ -129,7 +129,7 @@ public class UserTicketOrderServiceImpl extends
|
|
|
|
|
|
@Override
|
|
|
public String submitOrder(Long userId, TicketOrderSettleVO orderSettleVO,
|
|
|
- UserShareVO userShareVO) {
|
|
|
+ UserShareVO userShareVO) {
|
|
|
UserTicketOrderServiceImpl proxy = (UserTicketOrderServiceImpl) AopContext.currentProxy();
|
|
|
if (StringUtils.isBlank(orderSettleVO.getTicketId())) {
|
|
|
String lockKey = RedisLockKey.build(RedisLockKey.CREATED_ONLINE_TICKET_ORDER_KEY, orderSettleVO.getBoxId());
|
|
@@ -149,25 +149,25 @@ public class UserTicketOrderServiceImpl extends
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public String createOnlineOrder(Long userId, TicketOrderSettleVO orderSettleVO,
|
|
|
- UserShareVO userShareVO) {
|
|
|
+ UserShareVO userShareVO) {
|
|
|
// 线上票更新票组销量,防止超卖
|
|
|
TicketBox ticketBox = ticketBoxService.getById(orderSettleVO.getBoxId());
|
|
|
if (ticketBox.getStatus() == TicketBoxStatusEnum.PUT_OFF
|
|
|
- || ticketBox.getSaleQty() + orderSettleVO.getOrderNum() > ticketBox.getQuantity()) {
|
|
|
+ || ticketBox.getSaleQty() + orderSettleVO.getOrderNum() > ticketBox.getQuantity()) {
|
|
|
LogUtil.error(logger, "库存不足,boxId:{0},qty:{1},saleQty:{2},orderNum:{3}",
|
|
|
- ticketBox.getBoxId(), ticketBox.getQuantity(), ticketBox.getSaleQty(),
|
|
|
- orderSettleVO.getOrderNum());
|
|
|
+ ticketBox.getBoxId(), ticketBox.getQuantity(), ticketBox.getSaleQty(),
|
|
|
+ orderSettleVO.getOrderNum());
|
|
|
throw new ServiceException(ErrorCodeEnum.ERROR_CODE_1020);
|
|
|
}
|
|
|
boolean rst = ticketBoxService.update(
|
|
|
- new LambdaUpdateWrapper<TicketBox>().set(TicketBox::getSaleQty,
|
|
|
- ticketBox.getSaleQty() + orderSettleVO.getOrderNum())
|
|
|
- .set(ticketBox.getSaleQty() + orderSettleVO.getOrderNum() == ticketBox.getQuantity(),
|
|
|
- TicketBox::getStatus, TicketBoxStatusEnum.PUT_OFF)
|
|
|
- .eq(TicketBox::getBoxId, ticketBox.getBoxId())
|
|
|
- .eq(TicketBox::getSaleQty, ticketBox.getSaleQty()));
|
|
|
+ new LambdaUpdateWrapper<TicketBox>().set(TicketBox::getSaleQty,
|
|
|
+ ticketBox.getSaleQty() + orderSettleVO.getOrderNum())
|
|
|
+ .set(ticketBox.getSaleQty() + orderSettleVO.getOrderNum() == ticketBox.getQuantity(),
|
|
|
+ TicketBox::getStatus, TicketBoxStatusEnum.PUT_OFF)
|
|
|
+ .eq(TicketBox::getBoxId, ticketBox.getBoxId())
|
|
|
+ .eq(TicketBox::getSaleQty, ticketBox.getSaleQty()));
|
|
|
Assert.isTrue(rst,
|
|
|
- "盲票购买订单创建时,更新盲票销量失败。boxId:" + ticketBox.getBoxId() + "saleQty:" + ticketBox.getSaleQty());
|
|
|
+ "盲票购买订单创建时,更新盲票销量失败。boxId:" + ticketBox.getBoxId() + "saleQty:" + ticketBox.getSaleQty());
|
|
|
|
|
|
// 核销优惠券
|
|
|
String couponIds = verifyUserCoupon(orderSettleVO.getCouponList());
|
|
@@ -194,8 +194,8 @@ public class UserTicketOrderServiceImpl extends
|
|
|
|
|
|
// 查询用户的所属经销商,线上票直接查询
|
|
|
ChannelUserRel channelUserRel = channelUserRelService.getOne(
|
|
|
- new LambdaQueryWrapper<ChannelUserRel>()
|
|
|
- .eq(ChannelUserRel::getUserId, userId));
|
|
|
+ new LambdaQueryWrapper<ChannelUserRel>()
|
|
|
+ .eq(ChannelUserRel::getUserId, userId));
|
|
|
if (null != channelUserRel) {
|
|
|
userTicketOrder.setChannelId(channelUserRel.getChannelId());
|
|
|
} else {
|
|
@@ -203,16 +203,16 @@ public class UserTicketOrderServiceImpl extends
|
|
|
if (null != userShareVO.getSuid() && 0 != userShareVO.getSuid()) {
|
|
|
if (UserShareVO.SHARE_TYPE_USER.equals(userShareVO.getType())) {
|
|
|
ChannelUserRel channelShareUserRel = channelUserRelService.getOne(
|
|
|
- new LambdaQueryWrapper<ChannelUserRel>()
|
|
|
- .eq(ChannelUserRel::getUserId, userShareVO.getSuid()));
|
|
|
+ new LambdaQueryWrapper<ChannelUserRel>()
|
|
|
+ .eq(ChannelUserRel::getUserId, userShareVO.getSuid()));
|
|
|
if (null != channelShareUserRel) {
|
|
|
userTicketOrder.setChannelId(channelShareUserRel.getChannelId());
|
|
|
userTicketOrder.setShareInfo(JSONObject.toJSONString(userShareVO));
|
|
|
}
|
|
|
} else if (UserShareVO.SHARE_TYPE_SITE.equals(userShareVO.getType())) {
|
|
|
Channel channel = channelService.getOne(
|
|
|
- new LambdaQueryWrapper<Channel>()
|
|
|
- .eq(Channel::getUserId, userShareVO.getSuid()));
|
|
|
+ new LambdaQueryWrapper<Channel>()
|
|
|
+ .eq(Channel::getUserId, userShareVO.getSuid()));
|
|
|
if (null != channel) {
|
|
|
userTicketOrder.setChannelId(channel.getChannelId());
|
|
|
userTicketOrder.setShareInfo(JSONObject.toJSONString(userShareVO));
|
|
@@ -248,7 +248,8 @@ public class UserTicketOrderServiceImpl extends
|
|
|
// 无需支付的,直接置为成功
|
|
|
processTicketOrder(userTicketOrder);
|
|
|
// 插入付款异步任务
|
|
|
- Assert.isTrue(asyncTaskService.insertAsyncTask(AsyncTaskTypeEnum.TICKET_PAY, userTicketOrder.getOrderId()), "盲票支付,创建异步任务失败:" + userTicketOrder.getOrderId());
|
|
|
+ Assert.isTrue(asyncTaskService.insertAsyncTask(AsyncTaskTypeEnum.TICKET_PAY, userTicketOrder.getOrderId()),
|
|
|
+ "盲票支付,创建异步任务失败:" + userTicketOrder.getOrderId());
|
|
|
}
|
|
|
|
|
|
return userTicketOrder.getOrderId();
|
|
@@ -258,14 +259,14 @@ public class UserTicketOrderServiceImpl extends
|
|
|
public String createOfflineOrder(Long userId, TicketOrderSettleVO orderSettleVO) {
|
|
|
Ticket ticket = ticketService.getById(orderSettleVO.getTicketId());
|
|
|
Assert.isTrue(ticket.getStatus() == TicketStatusEnum.NOT_PAY,
|
|
|
- "盲票已付款,ticketId:" + ticket.getTicketId());
|
|
|
+ "盲票已付款,ticketId:" + ticket.getTicketId());
|
|
|
if (null != redisCache.getCacheObject(
|
|
|
- RedisKey.build(RedisKey.OFFLINE_TICKET_ID_KEY, ticket.getTicketId()))) {
|
|
|
+ RedisKey.build(RedisKey.OFFLINE_TICKET_ID_KEY, ticket.getTicketId()))) {
|
|
|
LogUtil.warn(logger, "线下盲票重复购买,ticketNo:{0}", ticket.getSerialNo());
|
|
|
throw new ServiceException("重复购买,请稍后再试");
|
|
|
}
|
|
|
redisCache.setCacheObject(RedisKey.build(RedisKey.OFFLINE_TICKET_ID_KEY, ticket.getTicketId()),
|
|
|
- userId, 5, TimeUnit.MINUTES);
|
|
|
+ userId, 5, TimeUnit.MINUTES);
|
|
|
|
|
|
// 核销优惠券
|
|
|
String couponIds = verifyUserCoupon(orderSettleVO.getCouponList());
|
|
@@ -292,11 +293,11 @@ public class UserTicketOrderServiceImpl extends
|
|
|
}
|
|
|
// 查询用户的所属经销商,线下票根据票包查询
|
|
|
ChannelOrderDetail channelOrderDetail = channelOrderDetailService.getOne(
|
|
|
- new LambdaQueryWrapper<ChannelOrderDetail>()
|
|
|
- .eq(ChannelOrderDetail::getPkgId, ticket.getPkgId()));
|
|
|
+ new LambdaQueryWrapper<ChannelOrderDetail>()
|
|
|
+ .eq(ChannelOrderDetail::getPkgId, ticket.getPkgId()));
|
|
|
if (null == channelOrderDetail) {
|
|
|
LogUtil.error(logger, "线下票,根据票包ID查询购买渠道为空。ticketId:{0}, pkgId{1}",
|
|
|
- ticket.getTicketId(), ticket.getPkgId());
|
|
|
+ ticket.getTicketId(), ticket.getPkgId());
|
|
|
} else {
|
|
|
ticketOrder.setChannelId(channelOrderDetail.getChannelId());
|
|
|
}
|
|
@@ -318,7 +319,8 @@ public class UserTicketOrderServiceImpl extends
|
|
|
processTicketOrder(ticketOrder);
|
|
|
|
|
|
// 插入付款异步任务
|
|
|
- Assert.isTrue(asyncTaskService.insertAsyncTask(AsyncTaskTypeEnum.TICKET_PAY, ticketOrder.getOrderId()), "盲票支付,创建异步任务失败:" + ticketOrder.getOrderId());
|
|
|
+ Assert.isTrue(asyncTaskService.insertAsyncTask(AsyncTaskTypeEnum.TICKET_PAY, ticketOrder.getOrderId()),
|
|
|
+ "盲票支付,创建异步任务失败:" + ticketOrder.getOrderId());
|
|
|
|
|
|
}
|
|
|
return ticketOrder.getOrderId();
|
|
@@ -347,7 +349,7 @@ public class UserTicketOrderServiceImpl extends
|
|
|
for (String orderId : orderIds) {
|
|
|
UserTicketOrder userTicketOrder = getById(orderId);
|
|
|
Assert.isTrue(userTicketOrder.getResource() == TicketTypeEnum.ONLINE,
|
|
|
- "非在线盲票不用取消。boxId:" + boxId);
|
|
|
+ "非在线盲票不用取消。boxId:" + boxId);
|
|
|
if (!rollbackOrder(userTicketOrder)) {
|
|
|
return false;
|
|
|
}
|
|
@@ -360,14 +362,14 @@ public class UserTicketOrderServiceImpl extends
|
|
|
private void rollbackBoxQty(String boxId, int qty) {
|
|
|
TicketBox ticketBox = ticketBoxService.getById(boxId);
|
|
|
boolean updateBox = ticketBoxService.update(
|
|
|
- new LambdaUpdateWrapper<TicketBox>().set(TicketBox::getSaleQty,
|
|
|
- ticketBox.getSaleQty() - qty)
|
|
|
- .set(
|
|
|
- ticketBox.getStatus() == TicketBoxStatusEnum.PUT_OFF
|
|
|
- && ticketBox.getManualOff() != 1,
|
|
|
- TicketBox::getStatus, TicketBoxStatusEnum.PUT_ON)
|
|
|
- .eq(TicketBox::getBoxId, ticketBox.getBoxId())
|
|
|
- .eq(TicketBox::getSaleQty, ticketBox.getSaleQty()));
|
|
|
+ new LambdaUpdateWrapper<TicketBox>().set(TicketBox::getSaleQty,
|
|
|
+ ticketBox.getSaleQty() - qty)
|
|
|
+ .set(
|
|
|
+ ticketBox.getStatus() == TicketBoxStatusEnum.PUT_OFF
|
|
|
+ && ticketBox.getManualOff() != 1,
|
|
|
+ TicketBox::getStatus, TicketBoxStatusEnum.PUT_ON)
|
|
|
+ .eq(TicketBox::getBoxId, ticketBox.getBoxId())
|
|
|
+ .eq(TicketBox::getSaleQty, ticketBox.getSaleQty()));
|
|
|
Assert.isTrue(updateBox, "取消过期未支付盲票购买订单,恢复票组销量失败。boxId:{0}" + boxId);
|
|
|
}
|
|
|
|
|
@@ -390,7 +392,7 @@ public class UserTicketOrderServiceImpl extends
|
|
|
private boolean rollbackOrder(UserTicketOrder userTicketOrder) {
|
|
|
if (userTicketOrder.getStatus() != UserTicketOrderStatusEnum.NOT_PAY) {
|
|
|
LogUtil.warn(logger, "取消购票订单时,订单状态不是待支付,忽略。orderId:{0}, status:{1}",
|
|
|
- userTicketOrder.getOrderId(), userTicketOrder.getStatus());
|
|
|
+ userTicketOrder.getOrderId(), userTicketOrder.getStatus());
|
|
|
return false;
|
|
|
}
|
|
|
|
|
@@ -398,18 +400,18 @@ public class UserTicketOrderServiceImpl extends
|
|
|
// 优惠券反核销
|
|
|
List<String> userCouponIds = Arrays.asList(userTicketOrder.getCouponInfo().split(","));
|
|
|
boolean rst = userCouponService.update(new LambdaUpdateWrapper<UserCoupon>()
|
|
|
- .set(UserCoupon::getStatus, UserCouponStatusEnum.UNUSED)
|
|
|
- .set(UserCoupon::getVerifyTime, null)
|
|
|
- .in(UserCoupon::getId, userCouponIds));
|
|
|
+ .set(UserCoupon::getStatus, UserCouponStatusEnum.UNUSED)
|
|
|
+ .set(UserCoupon::getVerifyTime, null)
|
|
|
+ .in(UserCoupon::getId, userCouponIds));
|
|
|
Assert.isTrue(rst,
|
|
|
- "盲票购买订单取消时,反核销优惠券失败。orderId:" + userTicketOrder.getOrderId() + "userCouponIds:"
|
|
|
- + userTicketOrder.getCouponInfo());
|
|
|
+ "盲票购买订单取消时,反核销优惠券失败。orderId:" + userTicketOrder.getOrderId() + "userCouponIds:"
|
|
|
+ + userTicketOrder.getCouponInfo());
|
|
|
}
|
|
|
|
|
|
boolean rst = update(new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getStatus,
|
|
|
- UserTicketOrderStatusEnum.CANCELED)
|
|
|
- .eq(UserTicketOrder::getOrderId, userTicketOrder.getOrderId())
|
|
|
- .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY));
|
|
|
+ UserTicketOrderStatusEnum.CANCELED)
|
|
|
+ .eq(UserTicketOrder::getOrderId, userTicketOrder.getOrderId())
|
|
|
+ .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY));
|
|
|
Assert.isTrue(rst, "盲票购买订单取消时,更新订单状态失败。orderId:" + userTicketOrder.getOrderId());
|
|
|
return true;
|
|
|
}
|
|
@@ -420,20 +422,21 @@ public class UserTicketOrderServiceImpl extends
|
|
|
UserTicketOrder ticketOrder = getById(payOrder.getBizId());
|
|
|
if (null == ticketOrder || ticketOrder.getStatus() != UserTicketOrderStatusEnum.NOT_PAY) {
|
|
|
LogUtil.error(logger, "支付回调用户购票订单处理,订单状态异常,不是待支付。payOrder:{0}, ticketOrder:{1}",
|
|
|
- JSONObject.toJSONString(payOrder), JSONObject.toJSONString(ticketOrder));
|
|
|
+ JSONObject.toJSONString(payOrder), JSONObject.toJSONString(ticketOrder));
|
|
|
throw new ServiceException("支付回调用户购票订单处理,订单状态异常,不是待支付。orderId:" + payOrder.getBizId());
|
|
|
}
|
|
|
ticketOrder.setPayTime(DateUtils.parseDate(payOrder.getCompleteDate()));
|
|
|
|
|
|
// 插入异步任务
|
|
|
- Assert.isTrue(asyncTaskService.insertAsyncTask(AsyncTaskTypeEnum.TICKET_PAY, payOrder.getBizId()), "创建支付成功异步任务失败. orderId:" + payOrder.getOrderId());
|
|
|
+ Assert.isTrue(asyncTaskService.insertAsyncTask(AsyncTaskTypeEnum.TICKET_PAY, payOrder.getBizId()),
|
|
|
+ "创建支付成功异步任务失败. orderId:" + payOrder.getOrderId());
|
|
|
return processTicketOrder(ticketOrder);
|
|
|
}
|
|
|
|
|
|
private boolean processTicketOrder(UserTicketOrder ticketOrder) {
|
|
|
List<UserTicketOrderItem> orderItemList = userTicketOrderItemService.list(
|
|
|
- new LambdaQueryWrapper<UserTicketOrderItem>()
|
|
|
- .eq(UserTicketOrderItem::getOrderId, ticketOrder.getOrderId()));
|
|
|
+ new LambdaQueryWrapper<UserTicketOrderItem>()
|
|
|
+ .eq(UserTicketOrderItem::getOrderId, ticketOrder.getOrderId()));
|
|
|
|
|
|
for (UserTicketOrderItem orderItem : orderItemList) {
|
|
|
Ticket ticket = null;
|
|
@@ -468,21 +471,21 @@ public class UserTicketOrderServiceImpl extends
|
|
|
|
|
|
// 开幸运数字,更新ticket状态为已激活
|
|
|
boolean rtn = ticketService.update(
|
|
|
- new LambdaUpdateWrapper<Ticket>().set(Ticket::getPlainLuckyNum,
|
|
|
- Integer.valueOf(RSAUtil.decrypt(ticket.getCipherLuckyNum())))
|
|
|
- .set(Ticket::getStatus, TicketStatusEnum.ACTIVATED)
|
|
|
- .eq(Ticket::getTicketId, ticket.getTicketId()));
|
|
|
+ new LambdaUpdateWrapper<Ticket>().set(Ticket::getPlainLuckyNum,
|
|
|
+ Integer.valueOf(RSAUtil.decrypt(ticket.getCipherLuckyNum())))
|
|
|
+ .set(Ticket::getStatus, TicketStatusEnum.ACTIVATED)
|
|
|
+ .eq(Ticket::getTicketId, ticket.getTicketId()));
|
|
|
Assert.isTrue(rtn, "支付回调用户购票订单处理,更新盲票状态失败,ticketId:" + ticket.getTicketId());
|
|
|
|
|
|
}
|
|
|
|
|
|
// 更新订单状态为已完成
|
|
|
boolean updateRst = update(
|
|
|
- new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getStatus,
|
|
|
- UserTicketOrderStatusEnum.FINISHED)
|
|
|
- .set(UserTicketOrder::getPayTime, ticketOrder.getPayTime())
|
|
|
- .eq(UserTicketOrder::getOrderId, ticketOrder.getOrderId())
|
|
|
- .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY));
|
|
|
+ new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getStatus,
|
|
|
+ UserTicketOrderStatusEnum.FINISHED)
|
|
|
+ .set(UserTicketOrder::getPayTime, ticketOrder.getPayTime())
|
|
|
+ .eq(UserTicketOrder::getOrderId, ticketOrder.getOrderId())
|
|
|
+ .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY));
|
|
|
Assert.isTrue(updateRst, "支付回调用户购票订单处理,更新订单状态失败,orderId:" + ticketOrder.getOrderId());
|
|
|
|
|
|
return true;
|
|
@@ -496,10 +499,11 @@ public class UserTicketOrderServiceImpl extends
|
|
|
UserTicketOrder ticketOrder = getById(orderId);
|
|
|
BeanUtils.copyProperties(ticketOrder, channelCommParam);
|
|
|
Assert.isTrue(channelCommParam.getCommStatus() != CommStatusEnum.YES,
|
|
|
- "结佣处理,结佣状态异常,不是结佣中或未结佣。orderId=" + orderId);
|
|
|
+ "结佣处理,结佣状态异常,不是结佣中或未结佣。orderId=" + orderId);
|
|
|
} else {
|
|
|
ChannelOrder channelOrder = channelOrderService.getById(orderId);
|
|
|
- ChannelOrderItem channelOrderItem = channelOrderItemService.getOne(new LambdaQueryWrapper<ChannelOrderItem>()
|
|
|
+ ChannelOrderItem channelOrderItem = channelOrderItemService.getOne(
|
|
|
+ new LambdaQueryWrapper<ChannelOrderItem>()
|
|
|
.eq(ChannelOrderItem::getOrderId, orderId));
|
|
|
channelCommParam.setBoxId(channelOrderItem.getBoxId());
|
|
|
channelCommParam.setChannelId(channelOrder.getChannelId());
|
|
@@ -531,21 +535,21 @@ public class UserTicketOrderServiceImpl extends
|
|
|
channelCommission.setSaleCommAmt(siteCommission.getSaleCommAmt());
|
|
|
channelCommission.setCommRate(channel.getCommRate());
|
|
|
channelCommission.setCommAmt(new BigDecimal(channelCommission.getSaleCommAmt()).multiply(
|
|
|
- channelCommission.getCommRate()).divide(new BigDecimal(100), 0, RoundingMode.DOWN)
|
|
|
- .intValue() - sumCommAmt);
|
|
|
+ channelCommission.getCommRate()).divide(new BigDecimal(100), 0, RoundingMode.DOWN)
|
|
|
+ .intValue() - sumCommAmt);
|
|
|
channelCommissionService.save(channelCommission);
|
|
|
sumCommAmt += channelCommission.getCommAmt();
|
|
|
}
|
|
|
} else {
|
|
|
LogUtil.info(logger, "渠道结佣时,订单对应的渠道不存在,无需结佣。orderId:{0}",
|
|
|
- channelCommParam.getOrderId());
|
|
|
+ channelCommParam.getOrderId());
|
|
|
}
|
|
|
if (ChannelCommissionResourceEnum.USER.getValue().equals(resource)) {
|
|
|
boolean rst = update(
|
|
|
- new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getCommStatus,
|
|
|
- CommStatusEnum.YES)
|
|
|
- .eq(UserTicketOrder::getOrderId, orderId)
|
|
|
- .in(UserTicketOrder::getCommStatus, CommStatusEnum.DOING, CommStatusEnum.NO));
|
|
|
+ new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getCommStatus,
|
|
|
+ CommStatusEnum.YES)
|
|
|
+ .eq(UserTicketOrder::getOrderId, orderId)
|
|
|
+ .in(UserTicketOrder::getCommStatus, CommStatusEnum.DOING, CommStatusEnum.NO));
|
|
|
Assert.isTrue(rst, "渠道结佣完成,更新订单状态失败。orderId:" + orderId);
|
|
|
}
|
|
|
return true;
|
|
@@ -562,7 +566,7 @@ public class UserTicketOrderServiceImpl extends
|
|
|
}
|
|
|
|
|
|
private ChannelCommission saveSiteCommAmt(ChannelCommParam channelCommParam, TicketBox ticketBox,
|
|
|
- Channel channel) {
|
|
|
+ Channel channel) {
|
|
|
ChannelCommission siteCommission = new ChannelCommission();
|
|
|
siteCommission.setChannelId(channel.getChannelId());
|
|
|
siteCommission.setOrderId(channelCommParam.getOrderId());
|
|
@@ -570,11 +574,11 @@ public class UserTicketOrderServiceImpl extends
|
|
|
siteCommission.setSaleAmt(channelCommParam.getPayAmt());
|
|
|
siteCommission.setSaleCommRate(ticketBox.getSaleCommRate());
|
|
|
siteCommission.setSaleCommAmt(new BigDecimal(siteCommission.getSaleAmt()).multiply(
|
|
|
- siteCommission.getSaleCommRate()).divide(new BigDecimal(100), 0, RoundingMode.DOWN)
|
|
|
- .intValue());
|
|
|
+ siteCommission.getSaleCommRate()).divide(new BigDecimal(100), 0, RoundingMode.DOWN)
|
|
|
+ .intValue());
|
|
|
siteCommission.setCommRate(channel.getCommRate());
|
|
|
siteCommission.setCommAmt(new BigDecimal(siteCommission.getSaleCommAmt()).multiply(
|
|
|
- siteCommission.getCommRate()).divide(new BigDecimal(100), 0, RoundingMode.DOWN).intValue());
|
|
|
+ siteCommission.getCommRate()).divide(new BigDecimal(100), 0, RoundingMode.DOWN).intValue());
|
|
|
channelCommissionService.save(siteCommission);
|
|
|
return siteCommission;
|
|
|
}
|
|
@@ -635,12 +639,14 @@ public class UserTicketOrderServiceImpl extends
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<IndexVO> selectIndexTicketBoxTopByTicketOrderAndChannelOrder(IndexTicketBoxTopQueryParam indexTicketBoxTopQueryParam) {
|
|
|
+ public List<IndexVO> selectIndexTicketBoxTopByTicketOrderAndChannelOrder(
|
|
|
+ IndexTicketBoxTopQueryParam indexTicketBoxTopQueryParam) {
|
|
|
return getBaseMapper().selectIndexTicketBoxTopByTicketOrderAndChannelOrder(indexTicketBoxTopQueryParam);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<IndexVO> selectIndexTicketSiteTopByTicketOrderAndChannelOrder(IndexTicketSiteTopQueryParam indexTicketSiteTopQueryParam) {
|
|
|
+ public List<IndexVO> selectIndexTicketSiteTopByTicketOrderAndChannelOrder(
|
|
|
+ IndexTicketSiteTopQueryParam indexTicketSiteTopQueryParam) {
|
|
|
return getBaseMapper().selectIndexTicketSiteTopByTicketOrderAndChannelOrder(indexTicketSiteTopQueryParam);
|
|
|
}
|
|
|
|