国王皇后增加模板id， 消息修复

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

@@ -36,4 +36,6 @@ public enum GiftSpecialEnum {
    * svip礼物.
    */
   SVIP_GIFT
+
+
 }

rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/room/WeekKingQueenController.java

@@ -118,8 +118,8 @@ public class WeekKingQueenController extends BaseController {
    * 获取有效活动
    */
   @GetMapping("/effective")
-  public ActivityConfigVO getEffective(@Validated AppExtCommand cmd) {
+  public ActivityConfigVO getEffective(AppExtCommand cmd, @RequestParam(required = false) String templateId) {
-    return weekKingQueenService.getEffectiveActivity(cmd);
+    return weekKingQueenService.getEffectiveActivity(cmd, templateId);
   }
 
   /**

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/WeekKingQueenActivityExe.java

@@ -36,9 +36,13 @@ public class WeekKingQueenActivityExe {
   private final BadgeSourceClient badgeSourceClient;
   private final PropsActivityRewardConfigClient propsActivityRewardConfigClient;
 
-  public ActivityConfigVO getEffectiveActivity(AppExtCommand cmd) {
+  public ActivityConfigVO getEffectiveActivity(AppExtCommand cmd, String templateId) {
     ActivityConfigBackQryCmd query = new ActivityConfigBackQryCmd();
     query.setSysOrigin(cmd.getReqSysOrigin().getOrigin());
+    if (StringUtils.isNotBlank(templateId)) {
+      query.setTemplateId(Long.parseLong(templateId));
+    }
+
     ActivityConfigDTO activityConfigDTO = ResponseAssert.requiredSuccess(sysActivityConfigClient.effectiveActivityConf(query));
 
     if (activityConfigDTO == null) {

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponGrantCmdExe.java

@@ -157,27 +157,15 @@ public class PropCouponGrantCmdExe {
      * 发送单个通知
      */
     private void sendNotification(PropCoupon propCoupon, UserProfileDTO user, PropCouponType couponType) {
-         officialNoticeClient.send(
+        officialNoticeClient.send(
-             NoticeExtTemplateCustomizeCmd.builder()
+            NoticeExtTemplateCustomizeCmd.builder()
-                 .toAccount(user.getId())
+                .toAccount(user.getId())
-                 .noticeType(OfficialNoticeTypeEnum.RECEIVE_PROP_COUPON)
+                .noticeType(OfficialNoticeTypeEnum.RECEIVE_PROP_COUPON)
-                 .content(String.format("You have received a %s ticket", couponType.name()))
+                .content("You have received a Coupon. Please check it.")
-                 .expand(buildNotificationData(propCoupon))
+                .build()
-                 .build()
+        );
-         );
 
-        log.info("发送道具券赠送通知, userId:{}, couponNo:{}, couponType:{}",
+        log.info("发送道具券赠送通知, receiverId:{}, couponNo:{}, couponType:{}",
-                user.getId(), propCoupon.getCouponNo(), couponType.getDesc());
+            user.getId(), propCoupon.getCouponNo(), propCoupon.getCouponType().getDesc());
-    }
-
-    /**
-     * 构建通知数据
-     */
-    private String buildNotificationData(PropCoupon propCoupon) {
-        return String.format("couponNo=%s&couponType=%s&propName=%s&validDays=%d",
-                propCoupon.getCouponNo(),
-                propCoupon.getCouponType().getDesc(),
-                propCoupon.getPropName(),
-                propCoupon.getValidDays());
     }
 }

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponSendCmdExe.java

@@ -1,5 +1,8 @@
 package com.red.circle.other.app.command.propcoupon;
 
+import com.red.circle.external.inner.endpoint.message.OfficialNoticeClient;
+import com.red.circle.external.inner.model.cmd.message.notice.official.NoticeExtTemplateCustomizeCmd;
+import com.red.circle.external.inner.model.enums.message.OfficialNoticeTypeEnum;
 import com.red.circle.framework.core.asserts.ResponseAssert;
 import com.red.circle.other.app.dto.cmd.PropCouponSendCmd;
 import com.red.circle.other.domain.gateway.PropCouponGateway;
@@ -33,6 +36,7 @@ public class PropCouponSendCmdExe {
     private final PropCouponGateway propCouponGateway;
     private final UserProfileClient userProfileClient;
     private final PropCouponUseRecordDAO propCouponUseRecordDAO;
+    private final OfficialNoticeClient officialNoticeClient;
 
     /**
      * 执行赠送道具券
@@ -123,16 +127,14 @@ public class PropCouponSendCmdExe {
      * 发送系统消息通知接收人
      */
     private void sendNotification(PropCoupon propCoupon, UserProfileDTO receiver) {
-        // TODO: 发送系统通知
+         officialNoticeClient.send(
-        // 示例代码（需要根据实际项目调整）:
+             NoticeExtTemplateCustomizeCmd.builder()
-        // officialNoticeClient.send(
+                 .toAccount(receiver.getId())
-        //     NoticeExtTemplateCustomizeCmd.builder()
+                 .noticeType(OfficialNoticeTypeEnum.RECEIVE_PROP_COUPON)
-        //         .toAccount(receiver.getId())
+                 .content("You have received a Coupon. Please check it.")
-        //         .noticeType(OfficialNoticeTypeEnum.RECEIVE_PROP_COUPON)
+                 .expand(buildNotificationData(propCoupon))
-        //         .content("您收到了一张" + propCoupon.getCouponType().getDesc() + "道具券")
+                 .build()
-        //         .expand(buildNotificationData(propCoupon))
+         );
-        //         .build()
-        // );
 
         log.info("发送道具券赠送通知, receiverId:{}, couponNo:{}, couponType:{}",
                 receiver.getId(), propCoupon.getCouponNo(), propCoupon.getCouponType().getDesc());

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

@@ -36,7 +36,7 @@ import java.util.Objects;
  * @author pengliang on 2022/7/26
  */
 @Slf4j
-@Service("DIAMOND_COUNT_LISTENER")
+//@Service("DIAMOND_COUNT_LISTENER")
 @RequiredArgsConstructor
 public class DiamondCountStrategy implements GiftStrategy {
 
@@ -53,6 +53,7 @@ public class DiamondCountStrategy implements GiftStrategy {
     @Override
     public void processor(OfflineProcessGiftEvent event) {
         log.warn("【钻石统计】入参---{}", JSON.toJSONString(event));
+
         GiftGiveRunningWater runningWater = null;
         try {
             runningWater = giftGiveRunningWaterService.getByIdPrimary(event.getRunningWaterId());

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/activity/WeekKingQueenServiceImpl.java

@@ -33,8 +33,8 @@ public class WeekKingQueenServiceImpl implements WeekKingQueenService {
   }
 
   @Override
-  public ActivityConfigVO getEffectiveActivity(AppExtCommand cmd) {
+  public ActivityConfigVO getEffectiveActivity(AppExtCommand cmd, String templateId) {
-    return weekKingQueenActivityExe.getEffectiveActivity(cmd);
+    return weekKingQueenActivityExe.getEffectiveActivity(cmd, templateId);
   }
 
   @Override

rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/activity/WeekKingQueenService.java

@@ -19,7 +19,7 @@ public interface WeekKingQueenService {
 
   PageResult<UserRankCO> listRanking(WeekKingQueenRankingQueryCmd cmd);
 
-  ActivityConfigVO getEffectiveActivity(AppExtCommand cmd);
+  ActivityConfigVO getEffectiveActivity(AppExtCommand cmd, String templateId);
 
   String countDown();
 

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/sys/impl/ActivityConfigServiceImpl.java

@@ -225,7 +225,11 @@ public class ActivityConfigServiceImpl implements ActivityConfigService {
   @Override
   public ActivityConfig getEffectiveActivityConf(ActivityConfigBackQryCmd query) {
     Criteria criteria = Criteria.where("sysOrigin").is(query.getSysOrigin());
+    criteria.and("showcase").is(true);
     criteria.and("endTime").gt(TimestampUtils.now());
+    if (query.getTemplateId() != null) {
+      criteria.and("templateId").is(query.getTemplateId());
+    }
 
     return mongoTemplate.findOne(Query.query(criteria)
             .with(Sort.by(Sort.Order.desc("id")))