Revert "权益规则数据优化"

This reverts commit c36a243163d069362a1e2bc3d1583ed8461bac78.

entity/src/main/java/com/kym/entity/miniapp/UserCoupon.java

@@ -1,6 +1,5 @@
 package com.kym.entity.miniapp;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -51,12 +50,6 @@ public class UserCoupon extends BaseEntity {
      */
     private Long activityId;
 
-    /**
-     * 活动规则描述
-     */
-    @TableField(exist = false)
-    private String activityDesc;
-
     /**
      * 主活动名称
      */

entity/src/main/java/com/kym/entity/miniapp/UserRechargeRights.java

@@ -1,6 +1,5 @@
 package com.kym.entity.miniapp;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;
@@ -39,12 +38,6 @@ public class UserRechargeRights extends BaseEntity {
      */
     private Long activityId;
 
-    /**
-     * 活动规则描述
-     */
-    @TableField(exist = false)
-    private String activityDesc;
-
     /**
      * 用户id
      */

service/src/main/java/com/kym/service/miniapp/impl/AccountServiceImpl.java

@@ -2,16 +2,12 @@ package com.kym.service.miniapp.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.kym.common.utils.CommUtil;
-import com.kym.entity.admin.Activity;
 import com.kym.entity.miniapp.Account;
 import com.kym.entity.miniapp.UserCoupon;
 import com.kym.entity.miniapp.UserRechargeRights;
 import com.kym.entity.miniapp.vo.UserRightsAndCouponsVo;
 import com.kym.mapper.miniapp.AccountMapper;
-import com.kym.service.admin.ActivityService;
 import com.kym.service.miniapp.AccountService;
 import com.kym.service.miniapp.UserCouponService;
 import com.kym.service.miniapp.UserRechargeRightsService;
@@ -19,8 +15,8 @@ import com.kym.service.mybatisplus.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -38,12 +34,9 @@ public class AccountServiceImpl extends MyBaseServiceImpl<AccountMapper, Account
 
     private final UserCouponService userCouponService;
 
-    private final ActivityService activityService;
-
-    public AccountServiceImpl(UserRechargeRightsService userRechargeRightsService, UserCouponService userCouponService, ActivityService activityService) {
+    public AccountServiceImpl(UserRechargeRightsService userRechargeRightsService, UserCouponService userCouponService) {
         this.userRechargeRightsService = userRechargeRightsService;
         this.userCouponService = userCouponService;
-        this.activityService = activityService;
     }
 
     @Override
@@ -58,7 +51,6 @@ public class AccountServiceImpl extends MyBaseServiceImpl<AccountMapper, Account
      */
     @Override
     public UserRightsAndCouponsVo listRightsAndCoupons() {
-        var activityIdList = new ArrayList<>();
         var vo = new UserRightsAndCouponsVo();
         var userId = StpUtil.getLoginIdAsLong();
         vo.setUserId(userId);
@@ -69,7 +61,7 @@ public class AccountServiceImpl extends MyBaseServiceImpl<AccountMapper, Account
                 .orderByDesc(UserRechargeRights::getStatus)
                 .orderByAsc(UserRechargeRights::getEndTime)
                 .list();
-        activityIdList.addAll(userRechargeRight.stream().map(UserRechargeRights::getActivityId).toList());
+        vo.setUserRechargeRightsList(userRechargeRight);
 
         // 当前用户的优惠券列表（含已失效）
         var usesrCouponList = userCouponService.lambdaQuery()
@@ -78,22 +70,8 @@ public class AccountServiceImpl extends MyBaseServiceImpl<AccountMapper, Account
                 .orderByAsc(UserCoupon::getUsageStatus)
                 .orderByAsc(UserCoupon::getEndTime)
                 .list();
-        activityIdList.addAll(usesrCouponList.stream().map(UserCoupon::getActivityId).toList());
-
-        // 手动切换数据源
-        if(CommUtil.isNotEmptyAndNull(activityIdList)){
-            DynamicDataSourceContextHolder.push("db-admin");
-            var res= activityService.lambdaQuery().in(Activity::getId, activityIdList).list()
-                    .stream()
-                    .filter(item -> item.getActivityDesc() != null)
-                    .collect(Collectors.toMap(Activity::getId, Activity::getActivityDesc));
-            DynamicDataSourceContextHolder.poll();
-
-            userRechargeRight.forEach(userRechargeRights -> userRechargeRights.setActivityDesc(res.get(userRechargeRights.getActivityId())));
-            usesrCouponList.forEach(userCoupon -> userCoupon.setActivityDesc(res.get(userCoupon.getActivityId())));
-            vo.setUserRechargeRightsList(userRechargeRight);
-            vo.setUserCouponList(usesrCouponList);
-        }
+        vo.setUserCouponList(usesrCouponList);
+
         return vo;
     }