|
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.qs.mp.admin.domain.Ticket;
|
|
|
import com.qs.mp.admin.domain.TicketAwardsPrize;
|
|
|
import com.qs.mp.admin.domain.TicketBox;
|
|
|
+import com.qs.mp.admin.domain.TicketPackage;
|
|
|
import com.qs.mp.admin.domain.param.TicketBoxParam;
|
|
|
import com.qs.mp.admin.domain.param.TicketParam;
|
|
|
import com.qs.mp.admin.domain.vo.TicketBoxListVO;
|
|
@@ -14,12 +15,15 @@ import com.qs.mp.admin.domain.vo.TicketListVO;
|
|
|
import com.qs.mp.admin.domain.vo.TicketVO;
|
|
|
import com.qs.mp.admin.service.ITicketAwardsPrizeService;
|
|
|
import com.qs.mp.admin.service.ITicketBoxService;
|
|
|
+import com.qs.mp.admin.service.ITicketPackageService;
|
|
|
import com.qs.mp.admin.service.ITicketService;
|
|
|
import com.qs.mp.common.core.domain.AjaxResult;
|
|
|
import com.qs.mp.common.core.page.TableDataInfo;
|
|
|
import com.qs.mp.common.enums.ErrorCodeEnum;
|
|
|
import com.qs.mp.common.enums.TicketBoxStatusEnum;
|
|
|
+import com.qs.mp.common.enums.TicketPkgStatusEnum;
|
|
|
import com.qs.mp.common.enums.TicketStatusEnum;
|
|
|
+import com.qs.mp.common.utils.LogUtil;
|
|
|
import com.qs.mp.common.utils.StringUtils;
|
|
|
import com.qs.mp.user.domain.UserTicketOrderItem;
|
|
|
import com.qs.mp.user.service.IUserHitPrizeService;
|
|
@@ -60,6 +64,9 @@ public class UserTicketController extends BaseApiController {
|
|
|
@Autowired
|
|
|
private IUserHitPrizeService userHitPrizeService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITicketPackageService ticketPackageService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private MapperFacade mapperFacade;
|
|
|
|
|
@@ -121,6 +128,11 @@ public class UserTicketController extends BaseApiController {
|
|
|
/*if (ticket.getStatus() == TicketStatusEnum.CASHED) {
|
|
|
return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1017);
|
|
|
}*/
|
|
|
+ TicketPackage ticketPackage = ticketPackageService.getById(ticket.getPkgId());
|
|
|
+ if (ticketPackage.getStatus() != TicketPkgStatusEnum.SOLD) {
|
|
|
+ LogUtil.error(logger, "盲票未激活。ticketId:{0},pkgId:{1}", new Object[]{ticket.getTicketId(), ticket.getPkgId()});
|
|
|
+ return AjaxResult.error("盲票未激活");
|
|
|
+ }
|
|
|
|
|
|
TicketBox ticketBox = ticketBoxService.getById(ticket.getBoxId());
|
|
|
|