Merge remote-tracking branch 'origin/sit' into uat-20260202

alien-job/src/main/java/shop/alien/job/store/AlipayJob.java

@@ -20,6 +20,7 @@ import shop.alien.entity.store.LawyerUser;
 import shop.alien.entity.store.StoreInfo;
 import shop.alien.mapper.AlipayZftCreateRecordMapper;
 import shop.alien.mapper.LawyerUserMapper;
+import shop.alien.mapper.StoreInfoMapper;
 import shop.alien.store.service.StoreInfoService;
 
 import java.util.List;
@@ -36,7 +37,7 @@ public class AlipayJob {
 
     private final AlipayZftCreateRecordMapper alipayZftCreateRecordMapper;
 
-    private final StoreInfoService storeInfoService;
+    private final StoreInfoMapper storeInfoMapper;
 
     private final LawyerUserMapper lawyerUserMapper;
 
@@ -92,7 +93,7 @@ public class AlipayJob {
                     continue;
                 }
 
-                StoreInfo storeInfo = storeInfoService.getById(storeId);
+                StoreInfo storeInfo = storeInfoMapper.getStoreInfo(storeId);
                 if (storeInfo == null) {
                     log.warn("门店不存在 storeId={} orderId={}", storeId, orderId);
                     continue;
@@ -103,7 +104,7 @@ public class AlipayJob {
                 }
 
                 storeInfo.setAlipaySmid(smid);
-                storeInfoService.updateById(storeInfo);
+                storeInfoMapper.updateById(storeInfo);
                 log.info("已回写门店 alipay_smid storeId={} orderId={}", storeId, orderId);
             }
         }

alien-store/src/main/java/shop/alien/store/service/LifeCommentService.java

@@ -235,7 +235,7 @@ public class LifeCommentService {
                 return commonRatingMapper.update(null, new UpdateWrapper<CommonRating>()
                         .setSql("like_count = like_count + 1")
                         .eq("id", huifuId));
-            } else if (CommonConstant.COMMENT_LIKE.equals(type) || CommonConstant.DYNAMIC_LIKE.equals(type) || CommonConstant.CLOCK_IN_LIKE.equals(type) || CommonConstant.SECOND_HAND_LIKE.equals(type)) {
+            } else if (CommonConstant.COMMENT_LIKE.equals(type) || CommonConstant.DYNAMIC_LIKE.equals(type) || CommonConstant.CLOCK_IN_LIKE.equals(type) || CommonConstant.SECOND_HAND_LIKE.equals(type) || CommonConstant.STORE_DYNAMIC_LIKE.equals(type)) {
                 // 12-评论点赞：更新评论表点赞数
                 return commonCommentMapper.update(null, new UpdateWrapper<CommonComment>()
                         .setSql("like_count = like_count + 1")
@@ -491,7 +491,7 @@ public class LifeCommentService {
                 return commonRatingMapper.update(null, new UpdateWrapper<CommonRating>()
                         .setSql("like_count = like_count - 1")
                         .eq("id", huifuId));
-            } else if (CommonConstant.COMMENT_LIKE.equals(type) || CommonConstant.DYNAMIC_LIKE.equals(type) || CommonConstant.CLOCK_IN_LIKE.equals(type) || CommonConstant.SECOND_HAND_LIKE.equals(type)) {
+            } else if (CommonConstant.COMMENT_LIKE.equals(type) || CommonConstant.DYNAMIC_LIKE.equals(type) || CommonConstant.CLOCK_IN_LIKE.equals(type) || CommonConstant.SECOND_HAND_LIKE.equals(type) || CommonConstant.STORE_DYNAMIC_LIKE.equals(type)) {
                 // 12-评论点赞：更新评论表点赞数
                 return commonCommentMapper.update(null, new UpdateWrapper<CommonComment>()
                         .setSql("like_count = like_count - 1")

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

@@ -90,6 +90,8 @@ public class CommonCommentServiceImpl extends ServiceImpl<CommonCommentMapper, C
             likeType = CommonConstant.CLOCK_IN_LIKE;
         } else if (sourceType == CommentSourceTypeEnum.SECOND_HAND_COMMENT.getType()){
             likeType =  CommonConstant.SECOND_HAND_LIKE;
+        } else if (sourceType == CommentSourceTypeEnum.STORE_DYNAMIC_COMMENT.getType()){
+            likeType = CommonConstant.STORE_DYNAMIC_LIKE;
         }
         List<CommonCommentVo> firstLevelComment = getFirstLevelComment(sourceType, sourceId, pageNum, pageSize, userId,likeType);
         CommonRatingVo commonRatingVo = new CommonRatingVo();

alien-store/src/main/java/shop/alien/store/util/CommonConstant.java

@@ -114,6 +114,7 @@ public class CommonConstant {
     public static final String DYNAMIC_LIKE = "13";
     public static final String CLOCK_IN_LIKE = "14";
     public static final String SECOND_HAND_LIKE = "15";
+    public static final String STORE_DYNAMIC_LIKE = "16";
 
 
     /**

alien-util/src/main/java/shop/alien/util/common/constant/CommentSourceTypeEnum.java

@@ -5,7 +5,8 @@ public enum CommentSourceTypeEnum {
     STORE_COMMENT(1, "店铺评价"),
     DYNAMIC_COMMENT(2, "动态评论"),
     CLOCK_IN_COMMENT(3, "打卡评论"),
-    SECOND_HAND_COMMENT(4, "二手商品评论");
+    SECOND_HAND_COMMENT(4, "二手商品评论"),
+    STORE_DYNAMIC_COMMENT(5, "商家动态评论");
     private final Integer type;
     private final String info;