fix 一键领取推荐优惠卷

netflix-dao/src/main/java/com/cyksj/mapper/manage/coupon/CouponRecommendMapper.java

@@ -18,7 +18,7 @@ public interface CouponRecommendMapper extends BaseMapper<CouponRecommend> {
 	@Update("update coupon_recommend set deleted = false where coupon_id = #{id}")
 	void deleteByCouponId(Long id);
 
-	@Select("select c.scope,c.id as couponId from coupon_recommend cr left join coupon c on c.id = cr.coupon_id" +
+	@Select("select c.scope,c.id as couponId,cr.id as recommendId from coupon_recommend cr left join coupon c on c.id = cr.coupon_id" +
 			" left join coupon_user cu on cu.coupon_id = c.id and cu.user_id = #{userId}" +
 			" where cr.deleted is true and c.deleted is true and cu.coupon_id is null")
 	List<CouponAvailableRecommendView> getRecommendCouponList(Long userId);

netflix-service/src/main/java/com/cyksj/service/coupon/impl/CouponFontServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
 import com.cyksj.mapper.manage.coupon.*;
@@ -115,11 +114,10 @@ public class CouponFontServiceImpl implements CouponFontService {
 
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
-	@NoSubmit
 	public void collectWholeRecommendCoupon(Long userId) {
 		CouponNewUserView couponNewUserView = beanSearcher.searchFirst(CouponNewUserView.class, MapUtils.builder().field(CouponNewUserView::getUserId, userId).op(Operator.Equal).build());
 		//查询所有可领取的推荐优惠券
-		List<CouponAvailableRecommendView> couponAvailableRecommendViews = beanSearcher.searchAll(CouponAvailableRecommendView.class, null);
+		List<CouponAvailableRecommendView> couponAvailableRecommendViews = recommendMapper.getRecommendCouponList(userId);
 		couponAvailableRecommendViews.stream().filter(data->{
 			if (data.getScope() == Coupon.Scope.newUser && couponNewUserView != null) {
 				return false;
@@ -262,7 +260,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 			couponUser.setValidEndTime(coupon.getValidEndTime());
 		} else {
 			couponUser.setValidStartTime(DateTime.now());
-			couponUser.setValidEndTime(DateUtil.offsetDay(coupon.getValidStartTime(), coupon.getValidDays()));
+			couponUser.setValidEndTime(DateUtil.offsetDay(couponUser.getValidStartTime(), coupon.getValidDays()));
 		}
 	}
 }