重构 GroupsController.cs，调整事务处理逻辑

在 `GroupsController.cs` 中重构了参数验证和权限验证逻辑，注释掉了事务处理的开始和提交，调整了错误信息的返回内容，并在 `RateRecordSave` 方法中修改了参数以区分状态。同时，在 `EnterExitCostDraftRepository.cs` 中添加了对 `subData` 和 `dto.DayOtherPriceData` 的处理，确保在添加操作时将其 ID 重置为 0。

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -715,8 +715,6 @@ namespace OASystem.API.Controllers
             int diId = 0;
             try
             {
-
-                
                 //添加时 默认加入团组汇率
                 if (dto.Status == 1) //添加
                 {
@@ -860,22 +858,23 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GroupProcessOperation(GroupProcessOperationDto dto)
         {
-            try
-            {
-                #region  参数验证
-                if (dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数"));
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                #region 页面操作权限验证
-                //pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, 104);
-                //if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "客户名单您没有添加权限!"));
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, 27);
-                if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "团组操作您没有添加权限!"));
-                #endregion
+            #region  参数验证
+            if (dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数"));
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                #endregion
+            #region 页面操作权限验证
+            //pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, 104);
+            //if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "客户名单您没有添加权限!"));
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, 27);
+            if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "团组操作您没有添加权限!"));
+            #endregion
 
-                _sqlSugar.BeginTran();
+            #endregion
+
+            try
+            {
+                //_sqlSugar.BeginTran();
 
                 decimal ffrPrice = 0.00M;
                 DateTime? visitDt = null;
@@ -955,6 +954,7 @@ namespace OASystem.API.Controllers
                     diId = dto.Id;
                     if (diId == 0)
                     {
+                        //_sqlSugar.RollbackTran();
                         return Ok(JsonView(false, "修改失败！ 未添加团组id" + groupData.Msg));
                     }
                 }
@@ -963,11 +963,10 @@ namespace OASystem.API.Controllers
 
                 if (viewData.Code != 0)
                 {
-                    _sqlSugar.RollbackTran();
+                    //_sqlSugar.RollbackTran();
                     return Ok(JsonView(false, "客户名单添加失败！" + viewData.Msg));
                 }
 
-
                 #region 团组操作默认添加/修改收款账单
                 if (dto.PayDay > 0 && dto.PaymentMoney > 0)
                 {
@@ -1037,7 +1036,7 @@ namespace OASystem.API.Controllers
 
                 #endregion
 
-                _sqlSugar.CommitTran();
+                //_sqlSugar.CommitTran();
                 return Ok(JsonView(true, "添加成功"));
             }
             catch (Exception ex)
@@ -7353,7 +7352,7 @@ FROM
 
             int sign = (int)data.Data.GetType().GetProperty("sign").GetValue(data.Data, null);
             //汇率信息记录
-            await GeneralMethod.RateRecordSave(dto.UserId, sign, "出入境费用");
+            await GeneralMethod.RateRecordSave(dto.UserId, sign, "出入境费用-草稿");
 
             return Ok(JsonView(true, data.Msg, data.Data));
         }

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostDraftRepository.cs

@@ -183,6 +183,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             result.Msg = "添加操作失败!";
                             return result;
                         }
+                        subData.Select(x => { x.Id = 0; return x; }).ToList();
+                        dto.DayOtherPriceData.Select(x => { x.Id = 0; return x; }).ToList();
+
                     }
 
                     if (enterExitId > 0)