Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -1132,7 +1132,7 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
 
         if (currentStep.IsInCountersign())
         {
-            if (currentStep.IsCountersignEndStep)
+            if (currentStep.IsCountersignEndStep && !currentStep.IsTopCountersignEndStep(workflow.TopCountersignStepId))
             {
                 //汇总节点（非顶级）
                 var csStartStep = workflow.Steps.FirstOrDefault(d => d.Id == currentStep.CountersignStartStepId);

src/Hotline.Repository.SqlSugar/Hotline.Repository.SqlSugar.csproj

@@ -14,11 +14,4 @@
     <ProjectReference Include="..\Hotline\Hotline.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Knowledge\" />
-    <Folder Include="Push\FWMessage\" />
-    <Folder Include="Ts\" />
-    <Folder Include="Users\" />
-  </ItemGroup>
-
 </Project>

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

@@ -129,7 +129,7 @@ public class OrderExtensionDto
     /// <summary>
     /// 消费金额，只能填写数字，且只能填写非负数
     /// </summary>
-    public decimal? Amount { get; set; }
+    public double? Amount { get; set; }
 
     /// <summary>
     /// 客体类别
@@ -495,7 +495,7 @@ public class OrderExtensionDto
     /// <summary>
     /// 涉及金额
     /// </summary>
-    public string? MailAmount { get; set; }
+    public double? MailAmount { get; set; }
 
     /// <summary>
     /// 是否联系快递公司投诉

src/Hotline/Hotline.csproj

@@ -16,7 +16,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Hotline.Share\Hotline.Share.csproj" />
-    <ProjectReference Include="..\Tr.Sdk\Tr.Sdk.csproj" />
     <ProjectReference Include="..\XF.Domain.Repository\XF.Domain.Repository.csproj" />
   </ItemGroup>
 

src/Hotline/Orders/OrderExtension.cs

@@ -129,7 +129,7 @@ public class OrderExtension : CreationEntity
     /// <summary>
     /// 消费金额，只能填写数字，且只能填写非负数
     /// </summary>
-    public decimal? Amount { get; set; }
+    public double? Amount { get; set; }
 
     /// <summary>
     /// 客体类别
@@ -497,7 +497,7 @@ public class OrderExtension : CreationEntity
     /// <summary>
     /// 涉及金额
     /// </summary>
-    public string? MailAmount { get; set; }
+    public double? MailAmount { get; set; }
 
     /// <summary>
     /// 是否联系快递公司投诉

src/Hotline/Users/UserDomainService.cs

@@ -6,7 +6,6 @@ using Hotline.Share.Dtos.TrCallCenter;
 using Hotline.Share.Dtos.Users;
 using MapsterMapper;
 using System.Security.Cryptography;
-using Tr.Sdk;
 using XF.Domain.Authentications;
 using XF.Domain.Cache;
 using XF.Domain.Constants;
@@ -26,7 +25,6 @@ namespace Hotline.Users
         private readonly ITypedCache<Work> _cacheWork;
         private readonly IMapper _mapper;
         private readonly ISystemSettingCacheManager _systemSettingCacheManager;
-        private readonly ITrClient _trClient;
         private readonly ISessionContext _sessionContext;
 
         public UserDomainService(
@@ -38,7 +36,6 @@ namespace Hotline.Users
             IMapper mapper,
             ITelCacheManager telCacheManager,
             ISystemSettingCacheManager systemSettingCacheManager,
-            ITrClient trClient,
             ISessionContext sessionContext
             )
         {
@@ -50,7 +47,6 @@ namespace Hotline.Users
             _mapper = mapper;
             _telCacheManager = telCacheManager;
             _systemSettingCacheManager = systemSettingCacheManager;
-            _trClient = trClient;
             _sessionContext = sessionContext;
         }
 
@@ -153,20 +149,20 @@ namespace Hotline.Users
 
             bool IsTelNeedVerify = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.IsTelNeedVerify).SettingValue[0]);
 
-            var telModel = await _trClient.QueryTelsAsync(new Tr.Sdk.Tels.QueryTelRequest() { TelNo = telNo }, cancellationToken);
-            if (telModel!=null && telModel.Count>0)
-            {
-                work = new Work(userId, _sessionContext.UserName, telModel[0].Id, telNo, telModel[0].Password, telModel[0].Description);
-                await _workRepository.AddAsync(work, cancellationToken);
-                if (IsTelNeedVerify)
-                {
-                    return new TrOnDutyResponseDto() { TelNo = telNo, TelPwd = "", Description = telModel[0].Description };
-                }
-                else
-                {
-                    return new TrOnDutyResponseDto() { TelNo = telNo, TelPwd = telModel[0].Password, Description = telModel[0].Description };
-                }
-            }
+            //var telModel = await _trClient.QueryTelsAsync(new Tr.Sdk.Tels.QueryTelRequest() { TelNo = telNo }, cancellationToken);
+            //if (telModel!=null && telModel.Count>0)
+            //{
+            //    work = new Work(userId, _sessionContext.UserName, telModel[0].Id, telNo, telModel[0].Password, telModel[0].Description);
+            //    await _workRepository.AddAsync(work, cancellationToken);
+            //    if (IsTelNeedVerify)
+            //    {
+            //        return new TrOnDutyResponseDto() { TelNo = telNo, TelPwd = "", Description = telModel[0].Description };
+            //    }
+            //    else
+            //    {
+            //        return new TrOnDutyResponseDto() { TelNo = telNo, TelPwd = telModel[0].Password, Description = telModel[0].Description };
+            //    }
+            //}
             throw UserFriendlyException.SameMessage("签入异常，未查询到对应分机信息");
             /*
              *var work = 缓存.get(userId);