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

src/Hotline.Api/Controllers/OrderController.cs

@@ -398,7 +398,7 @@ public class OrderController : BaseController
                 .OrderByDescending(m => m.CreationTime).FirstAsync(HttpContext.RequestAborted);
             if (publishedDeleted != null && _sessionContext.RequiredUserId != publishedDeleted.CreatorId)
             {
-                throw UserFriendlyException.SameMessage($"改工单被取消发布过, 之前的发布人是 [{publishedDeleted.CreatorName}], 您不能发布;");
+                throw UserFriendlyException.SameMessage($"该工单被取消发布过, 之前的发布人是 [{publishedDeleted.CreatorName}], 您不能发布;");
             }
         }
 

src/Hotline.Application.Tests/Application/XingTangCallsSyncJobTest.cs

@@ -34,6 +34,7 @@ public class XingTangCallsSyncJobTest
         inDto.Tries = 0;
         inDto.CallGuid = DateTime.Now.ToString("yyyyMMddhhmmss") + "FLOW";
         inDto.Ver = string.Empty;
+        inDto.Id = new Random().Next(0, 100000);
 
         var inDto2 = _fixture.Create<XingtangCall>();
         inDto2.CallStartTime = DateTime.Now;
@@ -41,6 +42,7 @@ public class XingTangCallsSyncJobTest
         inDto2.IsSync = false;
         inDto2.Tries = 0;
         inDto2.Ver = string.Empty;
+        inDto2.Id = new Random().Next(0, 100000);
 
         await _db.Insertable(inDto).ExecuteCommandAsync();
         await _db.Insertable(inDto2).ExecuteCommandAsync();

src/Hotline.Application.Tests/Domain/OrderVisitDomainServiceTest.cs

@@ -102,6 +102,7 @@ public class OrderVisitDomainServiceTest : TestBase
     [InlineData("一般", "Visited", "4", "满意")]
     [InlineData("不满意", "SMSUnsatisfied", "2", "不满意")]
     [InlineData("非常不满意", "SMSUnsatisfied", "2", "不满意")]
+    [InlineData("0", "Visited", "0", "默认满意")]
     public async Task UpdateSmsReply_Test(string content, string visitState, string orgResuktKey, string orgResuktValue)
     {
         SetZuoXi();

src/Hotline.Application.Tests/appsettings.Development.json

@@ -111,7 +111,7 @@
             "UserName": "dev",
             "Password": "123456",
             "HostName": "110.188.24.182",
-            "VirtualHost": "fwt-unit-test"
+            "VirtualHost": "fwt-dev"
         }
     },
     //"SmsAccountInfo": {

src/Hotline/Orders/OrderVisitDomainService.cs

@@ -74,7 +74,7 @@ public class OrderVisitDomainService : IOrderVisitDomainService, IScopeDependenc
             { "3", $"一般|{EVisitState.Visited}|{ESeatEvaluate.Normal}|{EVoiceEvaluate.Normal}|4"},
             { "4", $"不满意|{EVisitState.SMSUnsatisfied}|{ESeatEvaluate.NoSatisfied}|{EVoiceEvaluate.NoSatisfied}|2"},
             { "5", $"非常不满意|{EVisitState.SMSUnsatisfied}|{ESeatEvaluate.NoSatisfied}|{EVoiceEvaluate.VeryNoSatisfied}|2"},
-            { "默认满意", $"默认满意|{EVisitState.Visited}|{ESeatEvaluate.DefaultSatisfied}|{EVoiceEvaluate.DefaultSatisfied}|0"},
+            { "0", $"默认满意|{EVisitState.Visited}|{ESeatEvaluate.DefaultSatisfied}|{EVoiceEvaluate.DefaultSatisfied}|0"},
         };
         replyTxt = replyTxt.Trim();
         if (ReplyToEnumMap.TryGetValue(replyTxt, out var result) == false)
@@ -120,7 +120,8 @@ public class OrderVisitDomainService : IOrderVisitDomainService, IScopeDependenc
             .FirstAsync()
             .Then(async orderVisit =>
             {
-                await UpdateSmsReplyAsync(orderVisit, "默认满意");
+                // 默认满意
+                await UpdateSmsReplyAsync(orderVisit, "0");
             });
     }