|
@@ -68,9 +68,6 @@ public class UserTicketOrderController extends BaseApiController {
|
|
|
@Autowired
|
|
|
private IUserCouponService userCouponService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private ICouponTicketService couponTicketService;
|
|
|
-
|
|
|
@Autowired
|
|
|
private IWalletService walletService;
|
|
|
|
|
@@ -206,8 +203,8 @@ public class UserTicketOrderController extends BaseApiController {
|
|
|
* 可用优惠券列表
|
|
|
*/
|
|
|
@PostMapping("/order/coupon/list")
|
|
|
- @ApiOperation(value = "取消订单" , notes = "在订单列表页面取消")
|
|
|
- public AjaxResult cancel(@RequestBody TicketOrderParam param) {
|
|
|
+ @ApiOperation(value = "查询可用优惠券" , notes = "在下单页面选择")
|
|
|
+ public AjaxResult listCoupon(@RequestBody TicketOrderParam param) {
|
|
|
Long userId = SecurityUtils.getUserId();
|
|
|
TicketOrderSettleVO orderSettleVO = redisCache.getCacheObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId));
|
|
|
if (null == orderSettleVO) {
|
|
@@ -215,6 +212,18 @@ public class UserTicketOrderController extends BaseApiController {
|
|
|
}
|
|
|
TicketBox ticketBox = ticketBoxService.getById(orderSettleVO.getBoxId());
|
|
|
List<UserCouponVO> userCouponVOList = userCouponService.queryUserCouponList(userId, orderSettleVO.getOrderAmt(), ticketBox);
|
|
|
+
|
|
|
+ // 设置选中状态
|
|
|
+ for (UserCouponVO userCouponVO : userCouponVOList) {
|
|
|
+ if (!CollectionUtils.isEmpty(orderSettleVO.getCouponList())) {
|
|
|
+ for (UserCoupon4OrderVO userCoupon4OrderVO : orderSettleVO.getCouponList()) {
|
|
|
+ if (userCoupon4OrderVO.getId().equals(userCouponVO.getId())) {
|
|
|
+ userCouponVO.setChecked(true);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return AjaxResult.success(userCouponVOList);
|
|
|
}
|
|
|
|