国王皇后礼物配置

rc-common-business/common-business-mq/business-mq-model/src/main/java/com/red/circle/mq/business/model/event/gift/GiveAwayGiftBatchEvent.java

@@ -222,6 +222,14 @@ public class GiveAwayGiftBatchEvent implements Serializable {
         "STAR");
   }
 
+  /**
+   * 是否是周星礼物.
+   */
+  public boolean checkWeekKingQueen() {
+    return StringUtils.isNotBlank(giftConfig.getSpecial()) && giftConfig.getSpecial().contains(
+        "KING_QUEEN");
+  }
+
   /**
    * 是否是幸运礼物.
    */

rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/enums/material/GiftSpecialEnum.java

@@ -27,6 +27,11 @@ public enum GiftSpecialEnum {
    */
   STAR,
 
+  /**
+   * 国王皇后.
+   */
+  KING_QUEEN,
+
   /**
    * svip礼物.
    */

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/GiveGiftsListener.java

@@ -857,9 +857,8 @@ public class GiveGiftsListener implements MessageListener {
 
         return new GiftValue()
                 .setCurrencyType(giftConfig.getType())
-                .setGiftType(event.checkWeekStar()
+                .setGiftType(event.checkWeekStar() ? GiftSpecialEnum.STAR.name() : event.checkWeekKingQueen()
-                        ? GiftSpecialEnum.STAR.name()
+                    ? GiftSpecialEnum.KING_QUEEN.name() : giftConfig.getGiftTab())
-                        : giftConfig.getGiftTab())
                 .setUnitPrice(giftConfig.getGiftCandy())
                 .setQuantity(event.getQuantity())
                 .setUserSize(event.acceptUserSize())

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java

@@ -186,18 +186,6 @@ public class GiftCountStrategy implements GiftStrategy {
     }
     // 20230406 财富和魅力积分双倍
     List<Long> ids = new ArrayList<>();
-    /*ids.add(1772929668714803202L);
-    ids.add(1772929262757945346L);
-    ids.add(1772928725046734850L);
-    ids.add(1772928394474102785L);
-    ids.add(1772927999046266881L);
-    ids.add(1779713184067002370L);
-    ids.add(1779713147019141122L);
-    ids.add(1779713096439603201L);
-    ids.add(1779712965271560194L);
-    ids.add(1779712864764469250L);
-    ids.add(1782947206856622082L);
-    ids.add(1792817888939679745L);*/
     List<Long> activityDoubleGiftIds = activityConfigService.listProcessingGiftIds(ids);
 
     boolean isDoubleLevelExpActivity = activityDoubleGiftIds.contains(runningWater.getGiftId());

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java

@@ -126,7 +126,9 @@ public class RankCountStrategy implements GiftStrategy {
               giftValue.getActualAmount().longValue());
     }
 
-    if (!isWeekStar) {
+    boolean isWeekKingQueen = isWeekKingQueen(giftValue);
+
+    if (isWeekKingQueen) {
 
       // king & queen
       weekKingQueenCountService.incrThisWeekQuantity(runningWater.getSysOrigin(),
@@ -352,6 +354,10 @@ public class RankCountStrategy implements GiftStrategy {
     return giftValue.getGiftType().contains(GiftSpecialEnum.STAR.name());
   }
 
+  private boolean isWeekKingQueen(GiftValue giftValue) {
+    return giftValue.getGiftType().contains(GiftSpecialEnum.KING_QUEEN.name());
+  }
+
   private boolean isExclusive(GiftValue giftValue) {
     return giftValue.getGiftType().contains(GiftTabEnum.EXCLUSIVE.name());
   }