fix(other): hide down-shelved lucky gifts

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/game/luckygift/LuckyGiftDataQryCmd.java

@@ -37,7 +37,9 @@ public class LuckyGiftDataQryCmd {
   public GameLuckyGiftDataCO execute(GameLuckyGiftCmd cmd) {
 
     GiftConfigDTO giftConfigCache = giftCacheService.getById(cmd.getGiftId());
-    if (Objects.isNull(giftConfigCache) || Objects.isNull(giftConfigCache.getStandardId())) {
+    if (Objects.isNull(giftConfigCache)
+        || Boolean.TRUE.equals(giftConfigCache.getDel())
+        || Objects.isNull(giftConfigCache.getStandardId())) {
       return null;
     }
 

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/game/luckygift/LuckyGiftMultipleRuleQryCmd.java

@@ -85,7 +85,9 @@ public class LuckyGiftMultipleRuleQryCmd {
   private List<GameLuckyGiftMultipleCO> listMaxMultiple(Long giftId) {
 
     GiftConfigDTO configCache = giftCacheService.getById(giftId);
-    if (Objects.isNull(configCache)) {
+    if (Objects.isNull(configCache)
+        || Boolean.TRUE.equals(configCache.getDel())
+        || Objects.isNull(configCache.getStandardId())) {
       return Lists.newArrayList();
     }
 

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/LuckyGiftGiveCmdExe.java

@@ -57,6 +57,7 @@ public class LuckyGiftGiveCmdExe {
     GiftConfigDTO giftConfig = giftCacheService.getById(cmd.getGiftId());
 
     ResponseAssert.notNull(GiftErrorCode.GIFT_NOT_FOUND, giftConfig);
+    ResponseAssert.isFalse(GiftErrorCode.GIFT_NOT_FOUND, Boolean.TRUE.equals(giftConfig.getDel()));
 
     // 判断版本号从而保证使用幸运礼物必须升级版本
     ResponseAssert.isTrue(CommonErrorCode.NOT_ACCEPT_REQUEST,

rc-service/rc-service-other/other-application/src/test/java/com/red/circle/other/app/command/game/luckygift/LuckyGiftDataQryCmdTest.java

@@ -0,0 +1,44 @@
+package com.red.circle.other.app.command.game.luckygift;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.red.circle.other.app.common.gift.GameLuckyGiftCommon;
+import com.red.circle.other.app.dto.cmd.game.GameLuckyGiftCmd;
+import com.red.circle.other.infra.database.cache.service.other.GameLuckyGiftCacheService;
+import com.red.circle.other.infra.database.cache.service.other.GiftCacheService;
+import com.red.circle.other.infra.database.rds.service.game.LuckyGiftProbabilityDetailsService;
+import com.red.circle.other.infra.database.rds.service.game.LuckyGiftProbabilityService;
+import com.red.circle.other.inner.model.dto.material.GiftConfigDTO;
+import org.junit.jupiter.api.Test;
+
+class LuckyGiftDataQryCmdTest {
+
+  @Test
+  void execute_shouldReturnNullWhenGiftIsDownShelved() {
+    GiftCacheService giftCacheService = mock(GiftCacheService.class);
+    GameLuckyGiftCommon gameLuckyGiftCommon = mock(GameLuckyGiftCommon.class);
+    GameLuckyGiftCacheService gameLuckyGiftCacheService = mock(GameLuckyGiftCacheService.class);
+    LuckyGiftProbabilityService luckyGiftProbabilityService = mock(LuckyGiftProbabilityService.class);
+    LuckyGiftProbabilityDetailsService luckyGiftProbabilityDetailsService = mock(
+        LuckyGiftProbabilityDetailsService.class);
+    LuckyGiftDataQryCmd qryCmd = new LuckyGiftDataQryCmd(
+        giftCacheService,
+        gameLuckyGiftCommon,
+        gameLuckyGiftCacheService,
+        luckyGiftProbabilityService,
+        luckyGiftProbabilityDetailsService
+    );
+
+    when(giftCacheService.getById(11L)).thenReturn(new GiftConfigDTO()
+        .setId(11L)
+        .setDel(Boolean.TRUE)
+        .setStandardId(99L));
+
+    GameLuckyGiftCmd cmd = new GameLuckyGiftCmd();
+    cmd.setGiftId(11L);
+
+    assertNull(qryCmd.execute(cmd));
+  }
+}

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/game/impl/GameLuckyGiftStandardConfigServiceImpl.java

@@ -27,6 +27,7 @@ public class GameLuckyGiftStandardConfigServiceImpl extends
   public List<GameLuckyGiftStandardConfig> getLuckyGiftStandard(String sysOrigin) {
     return query()
         .eq(GameLuckyGiftStandardConfig::getSysOrigin, sysOrigin)
+        .eq(GameLuckyGiftStandardConfig::getDel, Boolean.FALSE)
         .last(PageConstant.formatLimit(500))
         .list();
   }
@@ -39,6 +40,7 @@ public class GameLuckyGiftStandardConfigServiceImpl extends
             query.getSysOrigin())
         .like(StringUtils.isNotBlank(query.getRemarks()), GameLuckyGiftStandardConfig::getRemarks,
             query.getRemarks())
+        .eq(GameLuckyGiftStandardConfig::getDel, Boolean.FALSE)
         .orderByDesc(GameLuckyGiftStandardConfig::getCreateTime)
         .page(query.getPageQuery());
   }

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/game/impl/LuckyGiftProbabilityDetailsServiceImpl.java

@@ -64,6 +64,7 @@ public class LuckyGiftProbabilityDetailsServiceImpl extends
 
     return query()
         .eq(LuckyGiftProbabilityDetails::getProbabilityId, probabilityId)
+        .eq(LuckyGiftProbabilityDetails::getDel, Boolean.FALSE)
         .last(PageConstant.formatLimit(50))
         .list();
   }
@@ -77,7 +78,10 @@ public class LuckyGiftProbabilityDetailsServiceImpl extends
   public Map<Long, List<LuckyGiftProbabilityDetails>> getLuckyGiftProbabilityDetails(
       String sysOrigin) {
     return Optional.ofNullable(
-            query().eq(LuckyGiftProbabilityDetails::getSysOrigin, sysOrigin).list())
+            query()
+                .eq(LuckyGiftProbabilityDetails::getSysOrigin, sysOrigin)
+                .eq(LuckyGiftProbabilityDetails::getDel, Boolean.FALSE)
+                .list())
         .map(probabilityDetails ->
             probabilityDetails.stream().collect(
                 Collectors.groupingBy(LuckyGiftProbabilityDetails::getProbabilityId)))
@@ -87,7 +91,10 @@ public class LuckyGiftProbabilityDetailsServiceImpl extends
   @Override
   public List<LuckyGiftProbabilityDetails> getDetailByProbabilityId(Long probabilityId) {
     return Optional.ofNullable(
-        query().eq(LuckyGiftProbabilityDetails::getProbabilityId, probabilityId).list()).orElse(
+        query()
+            .eq(LuckyGiftProbabilityDetails::getProbabilityId, probabilityId)
+            .eq(LuckyGiftProbabilityDetails::getDel, Boolean.FALSE)
+            .list()).orElse(
         Lists.newArrayList());
   }
 

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/game/impl/LuckyGiftProbabilityServiceImpl.java

@@ -33,6 +33,7 @@ public class LuckyGiftProbabilityServiceImpl extends
 
     return query()
         .eq(LuckyGiftProbability::getStandardId, standardId)
+        .eq(LuckyGiftProbability::getDel, Boolean.FALSE)
         .last(PageConstant.formatLimit(5))
         .list();
   }
@@ -43,13 +44,20 @@ public class LuckyGiftProbabilityServiceImpl extends
     return query()
         .eq(LuckyGiftProbability::getGiftQuantity, quantity)
         .eq(LuckyGiftProbability::getStandardId, standardId)
+        .eq(LuckyGiftProbability::getDel, Boolean.FALSE)
         .last(PageConstant.LIMIT_ONE)
         .getOne();
   }
 
   @Override
   public Map<Long, List<LuckyGiftProbability>> getLuckyGiftProbabilityMap(Set<Long> standardIds) {
-    return Optional.ofNullable(query().in(LuckyGiftProbability::getStandardId, standardIds).list())
+    if (Objects.isNull(standardIds) || standardIds.isEmpty()) {
+      return Maps.newHashMap();
+    }
+    return Optional.ofNullable(query()
+            .in(LuckyGiftProbability::getStandardId, standardIds)
+            .eq(LuckyGiftProbability::getDel, Boolean.FALSE)
+            .list())
         .map(probabilityList -> probabilityList.stream()
             .collect(Collectors.groupingBy(LuckyGiftProbability::getStandardId)))
         .orElse(Maps.newHashMap());
@@ -58,7 +66,9 @@ public class LuckyGiftProbabilityServiceImpl extends
   @Override
   public List<LuckyGiftProbability> getLuckyGiftProbabilityByStandardId(Long id) {
     return query()
-        .eq(Objects.nonNull(id), LuckyGiftProbability::getStandardId, id).list();
+        .eq(Objects.nonNull(id), LuckyGiftProbability::getStandardId, id)
+        .eq(LuckyGiftProbability::getDel, Boolean.FALSE)
+        .list();
   }
 
   @Override
@@ -74,6 +84,7 @@ public class LuckyGiftProbabilityServiceImpl extends
             query.getSysOrigin())
         .eq(Objects.nonNull(query.getStandardId()), LuckyGiftProbability::getStandardId,
             query.getStandardId())
+        .eq(LuckyGiftProbability::getDel, Boolean.FALSE)
         .orderByAsc(LuckyGiftProbability::getSort)
         .list();
   }

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/gift/GiftConfigService.java

@@ -136,6 +136,8 @@ public interface GiftConfigService extends BaseService<GiftConfig> {
 
   List<GiftConfig> getLuckyGiftByStandardId(Long id, String name);
 
+  Set<Long> listEffectiveLuckyGiftStandardIds(String sysOrigin);
+
   /**
    * 获取平台表白礼物.
    *

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/gift/impl/GiftConfigServiceImpl.java

@@ -286,6 +286,21 @@ public class GiftConfigServiceImpl extends BaseServiceImpl<GiftConfigDAO, GiftCo
         .orElse(Lists.newArrayList());
   }
 
+  @Override
+  public Set<Long> listEffectiveLuckyGiftStandardIds(String sysOrigin) {
+    return Optional.ofNullable(query()
+            .eq(GiftConfig::getSysOrigin, sysOrigin)
+            .eq(GiftConfig::getGiftTab, GiftTabEnum.LUCKY_GIFT)
+            .eq(GiftConfig::getDel, Boolean.FALSE)
+            .isNotNull(GiftConfig::getStandardId)
+            .list())
+        .map(gifts -> gifts.stream()
+            .map(GiftConfig::getStandardId)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toSet()))
+        .orElse(CollectionUtils.newHashSet());
+  }
+
   @Override
   public List<GiftConfig> listConfessionGifts(String sysOrigin) {
     return query()

rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/game/impl/GameLuckyGiftConfigClientServiceImpl.java

@@ -82,8 +82,14 @@ public class GameLuckyGiftConfigClientServiceImpl implements GameLuckyGiftConfig
 
   @Override
   public List<LuckyGiftStandardMapDTO> listProbability(String sysOrigin) {
+    Set<Long> activeStandardIds = giftConfigService.listEffectiveLuckyGiftStandardIds(sysOrigin);
+    if (CollectionUtils.isEmpty(activeStandardIds)) {
+      return Lists.newArrayList();
+    }
     List<GameLuckyGiftStandardConfig> luckyGiftStandards = gameLuckyGiftStandardConfigService.getLuckyGiftStandard(
-        sysOrigin);
+        sysOrigin).stream()
+        .filter(luckyGiftStandard -> activeStandardIds.contains(luckyGiftStandard.getId()))
+        .collect(Collectors.toList());
     if (CollectionUtils.isEmpty(luckyGiftStandards)) {
       return Lists.newArrayList();
     }