浏览代码

补充提交

lutong 10 小时之前
父节点
当前提交
4bfd7a3f60

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeStoreService.java

@@ -428,7 +428,7 @@ public class LifeStoreService {
         List<LifeFans> userFans = lifeFansMapper.selectList(wrapperFans);
         if (!CollectionUtils.isEmpty(userFans)) {
             List<Integer> storeUserIds = userFans.stream().map(LifeFans::getFansRefId).filter(Objects::nonNull).collect(Collectors.toList());
-            List<StoreUser> fanStoreUsers = storeUserService.listByIds(storeUserIds);
+            List<StoreUser> fanStoreUsers = new ArrayList<>(storeUserService.listByIds(storeUserIds));
             List<Integer> storeInfoIds = fanStoreUsers.stream().map(StoreUser::getStoreId).filter(Objects::nonNull).collect(Collectors.toList());
             if (CollectionUtils.isEmpty(storeInfoIds)) {
                 return null;

+ 2 - 1
alien-store/src/main/java/shop/alien/store/service/impl/CommonCommentServiceImpl.java

@@ -21,9 +21,10 @@ import shop.alien.store.util.LifeDynamicsIdentityHelper;
 import shop.alien.store.util.StoreLikeRecordIdentityHelper;
 import shop.alien.store.util.StoreLikeRecordIdentityHelper.StoreLikerScope;
 import shop.alien.store.util.ai.AiContentModerationUtil;
+import shop.alien.util.common.constant.CommentSourceTypeEnum;
+import shop.alien.util.common.safe.TextModerationUtil;
 import shop.alien.util.type.LifeFansIdentityQuery;
 import shop.alien.util.type.TypeUtil;
-import shop.alien.util.common.safe.TextModerationUtil;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;

+ 8 - 12
alien-store/src/main/java/shop/alien/store/service/impl/CommonRatingServiceImpl.java

@@ -20,35 +20,31 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.*;
-import shop.alien.entity.store.vo.CommonCommentVo;
-import shop.alien.entity.store.vo.CommonRatingVo;
-import shop.alien.entity.store.vo.MyMergedReviewItemVo;
-import shop.alien.entity.store.vo.OrderReviewVo;
-import shop.alien.entity.store.vo.StoreInfoScoreVo;
-import shop.alien.entity.store.vo.WebSocketVo;
+import shop.alien.entity.store.vo.*;
 import shop.alien.entity.storePlatform.StoreOperationalActivity;
 import shop.alien.mapper.*;
 import shop.alien.mapper.storePlantform.StoreOperationalActivityMapper;
-import shop.alien.util.common.Constants;
 import shop.alien.store.config.WebSocketProcess;
 import shop.alien.store.service.CommonCommentService;
 import shop.alien.store.service.CommonRatingService;
-import shop.alien.store.service.OrderReviewService;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
+import shop.alien.store.service.OrderReviewService;
 import shop.alien.store.util.CommonConstant;
+import shop.alien.store.util.StoreLikeRecordIdentityHelper;
+import shop.alien.store.util.StoreLikeRecordIdentityHelper.StoreLikerScope;
 import shop.alien.store.util.ai.AiContentModerationUtil;
 import shop.alien.store.util.ai.AiVideoModerationUtil;
 import shop.alien.store.util.ai.ReceiptAuditUtil;
+import shop.alien.util.common.Constants;
 import shop.alien.util.common.DateUtils;
 import shop.alien.util.common.constant.CommentSourceTypeEnum;
 import shop.alien.util.common.constant.RatingBusinessTypeEnum;
-import shop.alien.util.type.LifeFansIdentityQuery;
-import shop.alien.util.type.TypeUtil;
+import shop.alien.util.common.safe.TextModerationUtil;
 import shop.alien.util.common.safe.TextReviewServiceEnum;
 import shop.alien.util.type.LifeCollectIdentityQuery;
+import shop.alien.util.type.LifeFansIdentityQuery;
 import shop.alien.util.type.LifeNoticeUtil;
-import shop.alien.store.util.StoreLikeRecordIdentityHelper;
-import shop.alien.store.util.StoreLikeRecordIdentityHelper.StoreLikerScope;
+import shop.alien.util.type.TypeUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

+ 1 - 2
alien-store/src/main/java/shop/alien/store/service/impl/TrackEventServiceImpl.java

@@ -8,11 +8,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import shop.alien.entity.store.*;
-import shop.alien.entity.store.StoreTrackEvent;
-import shop.alien.entity.store.StoreTrackStatistics;
 import shop.alien.mapper.*;
 import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.service.TrackEventService;
+import shop.alien.store.util.LifeDynamicsIdentityHelper;
 import shop.alien.util.type.LifeFansIdentityQuery;
 import shop.alien.util.type.TypeUtil;