diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/OrderLifecycleServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/OrderLifecycleServiceImpl.java index b97a72c..6847ad2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/OrderLifecycleServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/OrderLifecycleServiceImpl.java @@ -47,7 +47,7 @@ import com.starry.admin.modules.shop.module.entity.PlayCouponInfoEntity; import com.starry.admin.modules.shop.module.enums.CouponDiscountType; import com.starry.admin.modules.shop.service.IPlayCouponDetailsService; import com.starry.admin.modules.shop.service.IPlayCouponInfoService; -import com.starry.admin.modules.weichat.service.WxCustomMpService; +import com.starry.admin.modules.weichat.service.NotificationSender; import com.starry.admin.modules.withdraw.entity.EarningsLineEntity; import com.starry.admin.modules.withdraw.service.IEarningsService; import com.starry.admin.utils.SecurityUtils; @@ -85,7 +85,7 @@ public class OrderLifecycleServiceImpl implements IOrderLifecycleService { private IEarningsService earningsService; @Resource - private WxCustomMpService wxCustomMpService; + private NotificationSender notificationSender; @Resource private IPlayOrderRefundInfoService orderRefundInfoService; @@ -466,7 +466,7 @@ public class OrderLifecycleServiceImpl implements IOrderLifecycleService { } if (shouldNotify) { - wxCustomMpService.sendOrderFinishMessageAsync(latest); + notificationSender.sendOrderFinishMessageAsync(latest); } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java index ca66217..d9d33c5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java @@ -17,7 +17,7 @@ import com.starry.admin.modules.order.module.vo.PlayOrderComplaintQueryVo; import com.starry.admin.modules.order.module.vo.PlayOrderComplaintReturnVo; import com.starry.admin.modules.order.service.IPlayOrderComplaintInfoService; import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; -import com.starry.admin.modules.weichat.service.WxCustomMpService; +import com.starry.admin.modules.weichat.service.NotificationSender; import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; import java.util.Arrays; @@ -46,7 +46,7 @@ public class PlayOrderComplaintInfoServiceImpl @Resource private IPlayPersonnelGroupInfoService playClerkGroupInfoService; @Resource - private WxCustomMpService wxCustomMpService; + private NotificationSender notificationSender; /** * 查询订单投诉信息 @@ -169,7 +169,7 @@ public class PlayOrderComplaintInfoServiceImpl playOrderComplaintInfo.setClerkId(orderInfo.getAcceptBy()); playOrderComplaintInfo.setCommodityId(orderInfo.getCommodityId()); // 发送投诉消息给管理员以及客服 - wxCustomMpService.sendComplaintMessage(playOrderComplaintInfo, orderInfo); + notificationSender.sendComplaintMessage(playOrderComplaintInfo, orderInfo); return save(playOrderComplaintInfo); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java index c52a6fa..e1d9576 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.starry.admin.modules.order.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -41,10 +42,11 @@ import com.starry.admin.modules.order.service.IPlayOrderRefundInfoService; import com.starry.admin.modules.order.service.support.ClerkRevenueCalculator; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity; import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; +import com.starry.admin.modules.shop.module.constant.CouponUseState; import com.starry.admin.modules.shop.module.vo.PlayCouponDetailsReturnVo; import com.starry.admin.modules.shop.service.IPlayCouponDetailsService; import com.starry.admin.modules.weichat.entity.order.*; -import com.starry.admin.modules.weichat.service.WxCustomMpService; +import com.starry.admin.modules.weichat.service.NotificationSender; import com.starry.admin.modules.withdraw.service.IEarningsService; import com.starry.admin.utils.DateRangeUtils; import com.starry.admin.utils.SecurityUtils; @@ -95,7 +97,7 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl