From e38dbee7e43f6af65c7e9307d936a1c48e4bb539 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 11:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 0dcf875..8572df7 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
@@ -90,6 +90,7 @@
List<GoodsEvaluate> list = goodsEvaluateService.list(new LambdaQueryWrapper<GoodsEvaluate>()
.eq(GoodsEvaluate::getStatus, 2)
.eq(GoodsEvaluate::getAppUserId,loginUserApplet.getUserid())
+ .eq(GoodsEvaluate::getDelFlag, 0)
.eq(GoodsEvaluate::getOrderId, orderId));
for (GoodsEvaluate goodsEvaluate : list) {
Goods goods = goodsService.getById(goodsEvaluate.getGoodsId());
@@ -111,7 +112,7 @@
goodsEvaluateService.updateById(goodsEvaluate);
//修改订单为待评价
Order data = orderClient.getOrderById(goodsEvaluate.getOrderId()).getData();
- data.setOrderStatus(4);
+ data.setOrderStatus(data.getOldOrderStatus());
orderClient.editOrder(data);
return R.ok();
}
@@ -130,7 +131,7 @@
List<Long> usersNameList = new ArrayList<>();
List<Long> usersPhoneList = new ArrayList<>();
- if (StringUtils.isNotEmpty(goodsEvaluate.getUserName())) {
+ if (StringUtils.isNotEmpty(goodsEvaluate.getGoodsName())) {
goodsIds = goodsService.lambdaQuery()
.like(Goods::getName, goodsEvaluate.getGoodsName())
.list().stream().map(Goods::getId).collect(Collectors.toList());
@@ -151,11 +152,18 @@
return R.ok(new Page<>());
}
}
- usersNameList.retainAll(usersPhoneList);
+ if (StringUtils.isNotEmpty(goodsEvaluate.getPhone())&&StringUtils.isNotEmpty(goodsEvaluate.getUserName())){
+ // 取交集
+ usersNameList.retainAll(usersPhoneList);
+ if (usersNameList.isEmpty())usersNameList.add(-1L);
+ }else{
+ usersNameList.addAll(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())
+ .eq(GoodsEvaluate::getDelFlag, 0)
.orderByDesc(GoodsEvaluate::getCreateTime));
--
Gitblit v1.7.1