From 86625e9e9d633ab7f81348f2d69ff4028315c032 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Fri, 9 Jul 2021 11:55:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=94=AE=E5=90=8E=E5=A4=B1=E6=95=88=E3=80=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8A=95=E8=AF=89=E7=94=B3=E8=AF=B7=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E5=A4=A9=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/order/OrderEveryDayTaskExecute.java | 135 ++++++++++++++---- .../java/cn/lili/common/enums/ResultCode.java | 95 ++++++------ .../serviceimpl/CategoryServiceImpl.java | 10 ++ .../order/order/mapper/OrderItemMapper.java | 5 +- .../order/order/service/OrderItemService.java | 8 -- .../serviceimpl/OrderItemServiceImpl.java | 7 - .../system/entity/dto/OrderSetting.java | 12 +- 7 files changed, 180 insertions(+), 92 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 54f4007e..be91b37e 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 @@ -10,7 +10,12 @@ 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.enums.CommentStatusEnum; +import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum; +import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderStatusEnum; +import cn.lili.modules.order.order.mapper.OrderItemMapper; +import cn.lili.modules.order.order.service.AfterSaleService; import cn.lili.modules.order.order.service.OrderItemService; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.system.entity.dos.Setting; @@ -19,12 +24,13 @@ import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; import cn.lili.timetask.handler.EveryDayExecute; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Date; +import javax.annotation.Resource; import java.util.List; import java.util.stream.Collectors; @@ -47,6 +53,8 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { */ @Autowired private OrderItemService orderItemService; + @Resource + private OrderItemMapper orderItemMapper; /** * 设置 */ @@ -58,13 +66,17 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { @Autowired private MemberEvaluationService memberEvaluationService; + @Autowired + private AfterSaleService afterSaleService; + /** * 执行每日任务 */ @Override public void execute() { + Setting setting = settingService.get(SettingEnum.ORDER_SETTING.name()); - //自动确认收货 + //订单设置 OrderSetting orderSetting = JSONUtil.toBean(setting.getSettingValue(), OrderSetting.class); if (orderSetting == null) { throw new ServiceException(ResultCode.ORDER_SETTING_ERROR); @@ -74,6 +86,10 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { completedOrder(orderSetting); //自动好评 memberEvaluation(orderSetting); + //关闭允许售后申请 + closeAfterSale(orderSetting); + //关闭允许投诉 + closeComplaint(orderSetting); } /** @@ -82,21 +98,21 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { * @param orderSetting 订单设置 */ private void completedOrder(OrderSetting orderSetting) { + //订单自动收货时间 = 当前时间 - 自动收货时间天数 - DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoEvaluation()); + DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoReceive()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Order::getOrderStatus, OrderStatusEnum.DELIVERED.name()); + //订单发货时间 >= 订单自动收货时间 queryWrapper.ge(Order::getLogisticsTime, receiveTime); List list = orderService.list(queryWrapper); - List receiveSnList = list.stream().map(Order::getSn).collect(Collectors.toList()); - if (!receiveSnList.isEmpty()) { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(Order::getSn, receiveSnList); - updateWrapper.set(Order::getOrderStatus, OrderStatusEnum.COMPLETED.name()).set(Order::getCompleteTime, new Date()); - boolean update = orderService.update(updateWrapper); - if (Boolean.FALSE.equals(update)) { - log.error("自动收货订单失败！订单编号为[{}]", receiveSnList); + + //判断是否有符合条件的订单，进行订单完成处理 + if (!list.isEmpty()) { + List receiveSnList = list.stream().map(Order::getSn).collect(Collectors.toList()); + for (String orderSn : receiveSnList) { + orderService.complete(orderSn); } } } @@ -108,26 +124,93 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { */ private void memberEvaluation(OrderSetting orderSetting) { //订单自动收货时间 = 当前时间 - 自动收货时间天数 - DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoReceive()); + DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoEvaluation()); + //订单完成时间 <= 订单自动好评时间 - List orderItems = orderItemService.waitEvaluate(receiveTime); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.ge("o.complete_time", receiveTime); + queryWrapper.eq("oi.comment_status", CommentStatusEnum.UNFINISHED.name()); + List orderItems = orderItemMapper.waitOperationOrderItem(queryWrapper); - for (OrderItem orderItem : orderItems) { - - MemberEvaluationDTO memberEvaluationDTO = new MemberEvaluationDTO(); - memberEvaluationDTO.setOrderItemSn(orderItem.getSn()); - memberEvaluationDTO.setContent("系统默认好评"); - memberEvaluationDTO.setGoodsId(orderItem.getGoodsId()); - memberEvaluationDTO.setSkuId(orderItem.getSkuId()); - memberEvaluationDTO.setGrade(EvaluationGradeEnum.GOOD.name()); - memberEvaluationDTO.setDeliveryScore(5); - memberEvaluationDTO.setDescriptionScore(5); - memberEvaluationDTO.setServiceScore(5); - - memberEvaluationService.addMemberEvaluation(memberEvaluationDTO); + //判断是否有符合条件的订单，进行自动评价处理 + if (!orderItems.isEmpty()) { + for (OrderItem orderItem : orderItems) { + MemberEvaluationDTO memberEvaluationDTO = new MemberEvaluationDTO(); + memberEvaluationDTO.setOrderItemSn(orderItem.getSn()); + memberEvaluationDTO.setContent("系统默认好评"); + memberEvaluationDTO.setGoodsId(orderItem.getGoodsId()); + memberEvaluationDTO.setSkuId(orderItem.getSkuId()); + memberEvaluationDTO.setGrade(EvaluationGradeEnum.GOOD.name()); + memberEvaluationDTO.setDeliveryScore(5); + memberEvaluationDTO.setDescriptionScore(5); + memberEvaluationDTO.setServiceScore(5); + memberEvaluationService.addMemberEvaluation(memberEvaluationDTO); + } } } + /** + * 关闭允许售后申请 + * + * @param orderSetting 订单设置 + */ + private void closeAfterSale(OrderSetting orderSetting) { + + //订单关闭售后申请时间 = 当前时间 - 自动关闭售后申请天数 + DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoEvaluation()); + + //关闭售后订单=未售后订单+小于订单关闭售后申请时间 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.ge("o.complete_time", receiveTime); + queryWrapper.eq("oi.after_sale_status", OrderItemAfterSaleStatusEnum.NOT_APPLIED.name()); + List orderItems = orderItemMapper.waitOperationOrderItem(queryWrapper); + + //判断是否有符合条件的订单，关闭允许售后申请处理 + if (!orderItems.isEmpty()) { + + //获取订单货物ID + List orderItemIdList = orderItems.stream().map(OrderItem::getId).collect(Collectors.toList()); + + //修改订单售后状态 + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper() + .set(OrderItem::getAfterSaleStatus, OrderItemAfterSaleStatusEnum.EXPIRED.name()) + .in(OrderItem::getId, orderItemIdList); + orderItemService.update(lambdaUpdateWrapper); + } + + } + + /** + * 关闭允许交易投诉 + * + * @param orderSetting 订单设置 + */ + private void closeComplaint(OrderSetting orderSetting) { + + //订单关闭交易投诉申请时间 = 当前时间 - 自动关闭交易投诉申请天数 + DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getCloseComplaint()); + + //关闭售后订单=未售后订单+小于订单关闭售后申请时间 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.ge("o.complete_time", receiveTime); + queryWrapper.eq("oi.complain_status", OrderComplaintStatusEnum.NO_APPLY.name()); + List orderItems = orderItemMapper.waitOperationOrderItem(queryWrapper); + + //判断是否有符合条件的订单，关闭允许售后申请处理 + if (!orderItems.isEmpty()) { + + //获取订单货物ID + List orderItemIdList = orderItems.stream().map(OrderItem::getId).collect(Collectors.toList()); + + //修改订单投诉状态 + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper() + .set(OrderItem::getComplainStatus, OrderItemAfterSaleStatusEnum.EXPIRED.name()) + .in(OrderItem::getId, orderItemIdList); + orderItemService.update(lambdaUpdateWrapper); + } + + } + } diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 166d7064..b09319bc 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -34,7 +34,7 @@ public enum ResultCode { */ WECHAT_CONNECT_NOT_EXIST(1001, "微信联合登录未配置"), VERIFICATION_EXIST(1002, "验证码服务异常"), - LIMIT_ERROR(1003,"访问过于频繁，请稍后再试"), + LIMIT_ERROR(1003, "访问过于频繁，请稍后再试"), ILLEGAL_REQUEST_ERROR(1004, "非法请求，请重新刷新页面操作"), IMAGE_FILE_EXT_ERROR(1005, "不支持图片格式"), /** @@ -50,6 +50,7 @@ public enum ResultCode { CATEGORY_PARAMETER_SAVE_ERROR(10008, "分类绑定参数组添加失败"), CATEGORY_PARAMETER_UPDATE_ERROR(10009, "分类绑定参数组添加失败"), CATEGORY_DELETE_FLAG_ERROR(10010, "子类状态不能与父类不一致！"), + CATEGORY_COMMISSION_RATE_ERROR(10011, "分类的佣金不正确！"), /** * 商品 @@ -67,10 +68,10 @@ public enum ResultCode { GOODS_SKU_WEIGHT_ERROR(11010, "商品重量不能为负数"), GOODS_SKU_QUANTITY_ERROR(11011, "商品库存数量不能为负数"), GOODS_SKU_QUANTITY_NOT_ENOUGH(11011, "商品库存不足"), - MUST_HAVE_GOODS_SKU(11012,"规格必须要有一个！"), - GOODS_PARAMS_ERROR(11013,"商品参数错误，刷新后重试"), - PHYSICAL_GOODS_NEED_TEMP(11014,"实物商品需选择配送模板"), - VIRTUAL_GOODS_NOT_NEED_TEMP(11015,"实物商品需选择配送模板"), + MUST_HAVE_GOODS_SKU(11012, "规格必须要有一个！"), + GOODS_PARAMS_ERROR(11013, "商品参数错误，刷新后重试"), + PHYSICAL_GOODS_NEED_TEMP(11014, "实物商品需选择配送模板"), + VIRTUAL_GOODS_NOT_NEED_TEMP(11015, "实物商品需选择配送模板"), GOODS_TYPE_ERROR(11016, "需选择商品类型"), /** @@ -119,10 +120,10 @@ public enum ResultCode { USER_COLLECTION_EXIST(20017, "无法重复收藏"), USER_GRADE_IS_DEFAULT(20018, "会员等级为默认会员等级"), DELETE_EXIST(20019, "无法重复收藏"), - USER_NOT_BINDING(20020,"未绑定用户"), - USER_AUTO_REGISTER_ERROR(20021,"自动注册失败,请稍后重试"), - USER_OVERDUE_CONNECT_ERROR(20022,"授权信息已过期，请重新授权/登录"), - USER_CONNECT_BANDING_ERROR(20023,"当前联合登陆方式，已绑定其他账号，需进行解绑操作"), + USER_NOT_BINDING(20020, "未绑定用户"), + USER_AUTO_REGISTER_ERROR(20021, "自动注册失败,请稍后重试"), + USER_OVERDUE_CONNECT_ERROR(20022, "授权信息已过期，请重新授权/登录"), + USER_CONNECT_BANDING_ERROR(20023, "当前联合登陆方式，已绑定其他账号，需进行解绑操作"), USER_CONNECT_NOT_EXIST_ERROR(20024, "暂无联合登陆信息，无法实现一键注册功能，请点击第三方登录进行授权"), /** @@ -231,13 +232,13 @@ public enum ResultCode { * 活动 */ PROMOTION_GOODS_NOT_EXIT(40001, "当前促销商品不存在！"), - PROMOTION_SAME_ACTIVE_EXIST(40002,"当前时间内已存在同类活动"), - PROMOTION_START_TIME_ERROR(40003,"活动起始时间不能大于活动结束时间"), - PROMOTION_TIME_ERROR(40004,"活动起始时间必须大于当前时间"), - PROMOTION_SAME_ERROR(40005,"当前时间段已存在相同活动！"), - PROMOTION_GOODS_ERROR(40006,"请选择要参与活动的商品"), - PROMOTION_STATUS_END(40007,"当前活动已停止"), - PROMOTION_UPDATE_ERROR(40008,"当前活动已开始/结束，无法编辑！"), + PROMOTION_SAME_ACTIVE_EXIST(40002, "当前时间内已存在同类活动"), + PROMOTION_START_TIME_ERROR(40003, "活动起始时间不能大于活动结束时间"), + PROMOTION_TIME_ERROR(40004, "活动起始时间必须大于当前时间"), + PROMOTION_SAME_ERROR(40005, "当前时间段已存在相同活动！"), + PROMOTION_GOODS_ERROR(40006, "请选择要参与活动的商品"), + PROMOTION_STATUS_END(40007, "当前活动已停止"), + PROMOTION_UPDATE_ERROR(40008, "当前活动已开始/结束，无法编辑！"), /** * 优惠券 @@ -275,47 +276,47 @@ public enum ResultCode { PINTUAN_DELETE_ERROR(42010, "删除拼团活动失败"), PINTUAN_JOIN_ERROR(42011, "不能参与自己发起的拼团活动！"), PINTUAN_LIMIT_NUM_ERROR(42012, "购买数量超过拼团活动限制数量！"), - PINTUAN_NOT_EXIST_ERROR(42013,"当前拼团商品不存在！"), + PINTUAN_NOT_EXIST_ERROR(42013, "当前拼团商品不存在！"), /** * 满额活动 */ FULL_DISCOUNT_EDIT_SUCCESS(43001, "修改满优惠活动成功"), FULL_DISCOUNT_EDIT_DELETE(43002, "删除满优惠活动成功"), - FULL_DISCOUNT_MODIFY_ERROR(43003,"当前编辑的满优惠活动已经开始或者已经结束，无法修改"), - FULL_DISCOUNT_NOT_EXIST_ERROR(43004,"当前要操作的满优惠活动不存在！"), - FULL_DISCOUNT_WAY_ERROR(43005,"请选择一种优惠方式！"), - FULL_DISCOUNT_GIFT_ERROR(43006,"请选择赠品！"), - FULL_DISCOUNT_COUPON_TIME_ERROR(43007,"赠送的优惠券有效时间必须大于活动时间"), - FULL_DISCOUNT_MONEY_ERROR(43008,"请填写满减金额"), - FULL_DISCOUNT_MONEY_GREATER_THAN_MINUS(43009,"满减金额不能大于优惠门槛"), - FULL_RATE_NUM_ERROR(43010,"请填写打折数值"), + FULL_DISCOUNT_MODIFY_ERROR(43003, "当前编辑的满优惠活动已经开始或者已经结束，无法修改"), + FULL_DISCOUNT_NOT_EXIST_ERROR(43004, "当前要操作的满优惠活动不存在！"), + FULL_DISCOUNT_WAY_ERROR(43005, "请选择一种优惠方式！"), + FULL_DISCOUNT_GIFT_ERROR(43006, "请选择赠品！"), + FULL_DISCOUNT_COUPON_TIME_ERROR(43007, "赠送的优惠券有效时间必须大于活动时间"), + FULL_DISCOUNT_MONEY_ERROR(43008, "请填写满减金额"), + FULL_DISCOUNT_MONEY_GREATER_THAN_MINUS(43009, "满减金额不能大于优惠门槛"), + FULL_RATE_NUM_ERROR(43010, "请填写打折数值"), /** * 直播 */ - STODIO_GOODS_EXIST_ERROR(44001,"直播商品已存在"), - COMMODITY_ERROR(44002,"添加直播商品失败"), + STODIO_GOODS_EXIST_ERROR(44001, "直播商品已存在"), + COMMODITY_ERROR(44002, "添加直播商品失败"), /** * 秒杀 */ - SECKILL_NOT_EXIST_ERROR(45001,"当前参与的秒杀活动不存在！"), - SECKILL_UPDATE_ERROR(45002,"当前秒杀活动活动已经开始，无法修改！"), - SECKILL_PRICE_ERROR(45003,"活动价格不能大于商品原价"), - SECKILL_TIME_ERROR(45004,"时刻参数异常"), - SECKILL_DELETE_ERROR(45005,"该秒杀活动活动的状态不能删除"), - SECKILL_CLOSE_ERROR(45006,"该秒杀活动活动的状态不能关闭"), + SECKILL_NOT_EXIST_ERROR(45001, "当前参与的秒杀活动不存在！"), + SECKILL_UPDATE_ERROR(45002, "当前秒杀活动活动已经开始，无法修改！"), + SECKILL_PRICE_ERROR(45003, "活动价格不能大于商品原价"), + SECKILL_TIME_ERROR(45004, "时刻参数异常"), + SECKILL_DELETE_ERROR(45005, "该秒杀活动活动的状态不能删除"), + SECKILL_CLOSE_ERROR(45006, "该秒杀活动活动的状态不能关闭"), /** * 优惠券活动 */ - COUPON_ACTIVITY_START_TIME_ERROR(46001,"活动时间小于当前时间，不能进行编辑删除操作"), - COUPON_ACTIVITY_MEMBER_ERROR(46002,"指定精准发券则必须指定会员，会员不可以为空"), - COUPON_ACTIVITY_ITEM_ERROR(46003,"优惠券活动必须指定优惠券，不能为空"), - COUPON_ACTIVITY_ITEM_MUST_NUM_ERROR(46004,"优惠券活动最多指定10个优惠券"), - COUPON_ACTIVITY_ITEM_NUM_ERROR(46005,"赠券数量必须大于0"), + COUPON_ACTIVITY_START_TIME_ERROR(46001, "活动时间小于当前时间，不能进行编辑删除操作"), + COUPON_ACTIVITY_MEMBER_ERROR(46002, "指定精准发券则必须指定会员，会员不可以为空"), + COUPON_ACTIVITY_ITEM_ERROR(46003, "优惠券活动必须指定优惠券，不能为空"), + COUPON_ACTIVITY_ITEM_MUST_NUM_ERROR(46004, "优惠券活动最多指定10个优惠券"), + COUPON_ACTIVITY_ITEM_NUM_ERROR(46005, "赠券数量必须大于0"), /** * 其他促销 @@ -366,9 +367,9 @@ public enum ResultCode { ALIPAY_NOT_SETTING(70002, "支付宝支付未配置"), ALIPAY_EXCEPTION(70003, "支付宝支付错误，请稍后重试"), ALIPAY_PARAMS_EXCEPTION(70004, "支付宝参数异常"), - LOGISTICS_NOT_SETTING(70005,"您还未配置快递查询"), - ORDER_SETTING_ERROR(70006,"系统订单配置异常"), - ALI_SMS_SETTING_ERROR(70007,"您还未配置阿里云短信"), + LOGISTICS_NOT_SETTING(70005, "您还未配置快递查询"), + ORDER_SETTING_ERROR(70006, "系统订单配置异常"), + ALI_SMS_SETTING_ERROR(70007, "您还未配置阿里云短信"), SMS_SIGN_EXIST_ERROR(70008, "短信签名已存在"), /** @@ -401,10 +402,10 @@ public enum ResultCode { WECHAT_PAYMENT_NOT_SETTING(80301, "微信支付信息未配置"), WECHAT_QRCODE_ERROR(80302, "微信二维码生成异常"), WECHAT_MP_MESSAGE_ERROR(80303, "微信小程序小消息订阅异常"), - WECHAT_JSAPI_SIGN_ERROR(80304,"微信JsApi签名异常"), - WECHAT_CERT_ERROR(80305,"证书获取失败"), - WECHAT_MP_MESSAGE_TMPL_ERROR(80306,"未能获取到微信模版消息id"), - WECHAT_ERROR(80307,"微信接口异常"), + WECHAT_JSAPI_SIGN_ERROR(80304, "微信JsApi签名异常"), + WECHAT_CERT_ERROR(80305, "证书获取失败"), + WECHAT_MP_MESSAGE_TMPL_ERROR(80306, "未能获取到微信模版消息id"), + WECHAT_ERROR(80307, "微信接口异常"), APP_VERSION_EXIST(80307, "APP版本已存在"), /** @@ -412,8 +413,8 @@ public enum ResultCode { */ CUSTOM_WORDS_EXIST_ERROR(90000, "当前自定义分词已存在！"), CUSTOM_WORDS_NOT_EXIST_ERROR(90001, "当前自定义分词不存在！"), - CUSTOM_WORDS_SECRET_KEY_ERROR(90002, "秘钥验证失败！"), - CONNECT_NOT_EXIST(90000,"登录方式不存在"), + CUSTOM_WORDS_SECRET_KEY_ERROR(90002, "秘钥验证失败！"), + CONNECT_NOT_EXIST(90000, "登录方式不存在"), ; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java index ef34f1a0..93903d48 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java @@ -163,6 +163,11 @@ public class CategoryServiceImpl extends ServiceImpl i @Override public boolean saveCategory(Category category) { + //判断分类佣金是否正确 + if (category.getCommissionRate() < 0) { + throw new ServiceException(ResultCode.CATEGORY_COMMISSION_RATE_ERROR); + } + //子分类与父分类的状态一致 if (category.getParentId() != null && !("0").equals(category.getParentId())) { Category parentCategory = this.getById(category.getParentId()); category.setDeleteFlag(parentCategory.getDeleteFlag()); @@ -174,6 +179,11 @@ public class CategoryServiceImpl extends ServiceImpl i @Override public void updateCategory(Category category) { + //判断分类佣金是否正确 + if (category.getCommissionRate() < 0) { + throw new ServiceException(ResultCode.CATEGORY_COMMISSION_RATE_ERROR); + } + //判断父分类与子分类的状态是否一致 if (category.getParentId() != null && !"0".equals(category.getParentId())) { Category parentCategory = this.getById(category.getParentId()); if (!parentCategory.getDeleteFlag().equals(category.getDeleteFlag())) { diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java index 9563a9c5..91643411 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java @@ -19,12 +19,11 @@ import java.util.List; public interface OrderItemMapper extends BaseMapper { /** - * 获取等待评价的订单子项列表 + * 获取等待操作订单子项目 * * @param queryWrapper 查询条件 * @return 订单子项列表 */ @Select("SELECT * FROM li_order_item AS oi INNER JOIN li_order AS o ON oi.order_sn=o.sn ${ew.customSqlSegment}") - List waitEvaluate(@Param(Constants.WRAPPER) Wrapper queryWrapper); - + List waitOperationOrderItem(@Param(Constants.WRAPPER) Wrapper queryWrapper); } \ No newline at end of file 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 dc305bee..980985b4 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 @@ -6,7 +6,6 @@ import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.Date; import java.util.List; /** @@ -59,11 +58,4 @@ public interface OrderItemService extends IService { */ List getByOrderSn(String orderSn); - /** - * 获取待评价订单列表 - * - * @param date 结束时间 - * @return 子订单列表 - */ - List waitEvaluate(Date date); } \ 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 1423b106..1f5125a5 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 @@ -80,11 +80,4 @@ public class OrderItemServiceImpl extends ServiceImpl waitEvaluate(Date date) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.ge("o.complete_time", date); - queryWrapper.eq("oi.comment_status", CommentStatusEnum.UNFINISHED.name()); - return this.baseMapper.waitEvaluate(queryWrapper); - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java index 3d892132..bc2d20c5 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java @@ -25,11 +25,13 @@ public class OrderSetting implements Serializable { * 已完成订单允许退单：X天内，允许客户发起退货退款申请，未发货订单随时可退，未发货订单随时可退 */ @ApiModelProperty(value = "已完成订单允许退单 天") - private Integer autoComplete; + private Integer closeAfterSale; @ApiModelProperty(value = "自动评价 天") private Integer autoEvaluation; + //---------------售后--------------- + @ApiModelProperty(value = "售后自动取消 天") private Integer autoCancelAfterSale; @@ -44,4 +46,12 @@ public class OrderSetting implements Serializable { */ @ApiModelProperty(value = "已完成订单允许退单 天") private Integer autoAfterSaleComplete; + + //---------------投诉--------------- + /** + * 已完成订单允许投诉：X天内，允许客户发起交易投诉 + * 如果写0，则不允许投诉 + */ + @ApiModelProperty(value = "已完成订单允许投诉 天") + private Integer closeComplaint; }