|
@@ -5,14 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.qs.mp.admin.domain.Goods;
|
|
|
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.param.IndexTicketBoxTopQueryParam;
|
|
|
import com.qs.mp.admin.domain.param.IndexTicketSiteTopQueryParam;
|
|
|
import com.qs.mp.admin.domain.param.UserTicketOrderQueryParam;
|
|
|
import com.qs.mp.admin.domain.vo.*;
|
|
|
+import com.qs.mp.admin.service.IGoodsService;
|
|
|
+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;
|
|
@@ -40,6 +45,7 @@ import com.qs.mp.user.domain.vo.UserCoupon4OrderVO;
|
|
|
import com.qs.mp.user.domain.vo.UserShareVO;
|
|
|
import com.qs.mp.user.mapper.UserTicketOrderMapper;
|
|
|
import com.qs.mp.user.service.IUserCouponService;
|
|
|
+import com.qs.mp.user.service.IUserPrizeStorageService;
|
|
|
import com.qs.mp.user.service.IUserTicketOrderItemService;
|
|
|
import com.qs.mp.user.service.IUserTicketOrderService;
|
|
|
|
|
@@ -127,6 +133,15 @@ public class UserTicketOrderServiceImpl extends
|
|
|
@Autowired
|
|
|
private DistributedLocker distributedLocker;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITicketBoxGoodsService ticketBoxGoodsService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IUserPrizeStorageService userPrizeStorageService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IGoodsService goodsService;
|
|
|
+
|
|
|
@Override
|
|
|
public String submitOrder(Long userId, TicketOrderSettleVO orderSettleVO,
|
|
|
UserShareVO userShareVO) {
|
|
@@ -482,6 +497,23 @@ public class UserTicketOrderServiceImpl extends
|
|
|
.eq(Ticket::getTicketId, ticket.getTicketId()));
|
|
|
Assert.isTrue(rtn, "支付回调用户购票订单处理,更新盲票状态失败,ticketId:" + ticket.getTicketId());
|
|
|
|
|
|
+
|
|
|
+ // 如果为线上票则发送关联商品到用户仓库
|
|
|
+ TicketBox ticketBox = ticketBoxService.getById(ticketOrder.getBoxId());
|
|
|
+ if (TicketTypeEnum.ONLINE.equals(ticketBox.getType())) {
|
|
|
+ List<TicketBoxGoods> ticketBoxGoodsList = ticketBoxGoodsService.list(new LambdaQueryWrapper<TicketBoxGoods>()
|
|
|
+ .eq(TicketBoxGoods::getBoxId, ticketBox.getBoxId()));
|
|
|
+ if (CollectionUtils.isNotEmpty(ticketBoxGoodsList)) {
|
|
|
+ for (TicketBoxGoods ticketBoxGoods : ticketBoxGoodsList) {
|
|
|
+ Goods goods = goodsService.getById(Long.valueOf(ticketBoxGoods.getRefId()));
|
|
|
+
|
|
|
+ userPrizeStorageService.takeInStorage(orderItem.getUserId(),goods.getTitle(),goods.getPicUrl(),
|
|
|
+ ticketBoxGoods.getRefId(),PrizeStorageInTypeEnum.TICKET_GOODS,orderItem.getItemId());
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// 更新订单状态为已完成
|