From d19415a44cec96905d1b1767e7e32b6238d623f3 Mon Sep 17 00:00:00 2001 From: wst <2450473462@qq.com> Date: Mon, 2 Dec 2024 11:34:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/skyeye/order/entity/OrderComment.java | 2 +- .../service/impl/OrderCommentServiceImpl.java | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 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 ee130617..9684d60e 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 @@ -73,7 +73,7 @@ public class OrderComment extends OperatorUserInfo { private Integer type; @TableField(value = "start") - @ApiModelProperty(value = "星级(1-5)",required = "required") + @ApiModelProperty(value = "星级(1-5)") private Integer start; @TableField(value = "is_comment") 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 7b7d9a01..abb9f89b 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 @@ -21,6 +21,7 @@ import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; import com.skyeye.erp.service.IMaterialNormsService; import com.skyeye.erp.service.IMaterialService; +import com.skyeye.eve.service.IAuthUserService; import com.skyeye.exception.CustomException; import com.skyeye.order.dao.OrderCommentDao; import com.skyeye.order.entity.OrderComment; @@ -60,6 +61,9 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl> mapList = super.queryPageDataList(inputObject); iMaterialService.setMationForMap(mapList, "materialId", "materialMation"); iMaterialNormsService.setMationForMap(mapList, "normsId", "normsMation"); + iAuthUserService.setMationForMap(mapList, "createId", "createMation"); return mapList; } @@ -125,9 +130,13 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl getQueryWrapper(CommonPageInfo commonPageInfo) { String typeId = commonPageInfo.getTypeId(); QueryWrapper queryWrapper = super.getQueryWrapper(commonPageInfo); - queryWrapper.eq(MybatisPlusUtil.toColumns(OrderComment::getType), OrderCommentType.CUSTOMERFiRST.getKey()); - queryWrapper.eq(MybatisPlusUtil.toColumns(OrderComment::getType), OrderCommentType.CUSTOMERLATER.getKey()); - queryWrapper.eq(MybatisPlusUtil.toColumns(OrderComment::getStoreId), typeId); + queryWrapper.and(wrap -> { + wrap.eq(MybatisPlusUtil.toColumns(OrderComment::getType), OrderCommentType.CUSTOMERFiRST.getKey()) + .or().eq(MybatisPlusUtil.toColumns(OrderComment::getType), OrderCommentType.CUSTOMERLATER.getKey()); + }); + if (StrUtil.isNotEmpty(typeId)) { + queryWrapper.eq(MybatisPlusUtil.toColumns(OrderComment::getStoreId), typeId); + } return queryWrapper; }