|
@@ -115,6 +115,12 @@ public class UserTicketOrderController extends BaseApiController {
|
|
|
Ticket ticket = ticketService.getById(param.getTicketId());
|
|
|
ticketBox = ticketBoxService.getById(ticket.getBoxId());
|
|
|
orderAmt = ticketBox.getSalePrice();
|
|
|
+
|
|
|
+ // 预付票设置金额为0
|
|
|
+ TicketPackage ticketPackage = ticketPackageService.getById(ticket.getPkgId());
|
|
|
+ if (ticketPackage.getIsPre() == 1) {
|
|
|
+ orderAmt = 0;
|
|
|
+ }
|
|
|
} else {
|
|
|
// 线上购票
|
|
|
ticketBox = ticketBoxService.getById(param.getBoxId());
|
|
@@ -148,16 +154,6 @@ public class UserTicketOrderController extends BaseApiController {
|
|
|
orderSettleVO.setPicUrl(ticketBox.getPicUrl());
|
|
|
orderSettleVO.setTitle(ticketBox.getTitle());
|
|
|
|
|
|
- // 预付票设置金额为0
|
|
|
- if (StringUtils.isNotBlank(param.getTicketId())) {
|
|
|
- Ticket ticket = ticketService.getById(param.getTicketId());
|
|
|
- TicketPackage ticketPackage = ticketPackageService.getById(ticket.getPkgId());
|
|
|
- if (ticketPackage.getIsPre() == 1) {
|
|
|
- orderSettleVO.setPayAmt(0);
|
|
|
- orderSettleVO.setOrderNum(0);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
// 缓存订单结算对象
|
|
|
redisCache.setCacheObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId), orderSettleVO, 10, TimeUnit.MINUTES);
|
|
|
return AjaxResult.success(orderSettleVO);
|