|
@@ -2,9 +2,13 @@ package com.qs.mp.web.controller.api.user;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.qs.mp.admin.domain.Ticket;
|
|
|
import com.qs.mp.admin.domain.TicketBox;
|
|
|
+import com.qs.mp.admin.domain.TicketBoxGoods;
|
|
|
import com.qs.mp.admin.domain.TicketPackage;
|
|
|
+import com.qs.mp.admin.domain.vo.TicketBoxGoodsListVO;
|
|
|
+import com.qs.mp.admin.service.ITicketBoxGoodsService;
|
|
|
import com.qs.mp.admin.service.ITicketBoxService;
|
|
|
import com.qs.mp.admin.service.ITicketPackageService;
|
|
|
import com.qs.mp.admin.service.ITicketService;
|
|
@@ -93,6 +97,9 @@ public class UserTicketOrderController extends BaseApiController {
|
|
|
@Autowired
|
|
|
private ITicketPackageService ticketPackageService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITicketBoxGoodsService ticketBoxGoodsService;
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 订单结算,每次更换优惠券时需重新请求此接口
|
|
@@ -159,6 +166,14 @@ public class UserTicketOrderController extends BaseApiController {
|
|
|
AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(param.getAppSource());
|
|
|
orderSettleVO.setAppId(appSourceEnum.getAppId());
|
|
|
|
|
|
+ QueryWrapper<TicketBoxGoodsListVO> queryWrapper = new QueryWrapper<>();
|
|
|
+ List<TicketBoxGoodsListVO> ticketBoxGoodsListVOS = ticketBoxService.listTicketGoodsByQueryWrapper(queryWrapper);
|
|
|
+ if (!CollectionUtils.isEmpty(ticketBoxGoodsListVOS)) {
|
|
|
+ TicketBoxGoodsListVO ticketBoxGoodsListVO = ticketBoxGoodsListVOS.get(0);
|
|
|
+ orderSettleVO.setGoodsPicUrl(ticketBoxGoodsListVO.getPicUrl());
|
|
|
+ orderSettleVO.setGoodsTitle(ticketBoxGoodsListVO.getTitle());
|
|
|
+ }
|
|
|
+
|
|
|
// 缓存订单结算对象
|
|
|
redisCache.setCacheObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId), orderSettleVO, 10,
|
|
|
TimeUnit.MINUTES);
|