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

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreStaffReviewDetailVo.java

@@ -25,5 +25,30 @@ public class StoreStaffReviewDetailVo {
 
     @ApiModelProperty(value = "人员信息")
     private StoreStaffConfig staffInfo;
+
+    @ApiModelProperty(value = "店铺信息")
+    private StoreInfoForStaffReviewVo storeInfo;
+    
+    /**
+     * 店铺信息VO（用于员工评价详情）
+     */
+    @Data
+    @ApiModel(value = "StoreInfoForStaffReviewVo对象", description = "店铺信息VO（用于员工评价详情）")
+    public static class StoreInfoForStaffReviewVo {
+        @ApiModelProperty(value = "店铺ID")
+        private Integer storeId;
+        
+        @ApiModelProperty(value = "店铺名称")
+        private String storeName;
+        
+        @ApiModelProperty(value = "店铺头像（来自store_user表的head_img字段）")
+        private String headImg;
+        
+        @ApiModelProperty(value = "店铺评分（平均评分）")
+        private Double score;
+        
+        @ApiModelProperty(value = "到商铺的距离（单位：千米，如果未提供用户位置则为null）")
+        private Double distance;
+    }
 }
 

alien-store/src/main/java/shop/alien/store/controller/StoreBannerController.java

@@ -39,7 +39,7 @@ public class StoreBannerController {
 
     @ApiOperation("删除Banner")
     @ApiOperationSupport(order = 2)
-    @PostMapping("/delete")
+    @GetMapping("/delete")
     public R<String> delete(@RequestParam("id") Integer id) {
         log.info("StoreBannerController.delete?id={}", id);
         return storeBannerService.removeById(id) ? R.success("删除成功") : R.fail("删除失败");

alien-store/src/main/java/shop/alien/store/controller/StoreClockInController.java

@@ -7,9 +7,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.StoreClockIn;
+import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.entity.store.vo.StoreClockInVo;
 import shop.alien.store.annotation.TrackEvent;
 import shop.alien.store.service.StoreClockInService;
+import shop.alien.util.common.TokenInfo;
+import springfox.documentation.annotations.ApiIgnore;
 
 @Slf4j
 @Api(tags = {"店铺打卡"})
@@ -88,9 +91,10 @@ public class StoreClockInController {
     @ApiOperationSupport(order = 6)
     @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "主键id", dataType = "Integer", paramType = "query")})
     @GetMapping("/getStoreClockInById")
-    public R<StoreClockInVo> getStoreClockInById(Integer id) {
-        log.info("StoreClockInController.getStoreClockInById?id={}", id);
-        return R.data(storeClockInService.getStoreClockInById(id));
+    public R<StoreClockInVo> getStoreClockInById(@ApiIgnore @TokenInfo UserLoginInfo userLoginInfo, Integer id) {
+        Integer userId = userLoginInfo != null ? userLoginInfo.getUserId() : null;
+        log.info("StoreClockInController.getStoreClockInById?userId={},id={}", userId, id);
+        return R.data(storeClockInService.getStoreClockInById(id, userId));
     }
 
 }

alien-store/src/main/java/shop/alien/store/controller/StoreStaffReviewController.java

@@ -57,17 +57,21 @@ public class StoreStaffReviewController {
     @ApiOperationSupport(order = 2)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "reviewId", value = "评价ID", dataTypeClass = Integer.class, paramType = "query", required = true),
-            @ApiImplicitParam(name = "currentUserId", value = "当前用户ID（用于判断是否已点赞）", dataTypeClass = Integer.class, paramType = "query", required = false)
+            @ApiImplicitParam(name = "currentUserId", value = "当前用户ID（用于判断是否已点赞）", dataTypeClass = Integer.class, paramType = "query", required = false),
+            @ApiImplicitParam(name = "longitude", value = "用户经度（用于计算距离，可选）", dataTypeClass = Double.class, paramType = "query", required = false),
+            @ApiImplicitParam(name = "latitude", value = "用户纬度（用于计算距离，可选）", dataTypeClass = Double.class, paramType = "query", required = false)
     })
     @GetMapping("/detail/reviewId")
     public R<StoreStaffReviewDetailVo> getReviewDetail(
             @RequestParam Integer reviewId,
-            @RequestParam(required = false) Integer currentUserId) {
-        log.info("获取评价详情, reviewId={}, currentUserId={}", reviewId, currentUserId);
+            @RequestParam(required = false) Integer currentUserId,
+            @RequestParam(required = false) Double longitude,
+            @RequestParam(required = false) Double latitude) {
+        log.info("获取评价详情, reviewId={}, currentUserId={}, longitude={}, latitude={}", reviewId, currentUserId, longitude, latitude);
         if (reviewId == null) {
             return R.fail("评价ID不能为空");
         }
-        return storeStaffReviewService.getReviewDetail(reviewId, currentUserId);
+        return storeStaffReviewService.getReviewDetail(reviewId, currentUserId, longitude, latitude);
     }
 
     @ApiOperation("点赞评价")

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

@@ -40,7 +40,8 @@ public interface StoreClockInService extends IService<StoreClockIn> {
      * 根据id查询打卡记录
      *
      * @param id 主键id
+     * @param userId 当前登录用户ID（用于查询收藏状态）
      * @return 打卡记录
      */
-    StoreClockInVo getStoreClockInById(Integer id);
+    StoreClockInVo getStoreClockInById(Integer id, Integer userId);
 }

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

@@ -31,9 +31,11 @@ public interface StoreStaffReviewService extends IService<StoreStaffReview> {
      *
      * @param reviewId 评价ID
      * @param currentUserId 当前用户ID（用于判断是否已点赞，可为null）
+     * @param longitude 用户经度（用于计算距离，可为null）
+     * @param latitude 用户纬度（用于计算距离，可为null）
      * @return R<StoreStaffReviewDetailVo>
      */
-    R<StoreStaffReviewDetailVo> getReviewDetail(Integer reviewId, Integer currentUserId);
+    R<StoreStaffReviewDetailVo> getReviewDetail(Integer reviewId, Integer currentUserId, Double longitude, Double latitude);
 
     /**
      * 点赞评价

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

@@ -24,9 +24,37 @@ import shop.alien.store.service.StoreBannerService;
 @Service
 public class StoreBannerServiceImpl extends ServiceImpl<StoreBannerMapper, StoreBanner> implements StoreBannerService {
 
+//    @Transactional
+//    @Override
+//    public R<String> saveBanner(StoreBannerDto storeBannerDto) {
+//        StoreBanner storeBanner = new StoreBanner();
+//        BeanUtils.copyProperties(storeBannerDto, storeBanner);
+//        boolean update = storeBanner.getId() != null;
+//        boolean result = this.saveOrUpdate(storeBanner);
+//        if (result) {
+//            return R.success(update ? "修改成功" : "新增成功");
+//        }
+//        return R.fail(update ? "修改失败" : "新增失败");
+//    }
+
+
     @Transactional
     @Override
     public R<String> saveBanner(StoreBannerDto storeBannerDto) {
+        // 先检查 moduleName 是否已存在
+        LambdaQueryWrapper<StoreBanner> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StoreBanner::getModuleName, storeBannerDto.getModuleName());
+
+        // 如果是更新操作，需要排除当前记录本身
+        if (storeBannerDto.getId() != null) {
+            queryWrapper.ne(StoreBanner::getId, storeBannerDto.getId());
+        }
+
+        long count = this.count(queryWrapper);
+        if (count > 0) {
+            return R.fail("该模块名称已存在，不能重复添加或修改");
+        }
+
         StoreBanner storeBanner = new StoreBanner();
         BeanUtils.copyProperties(storeBannerDto, storeBanner);
         boolean update = storeBanner.getId() != null;

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

@@ -429,7 +429,7 @@ public class StoreClockInServiceImpl extends ServiceImpl<StoreClockInMapper, Sto
     }
 
     @Override
-    public StoreClockInVo getStoreClockInById(Integer id) {
+    public StoreClockInVo getStoreClockInById(Integer id, Integer userId) {
         StoreClockIn storeClockIn = storeClockInMapper.selectById(id);
         StoreClockInVo storeClockInVo = BeanUtil.copyProperties(storeClockIn, StoreClockInVo.class);
         if (null == storeClockIn) {
@@ -458,15 +458,16 @@ public class StoreClockInServiceImpl extends ServiceImpl<StoreClockInMapper, Sto
         storeClockInVo.setBusinessClassifyName(storeInfo.getBusinessClassifyName());
         // 地址
         storeClockInVo.setStoreAddress(storeInfo.getStoreAddress());
-        // 是否收藏
-        // 查询我的收藏
-        LambdaQueryWrapper<LifeCollect> collectWrapper = new LambdaQueryWrapper<>();
-        collectWrapper.eq(LifeCollect::getUserId, String.valueOf(storeClockInVo.getUserId()));
-        List<LifeCollect> lifeCollectList = lifeCollectMapper.selectList(collectWrapper);
-        List<String> collectList = lifeCollectList.stream().map(LifeCollect::getStoreId).collect(Collectors.toList());
+        // 是否收藏 - 使用当前登录用户的ID查询收藏
         storeClockInVo.setIsCollect("0");
-        if (collectList.contains(storeClockInVo.getStoreId().toString())){
-            storeClockInVo.setIsCollect("1");
+        if (userId != null) {
+            LambdaQueryWrapper<LifeCollect> collectWrapper = new LambdaQueryWrapper<>();
+            collectWrapper.eq(LifeCollect::getUserId, String.valueOf(userId));
+            List<LifeCollect> lifeCollectList = lifeCollectMapper.selectList(collectWrapper);
+            List<String> collectList = lifeCollectList.stream().map(LifeCollect::getStoreId).collect(Collectors.toList());
+            if (collectList.contains(storeClockInVo.getStoreId().toString())){
+                storeClockInVo.setIsCollect("1");
+            }
         }
         return storeClockInVo;
     }

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

@@ -18,13 +18,16 @@ import shop.alien.entity.store.*;
 import shop.alien.entity.store.dto.StoreStaffReviewDto;
 import shop.alien.entity.store.vo.*;
 import shop.alien.mapper.LifeLikeRecordMapper;
+import shop.alien.mapper.StoreInfoMapper;
 import shop.alien.mapper.StoreStaffCommentMapper;
 import shop.alien.mapper.StoreStaffConfigMapper;
 import shop.alien.mapper.StoreStaffReviewMapper;
+import shop.alien.mapper.StoreUserMapper;
 import shop.alien.store.service.StoreStaffCommentService;
 import shop.alien.store.service.StoreStaffReviewService;
 import shop.alien.store.util.ai.AiContentModerationUtil;
 import shop.alien.store.util.ai.AiVideoModerationUtil;
+import shop.alien.util.common.DistanceUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -51,6 +54,8 @@ public class StoreStaffReviewServiceImpl extends ServiceImpl<StoreStaffReviewMap
     private final StoreStaffCommentMapper storeStaffCommentMapper;
     private final LifeLikeRecordMapper lifeLikeRecordMapper;
     private final StoreStaffConfigMapper storeStaffConfigMapper;
+    private final StoreInfoMapper storeInfoMapper;
+    private final StoreUserMapper storeUserMapper;
     private final AiContentModerationUtil aiContentModerationUtil;
     @Qualifier("commonVideoTaskExecutor")
     private final ExecutorService commonVideoTaskExecutor;
@@ -154,8 +159,8 @@ public class StoreStaffReviewServiceImpl extends ServiceImpl<StoreStaffReviewMap
     }
 
     @Override
-    public R<StoreStaffReviewDetailVo> getReviewDetail(Integer reviewId, Integer currentUserId) {
-        log.info("获取评价详情, reviewId={}, currentUserId={}", reviewId, currentUserId);
+    public R<StoreStaffReviewDetailVo> getReviewDetail(Integer reviewId, Integer currentUserId, Double longitude, Double latitude) {
+        log.info("获取评价详情, reviewId={}, currentUserId={}, longitude={}, latitude={}", reviewId, currentUserId, longitude, latitude);
 
         if (reviewId == null) {
             return R.fail("评价ID不能为空");
@@ -183,19 +188,79 @@ public class StoreStaffReviewServiceImpl extends ServiceImpl<StoreStaffReviewMap
 
         // 查询人员信息
         StoreStaffConfig staffInfo = null;
+        Integer storeId = null;
         if (reviewVo.getStaffUserId() != null) {
             try {
                 staffInfo = storeStaffConfigMapper.selectById(reviewVo.getStaffUserId());
+                if (staffInfo != null) {
+                    storeId = staffInfo.getStoreId();
+                }
             } catch (Exception e) {
                 log.warn("查询人员信息失败, staffUserId={}, error={}", reviewVo.getStaffUserId(), e.getMessage());
             }
         }
 
+        // 查询店铺信息（包括店铺头像、评分和距离）
+        StoreStaffReviewDetailVo.StoreInfoForStaffReviewVo storeInfoVo = null;
+        if (storeId != null) {
+            try {
+                // 查询店铺基本信息
+                StoreInfo storeInfo = storeInfoMapper.selectById(storeId);
+                if (storeInfo != null) {
+                    storeInfoVo = new StoreStaffReviewDetailVo.StoreInfoForStaffReviewVo();
+                    storeInfoVo.setStoreId(storeId);
+                    storeInfoVo.setStoreName(storeInfo.getStoreName());
+                    
+                    // 设置店铺评分（平均评分）
+                    if (storeInfo.getScoreAvg() != null) {
+                        storeInfoVo.setScore(storeInfo.getScoreAvg());
+                    } else {
+                        storeInfoVo.setScore(null);
+                    }
+                    
+                    // 查询店铺头像（来自store_user表的head_img字段）
+                    LambdaQueryWrapper<StoreUser> userWrapper = new LambdaQueryWrapper<>();
+                    userWrapper.eq(StoreUser::getStoreId, storeId)
+                              .eq(StoreUser::getDeleteFlag, 0);
+                    StoreUser storeUser = storeUserMapper.selectOne(userWrapper);
+                    if (storeUser != null && storeUser.getHeadImg() != null && !storeUser.getHeadImg().trim().isEmpty()) {
+                        storeInfoVo.setHeadImg(storeUser.getHeadImg());
+                    } else {
+                        storeInfoVo.setHeadImg(null);
+                    }
+                    
+                    // 计算距离（如果提供了用户经纬度）
+                    if (longitude != null && latitude != null && storeInfo.getStorePosition() != null && !storeInfo.getStorePosition().trim().isEmpty()) {
+                        try {
+                            String[] positionArray = storeInfo.getStorePosition().split(",");
+                            if (positionArray.length >= 2) {
+                                double storeLon = Double.parseDouble(positionArray[0].trim());
+                                double storeLat = Double.parseDouble(positionArray[1].trim());
+                                // 计算距离（单位：公里）
+                                double distanceKm = DistanceUtil.haversineCalculateDistance(longitude, latitude, storeLon, storeLat);
+                                storeInfoVo.setDistance(distanceKm);
+                            } else {
+                                storeInfoVo.setDistance(null);
+                            }
+                        } catch (Exception e) {
+                            log.warn("计算店铺距离失败, storeId={}, error={}", storeId, e.getMessage());
+                            storeInfoVo.setDistance(null);
+                        }
+                    } else {
+                        storeInfoVo.setDistance(null);
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("查询店铺信息失败, storeId={}, error={}", storeId, e.getMessage());
+            }
+        }
+
         // 构建返回结果
         StoreStaffReviewDetailVo detailVo = new StoreStaffReviewDetailVo();
         detailVo.setReview(reviewVo);
         detailVo.setCommentList(comments != null ? comments : new ArrayList<>());
         detailVo.setStaffInfo(staffInfo);
+        detailVo.setStoreInfo(storeInfoVo);
 
         return R.data(detailVo);
     }