|
|
@@ -169,7 +169,7 @@ public class CouponController {
|
|
|
public Result<SearchResult<CouponActiveView>> couponActiveList(HttpServletRequest request) {
|
|
|
SearchResult<CouponActiveView> search = beanSearcher.search(CouponActiveView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
|
search.getDataList().forEach(data -> {
|
|
|
- List<CouponUser> couponUsers = couponUserMapper.selectList(Wrappers.lambdaQuery(CouponUser.class).eq(CouponUser::getCouponActiveId, data.getCouponActiveId()).select(CouponUser::getId, CouponUser::getStatus));
|
|
|
+ List<CouponUser> couponUsers = couponUserMapper.selectList(Wrappers.lambdaQuery(CouponUser.class).eq(CouponUser::getCouponActiveId, data.getId()).select(CouponUser::getId, CouponUser::getStatus));
|
|
|
Optional.ofNullable(couponUsers).ifPresentOrElse(list -> {
|
|
|
data.setReceiptNum(list.size());
|
|
|
Map<CouponUser.Status, List<CouponUser>> listMap = list.stream().collect(Collectors.groupingBy(CouponUser::getStatus));
|
|
|
@@ -267,6 +267,11 @@ public class CouponController {
|
|
|
throw BusinessRuntimeException.getInstance("取消推荐优惠券,才可删除");
|
|
|
}
|
|
|
couponRecommendMapper.deleteById(recommendId);
|
|
|
+ Coupon coupon = couponMapper.selectById(couponRecommend.getCouponId());
|
|
|
+ if (coupon != null && coupon.getDeleted()) {
|
|
|
+ coupon.setHotStatus(false);
|
|
|
+ couponMapper.updateById(coupon);
|
|
|
+ }
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult("删除推荐优惠卷成功");
|
|
|
}
|
|
|
}
|