From cc134fa83edea4865b48d7afc1acda5ad70e7465 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 11:20:05 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java |  163 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 156 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
index 0f3f1b2..078c824 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
@@ -1,21 +1,30 @@
 package com.ruoyi.other.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.account.api.feignClient.AppUserClient;
 import com.ruoyi.account.api.model.AppUser;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.other.api.domain.Goods;
 import com.ruoyi.other.api.domain.GoodsEvaluate;
 import com.ruoyi.other.service.GoodsEvaluateService;
+import com.ruoyi.other.service.GoodsService;
+import com.ruoyi.other.vo.GoodsEvaluateVO;
+import com.ruoyi.system.api.model.LoginUser;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.models.auth.In;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -27,23 +36,163 @@
  */
 @RestController
 @RequestMapping("/goods-evaluate")
+@Api("评论")
 public class GoodsEvaluateController {
     @Resource
     private GoodsEvaluateService goodsEvaluateService;
     @Resource
     private AppUserClient appUserClient;
+    @Resource
+    private GoodsService goodsService;
+    @Resource
+    private TokenService tokenService;
 
     @GetMapping("/goodsList")
-    @ApiOperation(value = "商品评价", tags = {"小程序-商品评价"})
+    @ApiOperation(value = "获取商品评价", tags = {"小程序-获取商品评价"})
     public R<List<GoodsEvaluate>> goodsList(@ApiParam("商品id") Integer goodsId){
         List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).list();
         for (GoodsEvaluate goodsEvaluate : list) {
             AppUser appUserById = appUserClient.getAppUserById(goodsEvaluate.getAppUserId());
-            goodsEvaluate.setUserName(appUserById.getName());
-            goodsEvaluate.setAvatar(appUserById.getAvatar());
+            if(null != appUserById){
+                goodsEvaluate.setUserName(appUserById.getName());
+                goodsEvaluate.setAvatar(appUserById.getAvatar());
+                goodsEvaluate.setIdStr(String.valueOf(goodsEvaluate.getId()));
+            }
         }
         return R.ok(list);
     }
 
+    /**
+     * 发布商品评价
+     */
+    @PostMapping("/addGoodsEvaluate")
+    @ApiOperation(value = "发布商品评价", tags = {"小程序-个人中心-我的订单"})
+    public R<Void> addGoodsEvaluate(@RequestBody GoodsEvaluateVO goodsEvaluateVO){
+        goodsEvaluateService.addGoodsEvaluate(goodsEvaluateVO);
+        return R.ok();
+    }
+
+    /**
+     * 评论详情
+     */
+    @GetMapping("/detail/{orderId}")
+    @ApiOperation(value = "评论详情", tags = {"小程序-评论详情"})
+    public R<List<GoodsEvaluate>> detail(@PathVariable("orderId") Long orderId){
+        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+        List<GoodsEvaluate> list = goodsEvaluateService.list(new LambdaQueryWrapper<GoodsEvaluate>()
+                .eq(GoodsEvaluate::getStatus, 2)
+                .eq(GoodsEvaluate::getAppUserId,loginUserApplet.getUserid())
+                .eq(GoodsEvaluate::getOrderId, orderId));
+        for (GoodsEvaluate goodsEvaluate : list) {
+            Goods goods = goodsService.getById(goodsEvaluate.getGoodsId());
+            goodsEvaluate.setGoodsName(goods.getName());
+            goodsEvaluate.setGoodsImg(goods.getHomePagePicture());
+        }
+        return R.ok(list);
+    }
+
+
+    /**
+     * 删除评论
+     */
+    @DeleteMapping("/delete/{id}")
+    @ApiOperation(value = "删除评论", tags = {"管理后台-商品管理-评价管理"})
+    public R<Void> delete(@PathVariable("id") Long id){
+        goodsEvaluateService.removeById(id);
+        return R.ok();
+    }
+
+    public static void main(String[] args) {
+        List<Integer> integers = new ArrayList<>();
+        integers.add(1);
+        integers.add(2);
+        integers.add(3);
+        integers.add(4);
+        List<Integer> integers1 = new ArrayList<>();
+        integers.retainAll(integers1);
+        System.err.println(integers);
+        System.err.println(integers1);
+
+    }
+
+    /**
+     * 评论列表
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "评论列表", tags = {"管理后台-商品管理-评价管理"})
+    public R<Page<GoodsEvaluate>> list(@ApiParam("页码") @RequestParam Integer pageNum,
+                                       @ApiParam("每一页数据大小") Integer pageSize,
+                                       GoodsEvaluate goodsEvaluate){
+        List<Integer> goodsIds = new ArrayList<>();
+        List<Long> usersNameList = new ArrayList<>();
+        List<Long> usersPhoneList = new ArrayList<>();
+
+        if (StringUtils.isNotEmpty(goodsEvaluate.getUserName())) {
+            goodsIds = goodsService.lambdaQuery()
+                    .like(Goods::getName, goodsEvaluate.getGoodsName())
+                    .list().stream().map(Goods::getId).collect(Collectors.toList());
+            if (goodsIds.isEmpty()) {
+                return R.ok(new Page<>());
+            }
+        }
+        if (StringUtils.isNotEmpty(goodsEvaluate.getUserName())) {
+            usersNameList = appUserClient.getAppUserByName(goodsEvaluate.getUserName()).getData().stream().map(AppUser::getId).collect(Collectors.toList());
+            if (usersNameList.isEmpty()) {
+                return R.ok(new Page<>());
+            }
+
+        }
+        if (StringUtils.isNotEmpty(goodsEvaluate.getPhone())) {
+            usersPhoneList = appUserClient.getAppUserByPhone(goodsEvaluate.getPhone()).getData().stream().map(AppUser::getId).collect(Collectors.toList());
+            if (usersPhoneList.isEmpty()) {
+                return R.ok(new Page<>());
+            }
+        }
+        usersNameList.retainAll(usersPhoneList);
+        Page<GoodsEvaluate> page = goodsEvaluateService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsEvaluate>()
+                .in(!goodsIds.isEmpty(), GoodsEvaluate::getGoodsId, goodsIds)
+                .in(!usersNameList.isEmpty(), GoodsEvaluate::getAppUserId, usersNameList)
+                .eq(goodsEvaluate.getStatus() != null, GoodsEvaluate::getStatus, goodsEvaluate.getStatus())
+                .orderByDesc(GoodsEvaluate::getCreateTime));
+
+
+        page.getRecords().forEach(this::buildDetail);
+
+        return R.ok(page);
+    }
+
+    private void buildDetail(GoodsEvaluate item) {
+        AppUser appUser = appUserClient.getAppUserById(item.getAppUserId());
+        if (appUser != null){
+            item.setPhone(appUser.getPhone());
+            item.setUserName(appUser.getName());
+        }
+        Goods goods = goodsService.getById(item.getGoodsId());
+        item.setGoodsName(goods.getName());
+    }
+
+    /**
+     * 评论详情
+     */
+    @GetMapping("/{id}")
+    @ApiOperation(value = "评论详情", tags = {"管理后台-商品管理-评价管理"})
+    public R<GoodsEvaluate> getDetail(@PathVariable("id") Long id){
+        GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
+        buildDetail(goodsEvaluate);
+        return R.ok(goodsEvaluate);
+    }
+
+    /**
+     * 评论上/下架
+     */
+    @PutMapping("/changeStatus")
+    @ApiOperation(value = "上/下架", tags = {"管理后台-商品管理-评价管理"})
+    public R<Void> changeStatus(@RequestBody GoodsEvaluate goodsEvaluate){
+        goodsEvaluateService.update(new LambdaUpdateWrapper<GoodsEvaluate>()
+                .eq(GoodsEvaluate::getId, goodsEvaluate.getId())
+                .set(GoodsEvaluate::getStatus, goodsEvaluate.getStatus()));
+        return R.ok();
+    }
+
 }
 

--
Gitblit v1.7.1