fix 不在会员规格内的车票不增加时长

netflix-dao/src/main/java/com/cyksj/mapper/GroupsRelationMapper.java

@@ -85,4 +85,6 @@ public interface GroupsRelationMapper extends BaseMapper<GroupsRelation> {
 	List<UserTicketView> selectUserTickets(@Param("userIds") List<Long> userIds, @Param("goodsId") Long goodsId, @Param("skuId") Long skuId);
 
 	Integer selectCountByGoodsId(@Param("userIds") List<Long> userIdList, @Param("goodsId") Long goodsId, @Param("now") DateTime now);
+
+	Integer updateUserVipSkusExpiryTime(@Param("userIds") List<Long> userIds, @Param("vipSkuIds") List<Long> vipSkuIds, @Param("expiryTime") Date expiryTime);
 }

netflix-dao/src/main/java/com/cyksj/mapper/vip/VipGoodsSkuMapper.java

@@ -2,6 +2,9 @@ package com.cyksj.mapper.vip;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.VipGoodsSku;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 项目名: yhlxj2
@@ -10,4 +13,7 @@ import com.cyksj.model.entity.VipGoodsSku;
  * 创建时间:2025/5/13 11:06
  */
 public interface VipGoodsSkuMapper extends BaseMapper<VipGoodsSku> {
+
+	@Select("select vgs.* from vip_goods_sku vgs inner join goods_don_sku sku on sku.id = vgs.sku_id where sku.status")
+	List<VipGoodsSku> selectUpSkus();
 }

netflix-dao/src/main/java/com/cyksj/model/views/VipGoodsSkuFrontView.java

@@ -16,7 +16,8 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @SearchBean(tables = "vip_goods_sku vgs left join goods_don g on g.id = vgs.goods_id" +
-		" left join goods_don_sku sku on sku.id = vgs.sku_id")
+		" left join goods_don_sku sku on sku.id = vgs.sku_id",
+		where = "sku.status")
 public class VipGoodsSkuFrontView {
 
 	@DbField("vgs.goods_id")

netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -45,6 +45,21 @@
         update groups_relation set expiry_time = DATE_ADD(expiry_time,interval 1 day) where id = #{relationId} and user_id = #{userId}
     </update>
 
+    <update id="updateUserVipSkusExpiryTime">
+        update groups_relation set expiry_time = #{expiryTime} and update_time = now()
+        where id in (
+        select id from groups_relation gr inner join groups_trips gt on gt.id = gr.groups_id
+        where gt.sku_id in
+        <foreach collection="vipSkuIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and gr.user_id in
+        <foreach collection="userIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and is_vip)
+    </update>
+
     <select id="getAccountIdsByUserIdOrNickNameOrSubmitAccount" resultType="java.lang.Long">
         select gr.groups_id
         from groups_relation gr,

netflix-service/src/main/java/com/cyksj/service/order/impl/VipOrderDonServiceImpl.java

@@ -497,7 +497,7 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 			} catch (Exception e) {
 			}
 		}
-		List<VipGoodsSku> skus = vipGoodsSkuMapper.selectList(null);
+		List<VipGoodsSku> skus = vipGoodsSkuMapper.selectUpSkus();
 		List<Long> deductSkuIds = null;
 		if (CollUtil.isNotEmpty(deductRelationIds)) {
 			List<GroupsRelationView> groupsRelationViews = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.builder()
@@ -684,7 +684,7 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 	 * 设置会员车票同一过期时间
 	 */
 	private void setTicketToVipExpiryTime(List<Long> userIds, Long vipUserId, Date expiryTime) {
-		List<Long> vipSkuIds = vipGoodsSkuMapper.selectList(null).stream().map(VipGoodsSku::getSkuId).collect(Collectors.toList());
+		List<Long> vipSkuIds = vipGoodsSkuMapper.selectUpSkus().stream().map(VipGoodsSku::getSkuId).collect(Collectors.toList());
 		List<Long> selfSkuIds = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.builder()
 				.field(GroupsRelationView::getUserId, userIds).op(Operator.InList)
 				.field(GroupsRelationView::getSkuId, vipSkuIds).op(Operator.InList)
@@ -699,12 +699,8 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 				}
 			});
 		}
-		relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
-				.set(GroupsRelation::getExpiryTime, expiryTime)
-				.set(GroupsRelation::getUpdateTime, DateTime.now())
-				.in(GroupsRelation::getUserId, userIds)
-				.eq(GroupsRelation::getStatus, GroupsRelation.Status.validity)
-				.eq(GroupsRelation::getIsVip, Boolean.TRUE));
+		//更新会员车票
+		relationMapper.updateUserVipSkusExpiryTime(userIds, vipSkuIds, expiryTime);
 	}
 
 	private BigDecimal getVipMoney(Integer num) {

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -301,7 +301,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				} catch (Exception e) {
 				}
 			}
-			List<Long> vipSkuIds = vipGoodsSkuMapper.selectList(null).stream().map(VipGoodsSku::getSkuId).collect(Collectors.toList());
+			List<Long> vipSkuIds = vipGoodsSkuMapper.selectUpSkus().stream().map(VipGoodsSku::getSkuId).collect(Collectors.toList());
 			Set<Long> vipGoodsIds = goodsDonSkuMapper.selectList(Wrappers.lambdaQuery(GoodsDonSku.class)
 					.in(GoodsDonSku::getId, vipSkuIds)).stream().map(GoodsDonSku::getGoodsId).collect(Collectors.toSet());
 			Integer vipUserCount = vipUserMapper.selectCount(Wrappers.lambdaQuery(VipUser.class)

netflix-service/src/main/java/com/cyksj/service/vip/impl/CmsVipUserServiceImpl.java

@@ -69,7 +69,7 @@ public class CmsVipUserServiceImpl implements CmsVipUserService {
 			vipUserMapper.updateById(vipUser);
 		}
 		//发送车票
-		List<VipGoodsSku> skus = vipGoodsSkuMapper.selectList(null);
+		List<VipGoodsSku> skus = vipGoodsSkuMapper.selectUpSkus();
 		for (VipGoodsSku sku : skus) {
 			//未有抵扣 直接发送会员车票
 			groupRelationFrontService.getTicket(userId, sku.getSkuId(), Boolean.TRUE);

netflix-service/src/main/java/com/cyksj/service/vip/impl/VipFrontServiceImpl.java

@@ -16,6 +16,7 @@ import com.cyksj.model.entity.*;
 import com.cyksj.model.manage.views.GroupsRelationView;
 import com.cyksj.model.response.VipUserPageResp;
 import com.cyksj.model.views.RenewalView;
+import com.cyksj.model.views.VipGoodsSkuFrontView;
 import com.cyksj.service.chatgpt.ChatGptAccountService;
 import com.cyksj.service.claude.ClaudeService;
 import com.cyksj.service.user.UserBindRelationService;
@@ -86,7 +87,7 @@ public class VipFrontServiceImpl implements VipFrontService {
 		//可抵扣价格
 		BigDecimal deductMoney = BigDecimal.ZERO;
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		List<Long> vipSkuIds = vipGoodsSkuMapper.selectList(null).stream().map(VipGoodsSku::getSkuId).collect(Collectors.toList());
+		List<Long> vipSkuIds = beanSearcher.searchAll(VipGoodsSkuFrontView.class, MapUtils.builder().build()).stream().map(VipGoodsSkuFrontView::getSkuId).collect(Collectors.toList());
 		//可有抵扣车票
 		DateTime now = DateTime.now();
 		//会员规格
@@ -115,7 +116,7 @@ public class VipFrontServiceImpl implements VipFrontService {
 	@Override
 	public VipDeductDto checkAndGetOrderDeductMoney(Long userId, Integer months) {
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		List<Long> vipSkuIds = vipGoodsSkuMapper.selectList(null).stream().map(VipGoodsSku::getSkuId).collect(Collectors.toList());
+		List<Long> vipSkuIds = vipGoodsSkuMapper.selectUpSkus().stream().map(VipGoodsSku::getSkuId).collect(Collectors.toList());
 		//会员规格
 		Set<Long> goodsIds = goodsDonSkuMapper.selectList(Wrappers.lambdaQuery(GoodsDonSku.class)
 				.in(GoodsDonSku::getId, vipSkuIds)).stream().map(GoodsDonSku::getGoodsId).collect(Collectors.toSet());