|
@@ -4,8 +4,10 @@ import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
|
+import com.qs.mp.admin.domain.CouponChannel;
|
|
import com.qs.mp.admin.domain.Ticket;
|
|
import com.qs.mp.admin.domain.Ticket;
|
|
import com.qs.mp.admin.domain.vo.TicketListVO;
|
|
import com.qs.mp.admin.domain.vo.TicketListVO;
|
|
|
|
+import com.qs.mp.admin.service.ICouponChannelService;
|
|
import com.qs.mp.admin.service.IGoodsService;
|
|
import com.qs.mp.admin.service.IGoodsService;
|
|
import com.qs.mp.common.core.domain.AjaxResult;
|
|
import com.qs.mp.common.core.domain.AjaxResult;
|
|
import com.qs.mp.common.core.page.TableDataInfo;
|
|
import com.qs.mp.common.core.page.TableDataInfo;
|
|
@@ -76,6 +78,9 @@ public class UserMineController extends BaseApiController {
|
|
@Autowired
|
|
@Autowired
|
|
private IGoodsService goodsService;
|
|
private IGoodsService goodsService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ICouponChannelService couponChannelService;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 我的票包
|
|
* 我的票包
|
|
*/
|
|
*/
|
|
@@ -134,7 +139,11 @@ public class UserMineController extends BaseApiController {
|
|
.eq("t1.id", param.getId())
|
|
.eq("t1.id", param.getId())
|
|
.eq("t1.user_id", userId));
|
|
.eq("t1.user_id", userId));
|
|
if (!CollectionUtils.isEmpty(userCouponVOList)) {
|
|
if (!CollectionUtils.isEmpty(userCouponVOList)) {
|
|
- return AjaxResult.success(userCouponVOList.get(0));
|
|
|
|
|
|
+ UserCouponVO userCouponVO = userCouponVOList.get(0);
|
|
|
|
+ int channelTotal = couponChannelService.count(new LambdaQueryWrapper<CouponChannel>()
|
|
|
|
+ .eq(CouponChannel::getCouponId, userCouponVO.getCouponId()));
|
|
|
|
+ userCouponVO.setChannelTotal(channelTotal);
|
|
|
|
+ return AjaxResult.success(userCouponVO);
|
|
}
|
|
}
|
|
return AjaxResult.error("优惠券不存在");
|
|
return AjaxResult.error("优惠券不存在");
|
|
}
|
|
}
|