[add] 评论管理

yiqi-admin/src/main/java/com/yiqi/admin/controller/core/GoodsCommentController.java

@@ -52,13 +52,13 @@ public class GoodsCommentController extends BaseController {
      * 查询商品评论列表
      */
     @PreAuthorize("@ss.hasPermi('goods:goodsComment:list')")
-    @PostMapping("/list")
+    @GetMapping("/list")
     @ApiOperation(value = "查询商品评论列表")
-    public R<Page<GoodsCommentQueryVO>> list(@RequestBody GoodsCommentQueryDTO goodsCommentQueryDTO) {
+    public R<Page<GoodsCommentQueryVO>> list(GoodsCommentQueryDTO goodsCommentQueryDTO) {
         Page<GoodsCommentQueryVO> page = new Page<>();
         List<GoodsCommentQueryVO> goodsCommentList = goodsCommentService.selectGoodsCommentList(goodsCommentQueryDTO);
         if (CollUtil.isEmpty(goodsCommentList)){
-            return R.ok(page);
+            return R.page(page);
         }
         Integer count = goodsCommentService.countNumberByGoodsCommentList(goodsCommentQueryDTO);
 
@@ -68,14 +68,14 @@ public class GoodsCommentController extends BaseController {
         if (CollUtil.isEmpty(map)){
             page.setRecords(goodsCommentList);
             page.setTotal(count);
-            return R.ok(page);
+            return R.page(page);
         }
         for (GoodsCommentQueryVO vo : goodsCommentList) {
             vo.setSkuList(map.get(vo.getId()));
         }
         page.setRecords(goodsCommentList);
         page.setTotal(count);
-        return R.ok(page);
+        return R.page(page);
     }
 
     /**

yiqi-admin/src/main/java/com/yiqi/admin/controller/core/GoodsCommentReplyController.java

@@ -98,6 +98,6 @@ public class GoodsCommentReplyController extends BaseController {
             }
         }
         voPage.setRecords(queryVOList);
-        return R.ok(voPage);
+        return R.page(voPage);
     }
 }

yiqi-admin/src/main/java/com/yiqi/admin/controller/core/GoodsInfoController.java

@@ -1,5 +1,6 @@
 package com.yiqi.admin.controller.core;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiqi.common.annotation.Log;
@@ -182,6 +183,9 @@ public class GoodsInfoController extends BaseController {
                 .eq(GoodsSku::getGoodsId, goodsSkuQueryByCommentDTO.getGoodsId())
                 .eq(GoodsSku::getDelFlag, DeleteStatus.OK.getCode())
                 .eq(GoodsSku::getStatus, DeleteStatus.OK.getCode())).stream().map(GoodsSku::getId).collect(Collectors.toSet());
+        if (CollUtil.isEmpty(skuIdList)) {
+            skuIdList.add(0L);
+        }
         Map<Long, List<GoodsSkuSpec>> listMap = goodsSkuSpecService.list(new QueryWrapper<GoodsSkuSpec>().lambda()
                 .in(GoodsSkuSpec::getGoodsSkuId, skuIdList)
                 .eq(GoodsSkuSpec::getDelFlag, DeleteStatus.OK.getCode())).stream().collect(Collectors.groupingBy(GoodsSkuSpec::getGoodsSkuId));

yiqi-core/src/main/resources/mapper/core/GoodsCommentMapper.xml

@@ -83,7 +83,7 @@
         left join app_user b on a.user_id = b.id
         left join  app_user_address c on b.id = c.app_user_id
         <where>
-            and a.del_flag='0'
+            and a.del_flag='0' and a.goods_type = #{goodsType}
             <if test="orderId != null ">
                 and a.order_id = #{orderId}
             </if>