Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -6013,9 +6013,12 @@ public class OrderController : BaseController
                                   cityBase.CityProvinceAssign.OrgId.Equals(model.OrgId) || cityBase.CityEnterprise.OrgId.Equals(model.OrgId) ||
                                   cityBase.PublicSecurity.OrgId.Equals(model.OrgId)))
             {
-                await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderFlowRecalled,
-                    new PublishSpecialDto { Order = _mapper.Map<OrderDto>(order), Special = _mapper.Map<OrderSpecialDto>(model) },
-                    cancellationToken: HttpContext.RequestAborted);
+                if (order.Status < EOrderStatus.Filed)
+                {
+					await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderFlowRecalled,
+				   new PublishSpecialDto { Order = _mapper.Map<OrderDto>(order), Special = _mapper.Map<OrderSpecialDto>(model) },
+				   cancellationToken: HttpContext.RequestAborted);
+				}
 
                 //try
                 //{
@@ -6437,9 +6440,13 @@ public class OrderController : BaseController
                                   cityBase.CityProvinceAssign.OrgId.Equals(special.OrgId) || cityBase.CityEnterprise.OrgId.Equals(special.OrgId) ||
                                   cityBase.PublicSecurity.OrgId.Equals(special.OrgId)))
             {
-                await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderFlowRecalled,
-                    new PublishSpecialDto { Order = _mapper.Map<OrderDto>(order), Special = _mapper.Map<OrderSpecialDto>(special) },
-                    cancellationToken: HttpContext.RequestAborted);
+                if (order.Status < EOrderStatus.Filed) 
+                {
+					await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderFlowRecalled,
+						new PublishSpecialDto { Order = _mapper.Map<OrderDto>(order), Special = _mapper.Map<OrderSpecialDto>(special) },
+						cancellationToken: HttpContext.RequestAborted);
+				}
+					
             }
         }
         else
@@ -6626,9 +6633,12 @@ public class OrderController : BaseController
                                       cityBase.CityEnterprise.OrgId.Equals(special.OrgId) ||
                                       cityBase.PublicSecurity.OrgId.Equals(special.OrgId)))
                 {
-                    await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderFlowRecalled,
-                        new PublishSpecialDto { Order = _mapper.Map<OrderDto>(order), Special = _mapper.Map<OrderSpecialDto>(special) },
-                        cancellationToken: HttpContext.RequestAborted);
+                    if (order.Status < EOrderStatus.Filed) 
+                    {
+						await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderFlowRecalled,
+							new PublishSpecialDto { Order = _mapper.Map<OrderDto>(order), Special = _mapper.Map<OrderSpecialDto>(special) },
+							cancellationToken: HttpContext.RequestAborted);
+					}
                 }
             }
             else