From 0bdb39797d9670c6112fb588e532016c142f51cd Mon Sep 17 00:00:00 2001 From: misworga831 Date: Tue, 13 Jun 2023 10:48:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A7=BB=E9=99=A4@Res?= =?UTF-8?q?ource=E5=90=8E=E7=9A=84=E8=AE=A2=E5=8D=95=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=89=A7=E8=A1=8Csql=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/order/OrderEveryDayTaskExecute.java | 10 ++++-- .../entity/dto/OrderItemOperationDTO.java | 31 +++++++++++++++++++ .../order/order/service/OrderItemService.java | 4 +-- .../serviceimpl/OrderItemServiceImpl.java | 11 ++++--- 4 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderItemOperationDTO.java diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java index 12bc0491..5e7b481b 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java @@ -11,6 +11,7 @@ import cn.lili.modules.member.entity.enums.EvaluationGradeEnum; import cn.lili.modules.member.service.MemberEvaluationService; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.OrderItem; +import cn.lili.modules.order.order.entity.dto.OrderItemOperationDTO; import cn.lili.modules.order.order.entity.enums.CommentStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum; @@ -143,7 +144,8 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoEvaluation()); //订单完成时间 <= 订单自动好评时间 - List orderItems = orderItemService.waitOperationOrderItem(receiveTime, CommentStatusEnum.UNFINISHED.name()); + OrderItemOperationDTO orderItemOperationDTO = OrderItemOperationDTO.builder().receiveTime(receiveTime).commentStatus(CommentStatusEnum.UNFINISHED.name()).build(); + List orderItems = orderItemService.waitOperationOrderItem(orderItemOperationDTO); //判断是否有符合条件的订单，进行自动评价处理 if (!orderItems.isEmpty()) { @@ -183,7 +185,8 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getCloseAfterSale()); //关闭售后订单=未售后订单+小于订单关闭售后申请时间 - List orderItems = orderItemService.waitOperationOrderItem(receiveTime, OrderItemAfterSaleStatusEnum.NOT_APPLIED.name()); + OrderItemOperationDTO build = OrderItemOperationDTO.builder().receiveTime(receiveTime).afterSaleStatus(OrderItemAfterSaleStatusEnum.NOT_APPLIED.name()).build(); + List orderItems = orderItemService.waitOperationOrderItem(build); //判断是否有符合条件的订单，关闭允许售后申请处理 if (!orderItems.isEmpty()) { @@ -224,7 +227,8 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getCloseComplaint()); //关闭售后订单=未售后订单+小于订单关闭售后申请时间 - List orderItems = orderItemService.waitOperationOrderItem(receiveTime, OrderComplaintStatusEnum.NO_APPLY.name()); + OrderItemOperationDTO build = OrderItemOperationDTO.builder().receiveTime(receiveTime).complainStatus(OrderComplaintStatusEnum.NO_APPLY.name()).build(); + List orderItems = orderItemService.waitOperationOrderItem(build); //判断是否有符合条件的订单，关闭允许售后申请处理 if (!orderItems.isEmpty()) { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderItemOperationDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderItemOperationDTO.java new file mode 100644 index 00000000..80d5ffc7 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderItemOperationDTO.java @@ -0,0 +1,31 @@ +package cn.lili.modules.order.order.entity.dto; + +import cn.hutool.core.date.DateTime; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 订单Item操作DTO + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class OrderItemOperationDTO { + + @ApiModelProperty(value = "订单完成时间") + DateTime receiveTime; + + @ApiModelProperty(value = "订单售后状态") + String afterSaleStatus; + + @ApiModelProperty(value = "订单评价状态") + String commentStatus; + + @ApiModelProperty(value = "订单投诉状态") + String complainStatus; + +} diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java index 7b08ca50..c40a2d84 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java @@ -1,7 +1,7 @@ package cn.lili.modules.order.order.service; -import cn.hutool.core.date.DateTime; import cn.lili.modules.order.order.entity.dos.OrderItem; +import cn.lili.modules.order.order.entity.dto.OrderItemOperationDTO; import cn.lili.modules.order.order.entity.enums.CommentStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum; @@ -68,5 +68,5 @@ public interface OrderItemService extends IService { */ OrderItem getByOrderSnAndSkuId(String orderSn, String skuId); - List waitOperationOrderItem(DateTime receiveTime, String commentStatus); + List waitOperationOrderItem(OrderItemOperationDTO orderItemOperationDTO); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java index b90a55fc..bc03843b 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java @@ -1,9 +1,10 @@ package cn.lili.modules.order.order.serviceimpl; -import cn.hutool.core.date.DateTime; +import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.modules.order.order.entity.dos.OrderItem; +import cn.lili.modules.order.order.entity.dto.OrderItemOperationDTO; import cn.lili.modules.order.order.entity.enums.CommentStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum; @@ -86,10 +87,12 @@ public class OrderItemServiceImpl extends ServiceImpl waitOperationOrderItem(DateTime receiveTime, String commentStatus) { + public List waitOperationOrderItem(OrderItemOperationDTO dto) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.le("o.complete_time", receiveTime); - queryWrapper.eq("oi.comment_status", CommentStatusEnum.UNFINISHED.name()); + queryWrapper.le("o.complete_time", dto.getReceiveTime()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(dto.getCommentStatus()), "oi.comment_status", dto.getCommentStatus()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(dto.getAfterSaleStatus()), "oi.after_sale_status", dto.getAfterSaleStatus()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(dto.getComplainStatus()), "oi.complain_status", dto.getComplainStatus()); return this.baseMapper.waitOperationOrderItem(queryWrapper); } } \ No newline at end of file