diff --git a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java index 1027772a..fed28ee0 100644 --- a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java @@ -44,9 +44,11 @@ public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDa public void orderChange(OrderMessage orderMessage) { switch (orderMessage.getNewStatus()) { - case PAID: { + //订单带校验/订单代发货,则记录分销信息 + case TAKE: + case UNDELIVERED: { //记录分销订单 - distributionOrderService.payOrder(orderMessage.getOrderSn()); + distributionOrderService.calculationDistribution(orderMessage.getOrderSn()); break; } case CANCELLED: { diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java index ee789adb..122ba134 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java +++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java @@ -27,7 +27,7 @@ public interface DistributionOrderService extends IService { * * @param orderSn 订单编号 */ - void payOrder(String orderSn); + void calculationDistribution(String orderSn); /** * 取消订单 diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java index 4858add2..aed156ad 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java @@ -79,7 +79,7 @@ public class DistributionOrderServiceImpl extends ServiceImpl distributionOrderList = this.list(new LambdaQueryWrapper() .eq(DistributionOrder::getOrderSn, orderSn)); + //如果没有分销定单,则直接返回 + if (distributionOrderList.isEmpty()) { + return; + } //分销金额 Double rebate = 0.0;