zoujiajian пре 3 година
родитељ
комит
bd7b4fca8f

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/CouponActiveView.java

@@ -22,7 +22,7 @@ import java.util.Date;
 		where = "ca.deleted is true and c.deleted is true")
 public class CouponActiveView {
 	@DbField("ca.id")
-	private Long couponActiveId;
+	private Long id;
 
 	/**
 	 * 优惠卷id

+ 3 - 0
netflix-service/src/main/java/com/cyksj/service/mange/coupon/impl/CouponCommonServiceImpl.java

@@ -81,6 +81,9 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 		if (coupon == null || !coupon.getDeleted()) {
 			throw BusinessRuntimeException.getInstance("该优惠卷不存在");
 		}
+		if (coupon.getHotStatus()) {
+			throw BusinessRuntimeException.getInstance("已推荐该优惠卷");
+		}
 		if (!coupon.getHotStatus()) {
 			coupon.setHotStatus(!coupon.getHotStatus());
 		}

+ 6 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/coupon/CouponController.java

@@ -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("删除推荐优惠卷成功");
 	}
 }