src/Hotline.Application/Orders/OrderApplication.cs

@@ -1876,8 +1876,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                     NoSatisfiedCount = it.NoSatisfiedCount, //不满意
                     NoEvaluateCount = it.NoEvaluateCount, //未做评价
                     NoPutThroughCount = it.NoPutThroughCount, //未接通
-                    NormalCount=it.NormalCount,
-                    VeryNoSatisfiedCount=it.VeryNoSatisfiedCount
+                    NormalCount = it.NormalCount,
+                    VeryNoSatisfiedCount = it.VeryNoSatisfiedCount
                 })
                 .ToListAsync();
         }
@@ -3457,7 +3457,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             order = _mapper.Map<Order>(dto);
             order.InitId();
             if (!string.IsNullOrEmpty(order.AcceptTypeCode))
-            { 
+            {
                 var acceptModel = _sysDicDataCacheManager.AcceptType.Where(x => x.DicDataValue == order.AcceptTypeCode).FirstOrDefault();
                 if (acceptModel != null)
                 {
@@ -3491,7 +3491,10 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             else
                 order.FileJson = new List<Share.Dtos.File.FileJson>();
             order.ReTransactNum++;
-            order.ProvinceReTransactNum= order.ProvinceReTransactNum+1;
+            if (order.ProvinceReTransactNum.HasValue)
+                order.ProvinceReTransactNum = order.ProvinceReTransactNum + 1;
+            else
+                order.ProvinceReTransactNum = 1;
 
             if (order.IsSecret == true)
             {
@@ -3966,8 +3969,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                          d.Status != EOrderStatus.HandOverToUnAccept)
             .WhereIF(dto.QueryType is 3,
                 d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id && os.IsDeleted == false && os.SpecialType == ESpecialType.ReTransact).Any())
-            .WhereIF(_appOptions.Value.IsZiGong,d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.IsDeleted == false && od.DelayState == EDelayState.Examining).NotAny())
-            .WhereIF(_appOptions.Value.IsZiGong,d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.IsDeleted == false && osba.State == ESendBackAuditState.Apply)
+            .WhereIF(_appOptions.Value.IsZiGong, d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.IsDeleted == false && od.DelayState == EDelayState.Examining).NotAny())
+            .WhereIF(_appOptions.Value.IsZiGong, d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.IsDeleted == false && osba.State == ESendBackAuditState.Apply)
                 .NotAny())
             .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(s => s.OrderId == d.Id && s.State == 0 && s.IsDeleted == false).NotAny())
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)