bugfix:2709评价查看详情

alien-entity/src/main/java/shop/alien/entity/second/vo/SecondUserViolationDetailVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import shop.alien.entity.store.CommonComment;
 import shop.alien.entity.store.LifeUserDynamics;
 import shop.alien.entity.store.StoreComment;
 
@@ -42,4 +43,8 @@ public class SecondUserViolationDetailVo extends SecondUserViolationVo{
     @ApiModelProperty(value = "评论信息")
     StoreComment commentInfo;
 
+    // 评论信息
+    @ApiModelProperty(value = "评论信息")
+    CommonComment commonCommentInfo;
+
 }

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

@@ -86,11 +86,11 @@ public class LifeCollectController {
             QueryWrapper<StoreInfoVo> queryWrapper = new QueryWrapper<>();
             queryWrapper.in("a.id", ids).eq("a.delete_flag", 0);
             // 查询店铺团购信息
-            LambdaUpdateWrapper<LifeCoupon> quanWrapper = new LambdaUpdateWrapper<>();
+/*            LambdaUpdateWrapper<LifeCoupon> quanWrapper = new LambdaUpdateWrapper<>();
             quanWrapper.in(LifeCoupon::getStoreId, ids)
                     .eq(LifeCoupon::getStatus, 1)
                     .orderByDesc(LifeCoupon::getCreatedTime);
-            List<LifeCoupon> quanList = lifeCouponMapper.selectList(quanWrapper);
+            List<LifeCoupon> quanList = lifeCouponMapper.selectList(quanWrapper);*/
             // 八大类分类
             if (!StringUtils.isEmpty(businessSection)) {
                 queryWrapper.eq("a.business_section", businessSection);
@@ -108,7 +108,7 @@ public class LifeCollectController {
                     if (a.getStoreId().equals(b.getId().toString())) {
                         // 团购券设置
                         List<Map<String, Object>> quanMapList = new ArrayList<>();
-                        if (!quanList.isEmpty()) {
+                        /*if (!quanList.isEmpty()) {
                             for (LifeCoupon quan : quanList) {
                                 if (b.getId().toString().equals(quan.getStoreId())) {
                                     Map<String, Object> quanMap = new HashMap<>();
@@ -121,7 +121,7 @@ public class LifeCollectController {
                                     quanMapList.add(quanMap);
                                 }
                             }
-                        }
+                        }*/
                         b.setQuanList(quanMapList);
                         // 得分,人均
                         b.setAvgScore("0");

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

@@ -1,22 +1,18 @@
 package shop.alien.store.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.second.vo.SecondUserViolationDetailVo;
-import shop.alien.entity.store.LifeNotice;
 import shop.alien.entity.store.LifeUserViolation;
 import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.entity.store.dto.LifeUserViolationDto;
 import shop.alien.mapper.LifeNoticeMapper;
 import shop.alien.store.annotation.TrackEvent;
 import shop.alien.store.service.LifeUserViolationService;
-import shop.alien.util.common.JwtUtil;
 import shop.alien.util.common.TokenInfo;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -177,11 +173,13 @@ public class UserViolationController {
     @ApiOperationSupport(order = 9)
     @GetMapping("/queryViolationDetail")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query")
+            @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "reportContextType", value = "举报类型", dataType = "String", paramType = "query"),
     })
     public R<SecondUserViolationDetailVo> queryViolationDetail(
-            @RequestParam(value = "id", required = false) Integer id) {
-        log.info("UserViolationController.queryViolationDetail?id={}", id);
-        return R.data(lifeUserViolationService.queryViolationDetail(id));
+            @RequestParam(value = "id", required = false) Integer id,
+            @RequestParam(value = "reportContextType", required = false) String reportContextType) {
+        log.info("UserViolationController.queryViolationDetail?id={}&reportContextType={}", id, reportContextType);
+        return R.data(lifeUserViolationService.queryViolationDetail(id, reportContextType));
     }
 }

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

@@ -40,5 +40,5 @@ public interface LifeUserViolationService extends IService<LifeUserViolation> {
 
     String level(UserLoginInfo userLoginInfo);
 
-    SecondUserViolationDetailVo queryViolationDetail(Integer id);
+    SecondUserViolationDetailVo queryViolationDetail(Integer id, String reportContextType);
 }

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

@@ -86,6 +86,7 @@ public class LifeUserViolationServiceImpl extends ServiceImpl<LifeUserViolationM
     private final StoreImgService storeImgService;
 
     private final AiUserViolationUtils aiUserViolationUtils;
+    private final CommonCommentMapper commonCommentMapper;
 
     @Autowired
     private SecondUserViolationMapper mapper;
@@ -760,7 +761,7 @@ public class LifeUserViolationServiceImpl extends ServiceImpl<LifeUserViolationM
 
 
     @Override
-    public SecondUserViolationDetailVo queryViolationDetail(Integer id) {
+    public SecondUserViolationDetailVo queryViolationDetail(Integer id, String reportContextType) {
         // 查询举报信息
         SecondUserViolationDetailVo item = mapper.getUserViolationDetailInfo(id);
 
@@ -782,10 +783,13 @@ public class LifeUserViolationServiceImpl extends ServiceImpl<LifeUserViolationM
 
         if ("3".equals(item.getReportContextType())) {
             // TODO: 处理评论类型
-            StoreComment commentInfo = storeCommentMapper.selectById(item.getBusinessId());
-            item.setCommentInfo(commentInfo);
+            CommonComment commonComment = commonCommentMapper.selectById(item.getBusinessId());
+            item.setCommonCommentInfo(commonComment);
 
-            LifeUserDynamics dynamicsInfo = lifeUserDynamicsMapper.selectById(commentInfo.getBusinessId());
+//            StoreComment commentInfo = storeCommentMapper.selectById(item.getBusinessId());
+//            item.setCommentInfo(commentInfo);
+
+            LifeUserDynamics dynamicsInfo = lifeUserDynamicsMapper.selectById(commonComment.getSourceId());
             item.setDynamicsInfo(dynamicsInfo);
             // 将逗号分隔的图片路径拆分成 List<String>
             if (dynamicsInfo != null && StringUtils.isNotEmpty(dynamicsInfo.getImagePath())) {