From b4aef1461cfe01b6ada5b42ba7a6e7f5320ca525 Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Wed, 10 May 2023 14:03:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8=E6=9E=81?= =?UTF-8?q?=E7=AB=AF=E6=83=85=E5=86=B5=EF=BC=8C=E5=BD=B1=E5=93=8D=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=B8=9A=E5=8A=A1=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=81=9A?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=85=8D=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E8=AE=A2=E5=8D=95=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/order/OrderEveryDayTaskExecute.java | 58 +++++++++++++------ .../properties/RocketmqCustomProperties.java | 1 + .../MemberEvaluationServiceImpl.java | 3 + 3 files changed, 44 insertions(+), 18 deletions(-) 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 6370b260..8e9f2e6a 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 @@ -2,8 +2,6 @@ package cn.lili.timetask.handler.impl.order; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; @@ -88,14 +86,30 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { throw new ServiceException(ResultCode.ORDER_SETTING_ERROR); } - //自动确认收货 - completedOrder(orderSetting); - //自动好评 - memberEvaluation(orderSetting); - //关闭允许售后申请 - closeAfterSale(orderSetting); - //关闭允许投诉 - closeComplaint(orderSetting); + try { + //自动确认收货 + completedOrder(orderSetting); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + try { + //自动好评 + memberEvaluation(orderSetting); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + try { + //关闭允许售后申请 + closeAfterSale(orderSetting); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + try { + //关闭允许投诉 + closeComplaint(orderSetting); + } catch (Exception e) { + log.error(e.getMessage(), e); + } } /** @@ -115,12 +129,16 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { queryWrapper.le(Order::getLogisticsTime, receiveTime); List list = orderService.list(queryWrapper); - //判断是否有符合条件的订单，进行订单完成处理 - if (!list.isEmpty()) { - List receiveSnList = list.stream().map(Order::getSn).collect(Collectors.toList()); - for (String orderSn : receiveSnList) { - orderService.systemComplete(orderSn); + try { + //判断是否有符合条件的订单，进行订单完成处理 + if (!list.isEmpty()) { + List receiveSnList = list.stream().map(Order::getSn).collect(Collectors.toList()); + for (String orderSn : receiveSnList) { + orderService.systemComplete(orderSn); + } } + } catch (Exception e) { + log.error(e.getMessage(), e); } } @@ -152,7 +170,12 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { memberEvaluationDTO.setDescriptionScore(5); memberEvaluationDTO.setServiceScore(5); - memberEvaluationService.addMemberEvaluation(memberEvaluationDTO, false); + try { + memberEvaluationService.addMemberEvaluation(memberEvaluationDTO, false); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } } } } @@ -164,7 +187,6 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { * @param orderSetting 订单设置 */ private void closeAfterSale(OrderSetting orderSetting) { - //订单关闭售后申请时间 = 当前时间 - 自动关闭售后申请天数 DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getCloseAfterSale()); @@ -187,7 +209,7 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { orderItemService.update(lambdaUpdateWrapper); //修改订售后状态 List orderItemsList = orderItems.stream() - .map((orderItem)->{ + .map((orderItem) -> { orderItem.setAfterSaleStatus(OrderItemAfterSaleStatusEnum.EXPIRED.name()); return orderItem; }) diff --git a/framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java b/framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java index 934057ac..cfc001ff 100644 --- a/framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java +++ b/framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Component; @ConfigurationProperties(prefix = "lili.data.rocketmq") public class RocketmqCustomProperties { + private String promotionTopic; private String promotionGroup; diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java index 94e7239f..6877a97a 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java @@ -122,6 +122,9 @@ public class MemberEvaluationServiceImpl extends ServiceImpl