From 61914d04f0a10bd3e843cc5791ce3490f102a031 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 22 Oct 2021 12:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=AD=A3=E7=A1=AE=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/event/impl/DistributionOrderExecute.java   | 6 ++++--
 .../distribution/service/DistributionOrderService.java      | 2 +-
 .../serviceimpl/DistributionOrderServiceImpl.java           | 6 +++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

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<DistributionOrder> {
      *
      * @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<DistributionOrderM
      * @param orderSn 订单编号
      */
     @Override
-    public void payOrder(String orderSn) {
+    public void calculationDistribution(String orderSn) {
 
         //根据订单编号获取订单数据
         Order order = orderService.getBySn(orderSn);
@@ -160,6 +160,10 @@ public class DistributionOrderServiceImpl extends ServiceImpl<DistributionOrderM
             List<DistributionOrder> distributionOrderList = this.list(new LambdaQueryWrapper<DistributionOrder>()
                     .eq(DistributionOrder::getOrderSn, orderSn));
 
+            //如果没有分销定单，则直接返回
+            if (distributionOrderList.isEmpty()) {
+                return;
+            }
             //分销金额
             Double rebate = 0.0;