From 6037e957d241d56818201b20b32e924b8230a221 Mon Sep 17 00:00:00 2001
From: jianweie code <jianweie@live.com>
Date: Wed, 18 Sep 2024 22:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=90=8E=E5=8F=B0=E5=8F=96=E6=B6=88=E5=B9=B6=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=90=8E=E7=9A=84=E5=88=86=E9=94=80=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E8=AE=A2=E5=8D=95=E4=BD=9C=E5=BA=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/CoreCmsOrderController.cs            | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
index 7b044ac1..7fb02d0b 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
@@ -68,6 +68,9 @@ namespace CoreCms.Net.Web.Admin.Controllers
         private readonly CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
         private readonly IWeChatShippingDeliveryServices _weChatShippingDeliveryServices;
 
+        private readonly ICoreCmsDistributionOrderServices _distributionOrderServices;
+        private readonly ICoreCmsAgentOrderServices _agentOrderServices;
+
 
         private readonly ICoreCmsOrderItemServices _orderItemServices;
 
@@ -85,7 +88,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             , ICoreCmsLogisticsServices logisticsServices
             , ICoreCmsBillPaymentsServices billPaymentsServices
             , ICoreCmsPaymentsServices paymentsServices
-            , ICoreCmsSettingServices settingServices, ICoreCmsUserWeChatInfoServices userWeChatInfoServices, IRedisOperationRepository redisOperationRepository, ICoreCmsBillDeliveryServices billDeliveryServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, ICoreCmsOrderItemServices orderItemServices, IWeChatShippingDeliveryServices weChatShippingDeliveryServices)
+            , ICoreCmsSettingServices settingServices, ICoreCmsUserWeChatInfoServices userWeChatInfoServices, IRedisOperationRepository redisOperationRepository, ICoreCmsBillDeliveryServices billDeliveryServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, ICoreCmsOrderItemServices orderItemServices, IWeChatShippingDeliveryServices weChatShippingDeliveryServices, ICoreCmsDistributionOrderServices distributionOrderServices, ICoreCmsAgentOrderServices agentOrderServices)
         {
             _webHostEnvironment = webHostEnvironment;
             _coreCmsOrderServices = coreCmsOrderServices;
@@ -103,6 +106,8 @@ namespace CoreCms.Net.Web.Admin.Controllers
             _weChatApiHttpClientFactory = weChatApiHttpClientFactory;
             _orderItemServices = orderItemServices;
             _weChatShippingDeliveryServices = weChatShippingDeliveryServices;
+            _distributionOrderServices = distributionOrderServices;
+            _agentOrderServices = agentOrderServices;
         }
 
         #region 获取列表============================================================
@@ -1736,6 +1741,17 @@ namespace CoreCms.Net.Web.Admin.Controllers
             }
 
             var result = await _coreCmsOrderServices.CancelOrderAndRefund(entity.id);
+
+            //退款成功，还要去注销分销或者代理订单的状态取消。
+            if (result.status)
+            {
+                //作废分销订单
+                await _distributionOrderServices.CancleOrderByOrderId(entity.id);
+                //作废代理订单
+                await _agentOrderServices.CancelOrderByOrderId(entity.id);
+
+            }
+
             jm.code = result.status ? 0 : 1;
             jm.msg = result.msg;