Merge branch 'release' of http://git.12345lm.cn/Fengwo/hotline into release

src/Hotline.Api/Controllers/HotSpotController.cs

@@ -216,7 +216,7 @@ namespace Hotline.Api.Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpPost("event/modify-event")]
+        [HttpPut("event/modify-event")]
         public async Task ModifyEventCategory([FromBody] ModifyEventCategoryDto dto)
         {
             var model = await _eventCategoryRepository.GetAsync(dto.Id, HttpContext.RequestAborted);

src/Hotline.Api/Controllers/OrderController.cs

@@ -3232,7 +3232,7 @@ public class OrderController : BaseController
             var pushTypeAny = await _orderPushTypeRepository.AnyAsync(x => x.OrderId == order.Id);
             if (pushTypeAny)
                 await _orderPushTypeRepository.RemoveAsync(x => x.OrderId == order.Id);
-            order.OrderPushTypes.ForEach(x => x.OrderId = order.Id);
+            dto.OrderPushTypes.ForEach(x => x.OrderId = order.Id);
             var orderPushTypes = _mapper.Map<List<OrderPushType>>(dto.OrderPushTypes);
             await _orderPushTypeRepository.AddRangeAsync(orderPushTypes);
             var pushTypes = dto.OrderPushTypes.Select(x => x.PushType);

src/Hotline.Application/Jobs/XingTangCallSatisfactionSyncJob.cs

@@ -27,7 +27,9 @@ namespace Hotline.Application.Jobs
         private readonly ILogger<XingTangCallSatisfactionSyncJob> _logger;
         private readonly ICapPublisher _capPublisher;
 
-        public XingTangCallSatisfactionSyncJob(IRepository<CallNative> callRepository, ISqlSugarClient db, IRepository<CallSatisfaction> callSatisfactionRepository, IMapper mapper, ILogger<XingTangCallSatisfactionSyncJob> logger, ICapPublisher capPublisher)
+        public XingTangCallSatisfactionSyncJob(IRepository<CallNative> callRepository, ISqlSugarClient db,
+            IRepository<CallSatisfaction> callSatisfactionRepository, IMapper mapper, ILogger<XingTangCallSatisfactionSyncJob> logger,
+            ICapPublisher capPublisher)
         {
             _callRepository = callRepository;
             _db = db;
@@ -49,6 +51,7 @@ namespace Hotline.Application.Jobs
                 .Take(10)
                 .ToListAsync(context.CancellationToken);
 
+            if (!callSatisfactions.Any()) return;
             var occupyCallSatisfactions = new List<XingtangSatisfaction>();
             foreach (var callSatisfaction in callSatisfactions)
             {
@@ -61,19 +64,22 @@ namespace Hotline.Application.Jobs
                     occupyCallSatisfactions.Add(callSatisfaction);
             }
 
+            if (!occupyCallSatisfactions.Any()) return;
             try
             {
                 var callStatisfactions = _mapper.Map<List<CallSatisfaction>>(occupyCallSatisfactions);
                 foreach (var item in callSatisfactions)
                 {
                     var call = _callRepository.Queryable().Where(x => x.CallNo == item.CallNo).FirstAsync();
-                    if(call != null)
+                    if (call != null)
                     {
                         item.Id = call.Id;
                     }
                 }
+
                 await _callSatisfactionRepository.AddRangeAsync(callStatisfactions, context.CancellationToken);
-                await _capPublisher.PublishAsync(EventNames.HotlineCallSatisfactionAdd, callStatisfactions, cancellationToken: context.CancellationToken);
+                await _capPublisher.PublishAsync(EventNames.HotlineCallSatisfactionAdd, callStatisfactions,
+                    cancellationToken: context.CancellationToken);
             }
             catch (Exception e)
             {
@@ -87,8 +93,6 @@ namespace Hotline.Application.Jobs
                     .UpdateColumns(d => new { d.IsSync })
                     .ExecuteCommandAsync(context.CancellationToken);
             }
-
-
         }
     }
-}
+}

src/Hotline.Application/Jobs/XingTangCallsSyncJob.cs

@@ -56,6 +56,7 @@ namespace Hotline.Application.Jobs
                 .Take(10)
                 .ToListAsync(context.CancellationToken);
 
+            if(!xingtangCalls.Any()) return;
             var occupyCalls = new List<XingtangCall>();
             foreach (var call in xingtangCalls)
             {
@@ -68,6 +69,7 @@ namespace Hotline.Application.Jobs
                     occupyCalls.Add(call);
             }
 
+            if(!occupyCalls.Any()) return;
             try
             {
                 var calls = _mapper.Map<List<CallNative>>(occupyCalls);

src/Hotline.Share/Dtos/Order/PublishedDto.cs

@@ -258,6 +258,11 @@ public class PublishPublishOrderDto
     /// </summary>
     public string Remark { get; set; }
 
+    /// <summary>
+    /// 答复口径
+    /// </summary>
+    public string AnswerContent { get; set; }
+
     #endregion
 }
 
@@ -300,6 +305,7 @@ public class PublishOrderDto
     /// 省是否公开
     /// </summary>
     public bool? ProPublishState { get; set; }
+
     /// <summary>
     /// 反馈人电话
     /// </summary>
@@ -335,6 +341,11 @@ public class PublishOrderDto
     /// </summary>
     public string? Remark { get; set; }
 
+    /// <summary>
+    /// 答复口径
+    /// </summary>
+    public string? AnswerContent { get; set; }
+
     #endregion
 
     /// <summary>

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.105</Version>
+    <Version>1.0.106</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Hotline/Orders/OrderPublish.cs

@@ -92,6 +92,12 @@ public class OrderPublish : FullStateEntity
     /// 备注
     /// </summary>
     public string? Remark { get; set; }
+
+    /// <summary>
+    /// 答复口径
+    /// </summary>
+    [SugarColumn(ColumnDataType = "varchar(8000)", IsNullable = true)]
+    public string? AnswerContent { get; set; }
     #endregion
 
     public bool? Resolve { get; set; }