src/Sharing.Api/Controllers/HotlineMessageReceiveController.cs

@@ -170,7 +170,7 @@ namespace Sharing.Api.Controllers
             _formMarketRepository = formMarketRepository;
             _provinceService = provinceService;
             _config = config;
-            AreaCode = _config.GetSection("AreaCode").Get<string>();//获取文件上传配置
+            AreaCode = _config.GetSection("AreaCode").Get<string>();//获取区域配置信息
         }
         #endregion
 
@@ -357,7 +357,6 @@ namespace Sharing.Api.Controllers
         [CapSubscribe(Hotline.Share.Mq.EventNames.HotlineOrderCreated)]
         public async Task ReceiveOrderCreated(OrderDto dto)
         {
-            dto.AreaCode= AreaCode;
             var submitCaseInfo =await _provinceService.InitData(dto);
 
             await _mediator.Publish(new OrderCreatedNotification(submitCaseInfo));
@@ -372,7 +371,20 @@ namespace Sharing.Api.Controllers
         [CapSubscribe(Hotline.Share.Mq.EventNames.HotlineOrderCenterToOrg)]
         public async Task OrderCenterToOrg(OrderDto dto)
         {
-            dto.AreaCode = AreaCode;
+            var submitCaseInfo = await _provinceService.InitData(dto);
+
+            await _mediator.Publish(new OrderCreatedNotification(submitCaseInfo));
+        }
+
+        /// <summary>
+        /// 工单发布
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [NonAction]
+        [CapSubscribe(Hotline.Share.Mq.EventNames.HotlineOrderPublished)]
+        public async Task OrderPublished(OrderDto dto)
+        {
             var submitCaseInfo = await _provinceService.InitData(dto);
 
             await _mediator.Publish(new OrderCreatedNotification(submitCaseInfo));

src/Sharing.Api/ProvinceService.cs

@@ -16,20 +16,24 @@ namespace Sharing.Api
         private readonly ITypedCache<CacheOrderNO> _cacheOrderNo;
         private readonly ISubmitCaseInfoRepository _submitCaseInfoRepository;
         private readonly IMapper _mapper;
+        private readonly IConfiguration _config;
+        private readonly string AreaCode = "";
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="cacheOrderNo"></param>
-        public ProvinceService(ITypedCache<CacheOrderNO> cacheOrderNo, ISubmitCaseInfoRepository submitCaseInfoRepository, IMapper mapper)
+        public ProvinceService(ITypedCache<CacheOrderNO> cacheOrderNo, ISubmitCaseInfoRepository submitCaseInfoRepository, IMapper mapper, IConfiguration config)
         {
             _cacheOrderNo = cacheOrderNo;
             _submitCaseInfoRepository = submitCaseInfoRepository;
             _mapper = mapper;
+            _config = config;
+            AreaCode = _config.GetSection("AreaCode").Get<string>();//获取区域配置信息
         }
 
         /// <summary>
-        /// 数据处理
+        /// 工单创建数据处理
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -39,6 +43,9 @@ namespace Sharing.Api
                 dto.EmployeeName = "8010";
             if (string.IsNullOrEmpty(dto.EmployeeStaffNo))
                 dto.EmployeeStaffNo = "8010";
+            if (string.IsNullOrEmpty(dto.AreaCode))
+                dto.AreaCode = AreaCode;
+
             var submitCaseInfo = _mapper.Map<SubmitCaseInfo>(dto);
 
             //如果省和市相同直接用市，也就是直辖市的情况
@@ -169,28 +176,9 @@ namespace Sharing.Api
             return submitCaseInfo;
         }
 
+        #region 私有方法
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="today"></param>
-        /// <returns></returns>
-        //public string GenerateNewOrderNo(DateTime today)
-        //{
-        //    var cacheKey = $"{OrderNoPrefix}{today:yyyyMMdd}";
-
-        //    var cacheOrderNo = _cacheOrderNo.Get(cacheKey);
-        //    if (cacheOrderNo == null)
-        //    {
-        //        cacheOrderNo = new CacheOrderNO { TotalCount = 0 };
-        //    }
-
-        //    cacheOrderNo!.TotalCount += 1;
-        //    var no = GenerateOrderNo(today, cacheOrderNo.TotalCount);
-        //    _cacheOrderNo.Set(cacheKey, cacheOrderNo);
-        //    return no;
-        //}
-
+        #region 生成省编号
         private string GenerateNewOrderNo(DateTime today)
         {
             var cacheKey = $"{OrderNoPrefix}{today:yyyyMMdd}";
@@ -221,5 +209,8 @@ namespace Sharing.Api
         {
             public int TotalCount { get; set; }
         }
+        #endregion
+
+        #endregion
     }
 }