收款退还 --> 增加 对方开户行、对方卡号 字段

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1605,26 +1605,8 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostPaymentRefundAndOtherMoneyInfo(PaymentRefundAndOtherMoneyInfoDto dto)
         {
-            try
-            {
-                if (dto == null)
-                {
-                    return Ok(JsonView(false, "参数不能为空!"));
-                }
-
-                Result _result = await _paymentRefundAndOtherMoneyRep._Info(dto);
-
-                if (_result.Code != 0)
-                {
-                    return Ok(JsonView(false, _result.Msg));
-                }
-
-                return Ok(JsonView(true, "查询成功!", _result.Data));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
-            }
+            if (dto == null) return Ok(JsonView(false, "参数不能为空!"));
+            return Ok(_paymentRefundAndOtherMoneyRep._Info(dto));
         }
 
         /// <summary>
@@ -1637,50 +1619,28 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostPaymentRefundAndOtherMoneyAddOrEdit(PaymentRefundAndOtherMoneyAddOrEditDto dto)
         {
-            try
-            {
-                if (dto == null) return Ok(JsonView(false, "参数不能为空!"));
-                if (dto.PageId <= 0) return Ok(JsonView(false, "请传入正确的的页面Id!"));
-                if (dto.UserId <= 0) return Ok(JsonView(false, "请传入正确的的员工Id!"));
+            if (dto == null) return Ok(JsonView(false, "参数不能为空!"));
+            if (dto.PageId <= 0) return Ok(JsonView(false, "请传入正确的的页面Id!"));
+            if (dto.UserId <= 0) return Ok(JsonView(false, "请传入正确的的员工Id!"));
 
-                #region 页面功能权限处理
-                PageFunAuthViewBase pageFunAuth = new PageFunAuthViewBase();
-                pageFunAuth = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
+            #region 页面功能权限处理
+            PageFunAuthViewBase pageFunAuth = new PageFunAuthViewBase();
+            pageFunAuth = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
-                #endregion
-
-                if (dto.Status == 1) //add
-                {
-                    if (pageFunAuth.AddAuth == 0)
-                    {
-                        return Ok(JsonView(false, "您没有当前页面添加权限!"));
-                    }
-                }
-                else if (dto.Status == 2) //edit
-                {
-                    if (pageFunAuth.EditAuth == 0)
-                    {
-                        return Ok(JsonView(false, "您没有当前页面编辑权限!"));
-                    }
-                }
-                else
-                {
-                    return Ok(JsonView(false, "请输入正确的操作状态! 1 添加 2 修改!"));
-                }
-
-                Result _result = await _paymentRefundAndOtherMoneyRep._AddOrEdit(dto);
-
-                if (_result.Code != 0)
-                {
-                    return Ok(JsonView(false, _result.Msg));
-                }
+            #endregion
 
-                return Ok(JsonView(true, "操作成功!"));
+            if (dto.Status == 1) //add
+            {
+                if (pageFunAuth.AddAuth == 0) return Ok(JsonView(false, "您没有当前页面添加权限!"));
             }
-            catch (Exception ex)
+            else if (dto.Status == 2) //edit
             {
-                return Ok(JsonView(false, ex.Message));
+                if (pageFunAuth.EditAuth == 0) return Ok(JsonView(false, "您没有当前页面编辑权限!"));
             }
+            else return Ok(JsonView(false, "请输入正确的操作状态! 1 添加 2 修改!"));
+
+            return Ok(await _paymentRefundAndOtherMoneyRep._AddOrEdit(dto));
+
         }
         #endregion
 

OASystem/OASystem.Domain/Dtos/Financial/PaymentRefundAndOtherMoneyDto.cs

@@ -122,5 +122,14 @@ namespace OASystem.Domain.Dtos.Financial
         /// 备注
         /// </summary>
         public string? Remark { get; set; }
+
+        /// <summary>
+        /// 对方开户行
+        /// </summary>
+        public string OtherBankName { get; set; }
+        /// <summary>
+        /// 对方银行账号
+        /// </summary>
+        public string OtherSideNo { get; set; }
     }
 }

OASystem/OASystem.Domain/ViewModels/Financial/Fin_PaymentRefundAndOtherMoneyView.cs

@@ -139,6 +139,14 @@ namespace OASystem.Domain.ViewModels.Financial
         /// 备注
         /// </summary>
         public string? Remark { get; set; }
+        /// <summary>
+        /// 对方开户行
+        /// </summary>
+        public string OtherBankName { get; set; }
+        /// <summary>
+        /// 对方银行账号
+        /// </summary>
+        public string OtherSideNo { get; set; }
 
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Financial/PaymentRefundAndOtherMoneyRepository.cs

@@ -173,23 +173,44 @@ namespace OASystem.Infrastructure.Repositories.Financial
         /// </summary>
         /// <param name="diId"></param>
         /// <returns></returns>
-        public async Task<Result> _Info(PaymentRefundAndOtherMoneyInfoDto dto)
+        public async Task<JsonView> _Info(PaymentRefundAndOtherMoneyInfoDto dto)
         {
+            var _view = new JsonView() { Code = StatusCodes.Status204NoContent };
            
             if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3)  //1 Web 2 Android 3 Ios
             {
-                string sql = string.Format(@"Select prom.Id,ccp.Id CcpId,prom.DiId,prom.PriceName,prom.Price,prom.CurrencyId,ccp.Payee,ccp.PayDId,
-										 ccp.OrbitalPrivateTransfer,ccp.ConsumptionPatterns,prom.PayType,prom.Remark
-										 From Fin_PaymentRefundAndOtherMoney prom 
-										 Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 285 And ccp.IsDel = 0
-										 Where prom.IsDel = 0 And ccp.DIId = prom.DiId And prom.Id = {0}", dto.Id);
+                string sql = string.Format(@"
+SELECT
+  prom.Id,
+  ccp.Id CcpId,
+  prom.DiId,
+  prom.PriceName,
+  prom.Price,
+  prom.CurrencyId,
+  ccp.Payee,
+  ccp.PayDId,
+  ccp.OrbitalPrivateTransfer,
+  ccp.ConsumptionPatterns,
+  prom.PayType,
+  prom.Remark,
+  ccp.OtherBankName,
+  ccp.OtherBankName
+FROM
+  Fin_PaymentRefundAndOtherMoney prom
+  LEFT JOIN Grp_CreditCardPayment ccp ON ccp.CId = prom.id
+  AND ccp.CTable = 285
+  AND ccp.IsDel = 0
+WHERE
+  prom.IsDel = 0
+  AND ccp.DIId = prom.DiId
+  AND prom.Id = {0}", dto.Id);
                 var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyInfoView>(sql).FirstAsync();
 
                 if (data != null)
                 {
-                    _result.Data = data;
-                    _result.Code = 0;
-                    _result.Msg = "查询成功!";
+                    _view.Data = data;
+                    _view.Code = 200;
+                    _view.Msg = "查询成功!";
                 }
                 else
                 {
@@ -199,10 +220,10 @@ namespace OASystem.Infrastructure.Repositories.Financial
             }
             else
             {
-                _result.Msg = "请输入正确的端口号! 1 Web 2 Android 3 Ios;";
+                _view.Msg = "请输入正确的端口号! 1 Web 2 Android 3 Ios;";
             }
            
-            return _result;
+            return _view;
         }
 
         /// <summary>
@@ -210,8 +231,9 @@ namespace OASystem.Infrastructure.Repositories.Financial
         /// </summary>
         /// <param name="diId"></param>
         /// <returns></returns>
-        public async Task<Result> _AddOrEdit(PaymentRefundAndOtherMoneyAddOrEditDto dto)
+        public async Task<JsonView> _AddOrEdit(PaymentRefundAndOtherMoneyAddOrEditDto dto)
         {
+            var _view = new JsonView() { Code = StatusCodes.Status204NoContent };
             if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3)  //1 Web 2 Android 3 Ios
             {
                 #region 参数处理
@@ -285,8 +307,8 @@ namespace OASystem.Infrastructure.Repositories.Financial
                     PaymentCurrency = dto.CurrencyId,
                     DayRate = dayRate,
                     CompanyBankNo = string.Empty,
-                    OtherBankName = string.Empty,
-                    OtherSideNo = string.Empty,
+                    OtherBankName = dto.OtherBankName,
+                    OtherSideNo = dto.OtherSideNo,
                     OtherSideName = string.Empty,
                     MFOperator = 0,
                     MFOperatorDate = string.Empty,
@@ -322,18 +344,35 @@ namespace OASystem.Infrastructure.Repositories.Financial
                 {
                     #region 添加数据验证
 
-                    string sql = string.Format(@"Select prom.Id,ccp.Id CcpId,prom.DiId,prom.PriceName,prom.Price,prom.CurrencyId,ccp.Payee,ccp.PayDId,
-										 ccp.OrbitalPrivateTransfer,ccp.ConsumptionPatterns,prom.PayType,prom.Remark
-										 From Fin_PaymentRefundAndOtherMoney prom 
-										 Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 285 
-										 Where prom.IsDel = 0 And ccp.IsDel = 0 And ccp.DIId = prom.DiId And prom.PriceName = '{0}'",
-                                         _PaymentRefundAndOtherMoney.PriceName);
+                    string sql = string.Format(@"
+SELECT
+  prom.Id,
+  ccp.Id CcpId,
+  prom.DiId,
+  prom.PriceName,
+  prom.Price,
+  prom.CurrencyId,
+  ccp.Payee,
+  ccp.PayDId,
+  ccp.OrbitalPrivateTransfer,
+  ccp.ConsumptionPatterns,
+  prom.PayType,
+  prom.Remark
+FROM
+  Fin_PaymentRefundAndOtherMoney prom
+  LEFT JOIN Grp_CreditCardPayment ccp ON ccp.CId = prom.id
+  AND ccp.CTable = 285
+WHERE
+  prom.IsDel = 0
+  AND ccp.IsDel = 0
+  AND ccp.DIId = prom.DiId
+  AND prom.PriceName = '{0}'",_PaymentRefundAndOtherMoney.PriceName);
                     var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyInfoView>(sql).FirstAsync();
 
                     if (data != null)
                     {
-                        _result.Msg = "费用名称已存在,请勿重新添加!";
-                        return _result;
+                        _view.Msg = "费用名称已存在,请勿重新添加!";
+                        return _view;
                     }
                    
                     #endregion
@@ -344,22 +383,22 @@ namespace OASystem.Infrastructure.Repositories.Financial
 
                     if (addReturnId <= 0)
                     {
-                        _result.Msg = "操作失败!收款退还与其他款项添加失败!";
+                        _view.Msg = "操作失败!收款退还与其他款项添加失败!";
                         _sqlSugar.RollbackTran();
-                        return _result;
+                        return _view;
                     }
                     _CreditCardPayment.CId = addReturnId;
                     var addStatus = await _sqlSugar.Insertable(_CreditCardPayment).ExecuteReturnIdentityAsync();
                     if (addStatus <= 0)
                     {
-                        _result.Msg = "操作失败!付款类型添加失败!";
+                        _view.Msg = "操作失败!付款类型添加失败!";
                         _sqlSugar.RollbackTran();
-                        return _result;
+                        return _view;
                     }
 
                     _sqlSugar.CommitTran();
-                    _result.Msg = "操作成功!";
-                    _result.Code = 0;
+                    _view.Msg = "操作成功!";
+                    _view.Code = 200;
                 }
                 else if (dto.Status == 2) //修改
                 {
@@ -376,9 +415,9 @@ namespace OASystem.Infrastructure.Repositories.Financial
 
                     if (prom_update <= 0)
                     {
-                        _result.Msg = "操作失败!收款退还与其他款项修改失败!";
+                        _view.Msg = "操作失败!收款退还与其他款项修改失败!";
                         _sqlSugar.RollbackTran();
-                        return _result;
+                        return _view;
                     }
 
                     var ccp_update = await _sqlSugar.Updateable(_CreditCardPayment)
@@ -398,27 +437,20 @@ namespace OASystem.Infrastructure.Repositories.Financial
                                                    .ExecuteCommandAsync();
                     if (ccp_update <= 0)
                     {
-                        _result.Msg = "操作失败!付款信息修改失败!";
+                        _view.Msg = "操作失败!付款信息修改失败!";
                         _sqlSugar.RollbackTran();
-                        return _result;
+                        return _view;
                     }
 
                     _sqlSugar.CommitTran();
-                    _result.Msg = "操作成功!";
-                    _result.Code = 0;
-                }
-                else
-                {
-                    _result.Msg = "请输入正确的操作状态! 1 添加 2 修改;";
+                    _view.Msg = "操作成功!";
+                    _view.Code = 200;
                 }
-
-            }
-            else
-            {
-                _result.Msg = "请输入正确的端口号! 1 Web 2 Android 3 Ios;";
+                else _view.Msg = "请输入正确的操作状态! 1 添加 2 修改;";
             }
+            else _view.Msg = "请输入正确的端口号! 1 Web 2 Android 3 Ios;";
 
-            return _result;
+            return _view;
         }
     }
 }