From 86eae069a7f5fdf8a06190759dc1c2e7dcac3829 Mon Sep 17 00:00:00 2001 From: wst <2450473462@qq.com> Date: Mon, 2 Dec 2024 19:46:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E5=A2=9E=E5=8A=A0=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=92=8C=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8CqueryOrderCommentPageList=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?id=E6=88=96=E8=AE=A2=E5=8D=95=E5=AD=90=E5=8D=95id=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/skyeye/order/entity/OrderComment.java | 6 +++-- .../service/impl/OrderCommentServiceImpl.java | 26 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderComment.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderComment.java index 9684d60e..21ce52f5 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderComment.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderComment.java @@ -11,6 +11,8 @@ import com.skyeye.annotation.api.ApiModel; import com.skyeye.annotation.api.ApiModelProperty; import com.skyeye.annotation.api.Property; import com.skyeye.common.entity.features.OperatorUserInfo; +import com.skyeye.common.enumeration.WhetherEnum; +import com.skyeye.order.enums.OrderCommentType; import lombok.Data; import java.util.Map; @@ -69,7 +71,7 @@ public class OrderComment extends OperatorUserInfo { private String orderItemId; @TableField(value = "type") - @ApiModelProperty(value = "类型,参考#OrderCommentType") + @ApiModelProperty(value = "类型",enumClass = OrderCommentType.class) private Integer type; @TableField(value = "start") @@ -77,7 +79,7 @@ public class OrderComment extends OperatorUserInfo { private Integer start; @TableField(value = "is_comment") - @ApiModelProperty(value = "是否评价,1:是,0:否,参考#WhetherEnum") + @ApiModelProperty(value = "是否评价",enumClass = WhetherEnum.class) private Integer isComment; @TableField(value = "context") diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java index 8c4cdffb..6af2a480 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java @@ -32,6 +32,8 @@ import com.skyeye.order.enums.ShopOrderCommentState; import com.skyeye.order.service.OrderCommentService; import com.skyeye.order.service.OrderItemService; import com.skyeye.order.service.OrderService; +import com.skyeye.service.MemberService; +import com.skyeye.store.service.ShopStoreService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,7 +65,10 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl> queryPageDataList(InputObject inputObject) { List> mapList = super.queryPageDataList(inputObject); iMaterialService.setMationForMap(mapList, "materialId", "materialMation"); - iMaterialNormsService.setMationForMap(mapList, "normsId", "no1rmsMation"); - iAuthUserService.setMationForMap(mapList, "createId", "createMation"); + iMaterialNormsService.setMationForMap(mapList, "normsId", "normsMation"); + memberService.setMationForMap(mapList, "createId", "createMation"); + shopStoreService.setMationForMap(mapList, "storeId","storeMation"); return mapList; } @@ -148,12 +157,15 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MybatisPlusUtil.toColumns(OrderComment::getCreateId), typeId) - .or().eq(MybatisPlusUtil.toColumns(OrderComment::getMaterialId), typeId); + queryWrapper.eq(MybatisPlusUtil.toColumns(OrderComment::getCreateId), typeId)// 创建人id + .or().eq(MybatisPlusUtil.toColumns(OrderComment::getMaterialId), typeId) // 商品id + .or().eq(MybatisPlusUtil.toColumns(OrderComment::getOrderItemId), typeId)// 订单子单id + .or().eq(MybatisPlusUtil.toColumns(OrderComment::getOrderId), typeId); // 订单id List list = list(queryWrapper); iMaterialService.setDataMation(list, OrderComment::getMaterialId); iMaterialNormsService.setDataMation(list, OrderComment::getNormsId); - iAuthUserService.setDataMation(list, OrderComment::getCreateId); + memberService.setDataMation(list, OrderComment::getCreateId); + shopStoreService.setDataMation(list, OrderComment::getStoreId); List> mapList = JSONUtil.toList(JSONUtil.toJsonStr(list), null); outputObject.setBeans(mapList); outputObject.settotal(pages.getTotal());