其他款项 数据库，api 增加 开户行，银行卡号，对方姓名，社交账号，邮箱，供应商地址 字段

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2900,13 +2900,7 @@ namespace OASystem.API.Controllers
 
             #endregion
 
-            var res = await _decreasePaymentsRep.DecreasePaymentsSelect(dto);
-            if (res.Code != 0)
-            {
-                return Ok(JsonView(false, res.Msg));
-            }
-
-            return Ok(JsonView(true, "操作成功!", res.Data));
+            return Ok(await _decreasePaymentsRep.DecreasePaymentsSelect(dto));
 
         }
 
@@ -2919,26 +2913,14 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> DecreasePaymentsList(DecreasePaymentsListDto dto)
         {
-            try
-            {
-                #region 参数验证
+            #region 参数验证
 
-                if (dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数!"));
-                if (dto.DiId < 1) return Ok(JsonView(false, "请传入有效的DiId参数!"));
+            if (dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数!"));
+            if (dto.DiId < 1) return Ok(JsonView(false, "请传入有效的DiId参数!"));
 
-                #endregion
+            #endregion
 
-                Result groupData = await _decreasePaymentsRep.DecreasePaymentsList(dto);
-                if (groupData.Code != 0)
-                {
-                    return Ok(JsonView(false, groupData.Msg));
-                }
-                return Ok(JsonView(true, groupData.Msg, groupData.Data));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-            }
+            return Ok(await _decreasePaymentsRep.DecreasePaymentsList(dto));
         }
 
         /// <summary>
@@ -2950,24 +2932,18 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> OpDecreasePayments(DecreasePaymentsOpDto dto)
         {
-
-            Result groupData = await _decreasePaymentsRep.OpDecreasePayments(dto);
-            if (groupData.Code != 0)
+            JsonView groupData = await _decreasePaymentsRep.OpDecreasePayments(dto);
+            if (groupData.Code != 200)
             {
                 return Ok(JsonView(false, groupData.Msg));
             }
 
             #region 应用推送
-            try
-            {
-                int ccpId = groupData.Data.GetType().GetProperty("ccpId").GetValue(groupData.Data, null);
-                int sign = groupData.Data.GetType().GetProperty("sign").GetValue(groupData.Data, null);
+            int ccpId = (int)groupData.Data.GetType().GetProperty("ccpId").GetValue(groupData.Data, null);
+            int sign = (int)groupData.Data.GetType().GetProperty("sign").GetValue(groupData.Data, null);
 
-                await AppNoticeLibrary.SendChatMsg_GroupStatus_ApplyFee(ccpId, sign, QiyeWeChatEnum.GuoJiaoLeaderChat);
-            }
-            catch (Exception ex)
-            {
-            }
+            await AppNoticeLibrary.SendChatMsg_GroupStatus_ApplyFee(ccpId, sign, QiyeWeChatEnum.GuoJiaoLeaderChat);
+           
             #endregion
 
             return Ok(JsonView(true, groupData.Msg, groupData.Data));
@@ -3006,12 +2982,7 @@ namespace OASystem.API.Controllers
         {
             if (dto.Id < 1) return Ok(JsonView(false, "请传入有效的数据Id！"));
 
-            Result groupData = await _decreasePaymentsRep.QueryDecreasePaymentsById(dto);
-            if (groupData.Code != 0)
-            {
-                return Ok(JsonView(false, groupData.Msg));
-            }
-            return Ok(JsonView(true, groupData.Msg, groupData.Data));
+            return Ok(await _decreasePaymentsRep.QueryDecreasePaymentsById(dto));
 
         }
 
@@ -10324,14 +10295,14 @@ namespace OASystem.API.Controllers
             if (groupAuthView.Code != 0) return Ok(JsonView(false, groupAuthView.Msg));
             #endregion
 
-            //PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-            //#region 页面操作权限验证
-            //pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
 
-            //if (pageFunAuthView.FilesDownloadAuth == 0) return Ok(JsonView(false, "您没有文件下载权限!"));
+            if (pageFunAuthView.FilesDownloadAuth == 0) return Ok(JsonView(false, "您没有文件下载权限!"));
 
-            //#endregion
+            #endregion
 
             #endregion
             decimal _rate = 1.00M;

OASystem/OASystem.Api/OAMethodLib/JuHeAPI/JuHeApiService.cs

@@ -19,6 +19,7 @@ namespace OASystem.API.OAMethodLib.JuHeAPI
     {
         private readonly HttpClient _httpClient;
         private readonly string _appKey = "0f5429e9fbb8637c0ff3f14bbb42c732"; //配置您申请的appkey
+        private readonly string _appkey_textTranslate = "59db9edbac297e30695973aa1d856391"; //文本翻译 appkey
 
         /// <summary>
         /// 初始化
@@ -29,13 +30,15 @@ namespace OASystem.API.OAMethodLib.JuHeAPI
             _httpClient = clientFactory.CreateClient("PublicJuHeApi"); ;
         }
 
+        #region 汇率
+
         /// <summary>
         /// 获取汇率
         /// </summary>
         /// <returns></returns>
         public async Task<JuHeAPIResult> GetExchangeRateAsync()
         {
-            var result = new JuHeAPIResult() { Resultcode = "-2",Reason="未知错误" };
+            var result = new JuHeAPIResult() { Resultcode = "-2", Reason = "未知错误" };
 
             string rateDataString = await RedisRepository.RedisFactory
                                                          .CreateRedisRepository()
@@ -130,7 +133,7 @@ namespace OASystem.API.OAMethodLib.JuHeAPI
         {
 
             var result = new Result();
-            if (currencyCode.ToUpper() == "CNY" )
+            if (currencyCode.ToUpper() == "CNY")
             {
                 return result;
             }
@@ -165,7 +168,7 @@ namespace OASystem.API.OAMethodLib.JuHeAPI
         {
 
             List<ExchangeRateModel> result = new List<ExchangeRateModel>();
-            if (currencyCodes.Length  <= 0 )
+            if (currencyCodes.Length <= 0)
             {
                 return result;
             }
@@ -184,7 +187,7 @@ namespace OASystem.API.OAMethodLib.JuHeAPI
                         foreach (var item in currencyModel)
                         {
                             ExchangeRateModel exchangeRateModel = data.Where(it => it.Name.Equals(item.CurrencyName)).FirstOrDefault();
-                            if (exchangeRateModel != null )
+                            if (exchangeRateModel != null)
                             {
                                 result.Add(exchangeRateModel);
                             }
@@ -226,15 +229,16 @@ namespace OASystem.API.OAMethodLib.JuHeAPI
                     return result;
                 }
 
-                decimal moneySuf = Convert.ToDecimal(rateModelSuf.Data.FSellPri) / 100 ; //fSellPri
+                decimal moneySuf = Convert.ToDecimal(rateModelSuf.Data.FSellPri) / 100; //fSellPri
                 decimal settlementMoney = dto.Money / moneySuf;
-                var rateView = new ExchangeRateView { 
+                var rateView = new ExchangeRateView
+                {
                     CurrencyCodePre = dto.CurrencyCodePer,
                     CurrencyNamePre = "人民币",
                     MoneyPre = dto.Money,
                     CurrencyCodeSuf = dto.CurrencyCodeSuf,
                     CurrencyNameSuf = currencyModelSuf.CurrencyName,
-                    MoneySuf = CommonFun.CutDecimalWithN( settlementMoney,4),
+                    MoneySuf = CommonFun.CutDecimalWithN(settlementMoney, 4),
                     UpdateTime = string.Format("{0} {1}", rateModelSuf.Data.Date, rateModelSuf.Data.Time)
                 };
 
@@ -330,5 +334,94 @@ namespace OASystem.API.OAMethodLib.JuHeAPI
             return result;
         }
 
+        #endregion
+
+        #region 文本翻译
+        /// <summary>
+        /// 获取汇率
+        /// </summary>
+        /// <returns></returns>
+        public async Task<JuHeAPIResult> GetTextTranslateAsync(string source,string trans_type = "zh2en")
+        {
+            var result = new JuHeAPIResult() { Resultcode = "10020", Reason = "接口维护" };
+
+
+            
+            #region 请求接口并存入缓存
+            string url = string.Format("/finance/exchange/rmbquot");
+
+            try
+            {
+                var exchangeReq = await _httpClient
+                                        .PostAsync(url,
+                                         new FormUrlEncodedContent(new List<KeyValuePair<string, string>>()
+                                         {
+                                             new KeyValuePair<string, string>("key",_appKey),//你申请的key 
+                                             new KeyValuePair<string, string>("source",source),   //两种格式(0或者1,默认为0)
+                                             new KeyValuePair<string, string>("trans_type",trans_type)    //(0:工商银行,1:招商银行,2:建设银行,3:中国银行,
+                                                                                         //4:交通银行,5:农业银行,默认为:0)
+                                         }));
+                if (exchangeReq.IsSuccessStatusCode)
+                {
+                    var stringResponse = await exchangeReq.Content.ReadAsStringAsync();
+
+                    result = System.Text.Json.JsonSerializer.Deserialize<JuHeAPIResult>(stringResponse,
+                    new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
+
+                    if (result.Resultcode == "200")
+                    {
+                        List<ExchangeRateModel> rateList = new List<ExchangeRateModel>();
+
+                        #region 处理数据类型
+                        JArray jar = JArray.Parse(result.Result.ToJson());
+                        for (int i = 0; i < jar.Count; i++)
+                        {
+                            JObject j = JObject.Parse(jar[i].ToString());
+                            for (int x = 1; x < j.Count + 1; x++)
+                            {
+                                string rateName = "data" + x;
+                                string rateDataStr = j[rateName].ToString();
+                                if (!string.IsNullOrEmpty(rateDataStr))
+                                {
+                                    ExchangeRateModel exchangeRate = JsonConvert.DeserializeObject<ExchangeRateModel>(rateDataStr);
+                                    rateList.Add(exchangeRate);
+                                }
+                            }
+                        }
+                        #endregion
+
+
+                        TimeSpan ts = DateTime.Now.AddMinutes(120) - DateTime.Now; //设置redis 过期时间 120分钟
+                        await RedisRepository
+                            .RedisFactory
+                            .CreateRedisRepository()
+                            .StringSetAsync<string>("JuHeApiExchangeRate", rateList.ToJson(), ts);//string 存
+
+                        result.Result = rateList;
+                    }
+                    else
+                    {
+                        result.Reason = string.Format("聚合APIError[Error_Code:{0} Resultcode:{1} Msg:{2}]",
+                            result.Error_code, result.Resultcode, result.Result);
+                    }
+
+                }
+                else
+                {
+                    result.Reason = "汇率接口请求失败!";
+                }
+            }
+            catch (Exception ex)
+            {
+                result.Reason = ex.Message;
+            }
+            #endregion
+
+           
+            return result;
+        }
+
+
+        #endregion
     }
 }

OASystem/OASystem.Domain/Dtos/Groups/DecreasePaymentsDto.cs

@@ -43,7 +43,21 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int OrbitalPrivateTransfer { get; set; }
 
-
+        /// <summary>
+        /// 对方开户行
+        /// </summary>
+        public string OtherBankName { get; set; }
+        /// <summary>
+        /// 对方银行账号
+        /// </summary>
+        public string OtherSideNo { get; set; }
+        /// <summary>
+        /// 对方姓名
+        /// </summary>
+        public string OtherSideName
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 编号
@@ -80,6 +94,22 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public string SupplierContactNumber { get; set; }
 
+        /// <summary>
+        /// 供应商社交账号
+        /// </summary>
+        public string SupplierSocialAccount { get; set; }
+
+        /// <summary>
+        /// 供应商邮箱
+        /// </summary>
+        public string SupplierEmail { get; set; }
+
+        /// <summary>
+        /// 供应商地址
+        /// </summary>
+        public string SupplierAddress { get; set; }
+
+
         /// <summary>
         /// 费用名称
         /// </summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_DecreasePayments.cs

@@ -51,6 +51,24 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string SupplierContactNumber { get; set; }
 
+        /// <summary>
+        /// 供应商社交账号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(100)")]
+        public string SupplierSocialAccount { get; set; }
+
+        /// <summary>
+        /// 供应商邮箱
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(50)")]
+        public string SupplierEmail { get; set; }
+
+        /// <summary>
+        /// 供应商地址
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(300)")]
+        public string SupplierAddress { get; set; }
+
         /// <summary>
         /// 费用名称
         /// </summary>

OASystem/OASystem.Domain/ViewModels/Groups/DecreasePaymentsView.cs

@@ -91,6 +91,12 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string SupplierContactNumber { get; set; }
 
+        public string SupplierSocialAccount { get; set; }
+
+        public string SupplierEmail { get; set; }
+
+        public string SupplierAddress { get; set; }
+
         /// <summary>
         /// 费用名称
         /// </summary>
@@ -127,6 +133,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 费用标识
         /// </summary>
         public int orbitalPrivateTransfer { get; set; }
+
+        public int OtherBankName { get; set; }
+        public int OtherSideName { get; set; }
+        public int OtherSideNo { get; set; }
+
         /// <summary>
         /// 备注
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -34,10 +34,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<Result> DecreasePaymentsList(DecreasePaymentsListDto dto)
+        public async Task<JsonView> DecreasePaymentsList(DecreasePaymentsListDto dto)
         {
-            Result result = new Result() { Code = -2, Msg = "未知错误" };
-
             string sqlWhere = "";
             if (dto.IsPaySign != -1)
             {
@@ -52,22 +50,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                               Left Join Sys_Users as su On gdp.CreateUserId = su.Id
                                               Where gdp.DiId = {0} And ccp.CTable = 98 {2} And ccp.IsDel = 0 And gdp.IsDel = 0 And gdp.CreateUserId in ({1}) ", dto.DiId, dto.UserId, sqlWhere);
             List<DecreasePaymentsView> _DecreasePayments = await _sqlSugar.SqlQueryable<DecreasePaymentsView>(sql).ToListAsync();
-            if (_DecreasePayments.Count > 0)
-            {
-                result = new Result() { Code = 0, Msg = "查询成功！", Data = _DecreasePayments };
-            }
-            else
-            {
-                result = new Result() { Code = 0, Msg = "暂无数据！", Data = _DecreasePayments };
-            }
-
-            return result;
+            
+            return new JsonView() { Code = 200, Msg = MsgTips.Succeed, Data = _DecreasePayments };
         }
 
-        public async Task<Result> DecreasePaymentsSelect(DecreasePaymentsDto dto)
+        public async Task<JsonView> DecreasePaymentsSelect(DecreasePaymentsDto dto)
         {
-            Result result = new Result() { Code = -2, Msg = "未知错误" };
-
+            
             #region 团组下拉框
 
             List<Grp_GroupsTaskAssignment> grp_GroupsTaskAssignment = Query<Grp_GroupsTaskAssignment>(a => a.IsDel == 0 && a.UId == dto.UserId && a.CTId == dto.CTId).ToList();
@@ -154,228 +143,213 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 supplier = _supplier,
                 supplierArea = _supplierArea
             };
-            return result = new Result() { Code = 0, Msg = "查询成功！", Data = data };
+            return  new JsonView() { Code = 200, Msg = MsgTips.Status, Data = data };
 
         }
 
-        public async Task<Result> OpDecreasePayments(DecreasePaymentsOpDto dto)
+        public async Task<JsonView> OpDecreasePayments(DecreasePaymentsOpDto dto)
         {
-            Result result = new Result() { Code = -2, Msg = "未知错误" };
             BeginTran();
-            try
+            int id = 0;
+            Grp_DecreasePayments grp_Decrease = _mapper.Map<Grp_DecreasePayments>(dto);
+            //处理费用总计
+            if (grp_Decrease.FeeTotal == 0.00M)
+            {
+                grp_Decrease.FeeTotal = grp_Decrease.Price * grp_Decrease.Price;
+            }
+
+            List<TeamRateDescAddCurrencyIdView> teamRates = await _teamRateRep.PostGroupTeamRateItemByDiIdAndCTableId(1, dto.DiId, 98);
+            if (dto.Status == 1)//添加
             {
-                int id = 0;
-                Grp_DecreasePayments grp_Decrease = _mapper.Map<Grp_DecreasePayments>(dto);
-                //处理费用总计
-                if (grp_Decrease.FeeTotal == 0.00M)
+                string selectSql = string.Format(@"select * from Grp_DecreasePayments where PriceName='{0}' and IsDel={1} and DiId={2}"
+                                                , dto.PriceName, 0, dto.DiId);
+                var DecreasePayments = await _sqlSugar.SqlQueryable<Grp_DecreasePayments>(selectSql).FirstAsync();//查询是否存在
+                if (DecreasePayments != null)
                 {
-                    grp_Decrease.FeeTotal = grp_Decrease.Price * grp_Decrease.Price;
+                    return new JsonView() { Code = 400, Msg = "该数据已存在，请勿重复添加！" };
                 }
-
-                List<TeamRateDescAddCurrencyIdView> teamRates = await _teamRateRep.PostGroupTeamRateItemByDiIdAndCTableId(1, dto.DiId, 98);
-                if (dto.Status == 1)//添加
+                else//不存在，可添加
                 {
-                    string selectSql = string.Format(@"select * from Grp_DecreasePayments where PriceName='{0}' and IsDel={1} and DiId={2}"
-                                                    , dto.PriceName, 0, dto.DiId);
-                    var DecreasePayments = await _sqlSugar.SqlQueryable<Grp_DecreasePayments>(selectSql).FirstAsync();//查询是否存在
-                    if (DecreasePayments != null)
+                    id = await AddAsyncReturnId(grp_Decrease);
+                    if (id < 1)
                     {
-                        return new Result() { Code = -1, Msg = "该数据已存在，请勿重复添加！" };
+                        RollbackTran();
+                        return new JsonView() { Code = 400, Msg = "添加失败！" };
                     }
-                    else//不存在，可添加
+
+                    //进行C表添加
+                    Grp_CreditCardPayment C = new Grp_CreditCardPayment();
+                    C.PayDId = dto.PayDId;
+                    C.ConsumptionPatterns = "";
+                    C.ConsumptionDate = "";
+                    C.CTDId = 0;
+                    C.BankNo = "";
+                    C.CardholderName = "";
+                    C.PayMoney = grp_Decrease.FeeTotal;
+                    C.PaymentCurrency = grp_Decrease.Currency;
+                    //当天汇率
+                    //if (!string.IsNullOrEmpty(hfRate.Value))
+                    //    C.DayRate = hfRate.Value;
+                    //else
+                    //C.DayRate = "";
+                    C.CompanyBankNo = "";
+                    C.OtherBankName = dto.OtherBankName;
+                    C.OtherSideNo = dto.OtherSideNo;
+                    C.OtherSideName = dto.OtherSideName;
+                    C.Remark = "";
+                    C.CreateUserId = grp_Decrease.CreateUserId;
+                    C.MFOperator = 0;
+                    C.MFOperatorDate = "";
+                    C.IsAuditDM = 0;
+                    C.AuditDMOperate = 0;
+                    C.AuditDMDate = "";
+                    C.IsAuditMF = 0;
+                    C.AuditMFOperate = 0;
+                    C.AuditMFDate = "";
+                    C.IsAuditGM = 0;
+                    C.AuditGMOperate = 21;
+                    C.AuditGMDate = "";
+
+                    if (C.PayDId == 72) C.IsPay = 1;
+                    else C.IsPay = 0;
+
+                    C.DIId = grp_Decrease.DiId;
+                    C.CId = id;
+                    C.CTable = 98;
+                    C.PayPercentage = 100;
+                    C.PayThenMoney = 0;
+                    C.PayPercentageOld = 0;
+                    C.PayThenMoneyOld = 0;
+                    C.UpdateDate = "";
+                    C.Payee = dto.SupplierName;
+                    C.OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer;
+                    C.ExceedBudget = 0;
+                    //C.RMBPrice = 0.00f;
+
+                    //设置该团组的汇率
+                    TeamRateDescAddCurrencyIdView teamRate = teamRates.Where(it => it.CurrencyId == grp_Decrease.Currency).FirstOrDefault();
+                    //Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == grp_Decrease.DiId && a.IsDel == 0 && a.CTable == 98);
+                    if (teamRate != null)
                     {
-                        id = await AddAsyncReturnId(grp_Decrease);
-                        if (id < 1)
+                        if (teamRate.CurrencyCode.Equals("CNY"))
                         {
-                            RollbackTran();
-                            return new Result() { Code = -1, Msg = "添加失败！" };
+                            C.DayRate = 1.0000M;
+                            C.RMBPrice = C.PayMoney;
+                        }
+                        else
+                        {
+                            C.DayRate = teamRate.Rate;
+                            C.RMBPrice = C.PayMoney * C.DayRate;
                         }
+                    }
+                    else
+                    {
+                        RollbackTran();
+                        return new JsonView() { Code = 400, Msg = $"添加失败！团组汇率未设置{_sqlSugar.Queryable<Sys_SetData>().First(it => it.IsDel == 0 && it.Id == grp_Decrease.Currency)?.Name ?? ""}该币种汇率!" };
+                    }
+                    int cId = await _sqlSugar.Insertable(C).ExecuteReturnIdentityAsync();
+                    if (cId != 0)
+                    {
+                        CommitTran();
+
+                        var data = new { ccpId = cId, sign = 1 };
+                        return new JsonView() { Code = 200, Msg = "添加成功！", Data = data };
+                    }
+                    else
+                    {
+                        RollbackTran();
+                        return new JsonView() { Code = 400, Msg = "添加失败！" };
+                    }
 
-                        //进行C表添加
-                        Grp_CreditCardPayment C = new Grp_CreditCardPayment();
-                        C.PayDId = dto.PayDId;
-                        C.ConsumptionPatterns = "";
-                        C.ConsumptionDate = "";
-                        C.CTDId = 0;
-                        C.BankNo = "";
-                        C.CardholderName = "";
-                        C.PayMoney = grp_Decrease.FeeTotal;
-                        C.PaymentCurrency = grp_Decrease.Currency;
-                        //当天汇率
-                        //if (!string.IsNullOrEmpty(hfRate.Value))
-                        //    C.DayRate = hfRate.Value;
-                        //else
-                        //C.DayRate = "";
-                        C.CompanyBankNo = "";
-                        C.OtherBankName = "";
-                        C.OtherSideNo = "";
-                        C.OtherSideName = "";
-                        C.Remark = "";
-                        C.CreateUserId = grp_Decrease.CreateUserId;
-                        C.MFOperator = 0;
-                        C.MFOperatorDate = "";
-                        C.IsAuditDM = 0;
-                        C.AuditDMOperate = 0;
-                        C.AuditDMDate = "";
-                        C.IsAuditMF = 0;
-                        C.AuditMFOperate = 0;
-                        C.AuditMFDate = "";
-                        C.IsAuditGM = 0;
-                        C.AuditGMOperate = 21;
-                        C.AuditGMDate = "";
-
-                        if (C.PayDId == 72) C.IsPay = 1;
-                        else C.IsPay = 0;
-
-                        C.DIId = grp_Decrease.DiId;
-                        C.CId = id;
-                        C.CTable = 98;
-                        C.PayPercentage = 100;
-                        C.PayThenMoney = 0;
-                        C.PayPercentageOld = 0;
-                        C.PayThenMoneyOld = 0;
-                        C.UpdateDate = "";
-                        C.Payee = dto.SupplierName;
-                        C.OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer;
-                        C.ExceedBudget = 0;
-                        //C.RMBPrice = 0.00f;
+                }
 
+            }
+            else if (dto.Status == 2)
+            {
+                bool res = await UpdateAsync(a => a.Id == grp_Decrease.Id, a => new Grp_DecreasePayments
+                {
+                    DiId = grp_Decrease.DiId,
+                    SupplierArea = grp_Decrease.SupplierArea,
+                    SupplierTypeId = grp_Decrease.SupplierTypeId,
+                    SupplierName = grp_Decrease.SupplierName,
+                    SupplierContact = grp_Decrease.SupplierContact,
+                    SupplierContactNumber = grp_Decrease.SupplierContactNumber,
+                    SupplierSocialAccount = grp_Decrease.SupplierSocialAccount,
+                    SupplierEmail = grp_Decrease.SupplierEmail,
+                    SupplierAddress = grp_Decrease.SupplierAddress,
+                    PriceName = grp_Decrease.PriceName,
+                    Price = grp_Decrease.Price,
+                    Quantity = grp_Decrease.Quantity,
+                    FeeTotal = grp_Decrease.FeeTotal,
+                    Currency = grp_Decrease.Currency,
+                    FilePath = grp_Decrease.FilePath,
+                    Remark = grp_Decrease.Remark,
+                });
+                if (res)
+                {
+                    Grp_CreditCardPayment grp_CreditCardPayment = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a => a.CId == grp_Decrease.Id && a.CTable == 98 && a.CId == grp_Decrease.Id && a.IsDel == 0);
+                    if (grp_CreditCardPayment != null)
+                    {
                         //设置该团组的汇率
                         TeamRateDescAddCurrencyIdView teamRate = teamRates.Where(it => it.CurrencyId == grp_Decrease.Currency).FirstOrDefault();
-                        //Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == grp_Decrease.DiId && a.IsDel == 0 && a.CTable == 98);
+
                         if (teamRate != null)
                         {
                             if (teamRate.CurrencyCode.Equals("CNY"))
                             {
-                                C.DayRate = 1.0000M;
-                                C.RMBPrice = C.PayMoney;
+                                grp_CreditCardPayment.DayRate = 1.0000M;
+                                grp_CreditCardPayment.RMBPrice = grp_CreditCardPayment.PayMoney;
                             }
                             else
                             {
-                                C.DayRate = teamRate.Rate;
-                                C.RMBPrice = C.PayMoney * C.DayRate;
+                                grp_CreditCardPayment.DayRate = teamRate.Rate;
+                                grp_CreditCardPayment.RMBPrice = grp_CreditCardPayment.PayMoney * grp_CreditCardPayment.DayRate;
                             }
-                        }
-                        else
-                        {
-                            RollbackTran();
-                            return new Result() { Code = -1, Msg = $"添加失败！团组汇率未设置{_sqlSugar.Queryable<Sys_SetData>().First(it => it.IsDel == 0 && it.Id == grp_Decrease.Currency)?.Name ?? ""}该币种汇率!" };
-                        }
-                        int cId = await _sqlSugar.Insertable(C).ExecuteReturnIdentityAsync();
-                        if (cId != 0)
-                        {
-                            CommitTran();
 
-                            var data = new { ccpId = cId, sign = 1 };
-                            return new Result() { Code = 0, Msg = "添加成功！", Data = data };
                         }
                         else
                         {
                             RollbackTran();
-                            return new Result() { Code = -1, Msg = "添加失败！" };
+                            return new JsonView() { Code = 400, Msg = "修改失败！" };
                         }
 
-                    }
-
-                }
-                else if (dto.Status == 2)
-                {
-                    bool res = await UpdateAsync(a => a.Id == grp_Decrease.Id, a => new Grp_DecreasePayments
-                    {
-                        DiId = grp_Decrease.DiId,
-                        SupplierArea = grp_Decrease.SupplierArea,
-                        SupplierTypeId = grp_Decrease.SupplierTypeId,
-                        SupplierName = grp_Decrease.SupplierName,
-                        SupplierContact = grp_Decrease.SupplierContact,
-                        SupplierContactNumber = grp_Decrease.SupplierContactNumber,
-                        PriceName = grp_Decrease.PriceName,
-                        Price = grp_Decrease.Price,
-                        Quantity    = grp_Decrease.Quantity,
-                        FeeTotal = grp_Decrease.FeeTotal,
-                        Currency = grp_Decrease.Currency,
-                        FilePath = grp_Decrease.FilePath,
-                        Remark = grp_Decrease.Remark,
-                    });
-                    if (res)
-                    {
-                        Grp_CreditCardPayment grp_CreditCardPayment = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a => a.CId == grp_Decrease.Id && a.CTable == 98 && a.CId == grp_Decrease.Id && a.IsDel == 0);
-                        if (grp_CreditCardPayment != null)
+                        int ispay = 0;
+                        if (dto.PayDId == 72) ispay = 1;
+
+
+                        int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>()
+                                                    .Where(a => a.Id == grp_CreditCardPayment.Id)
+                                                    .SetColumns(a => new Grp_CreditCardPayment
+                                                    {
+                                                        OtherSideName = dto.OtherSideName,
+                                                        OtherSideNo = dto.OtherSideNo,
+                                                        OtherBankName = dto.OtherBankName,
+                                                        PayDId = dto.PayDId,
+                                                        IsPay = ispay,
+                                                        PayMoney = grp_Decrease.FeeTotal,
+                                                        PaymentCurrency = grp_Decrease.Currency,
+                                                        Payee = dto.SupplierName,
+                                                        OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer,
+                                                        DayRate = grp_CreditCardPayment.DayRate,
+                                                        RMBPrice = grp_CreditCardPayment.RMBPrice,
+
+                                                    }).ExecuteCommandAsync();
+                        if (CTable > 0)
                         {
-                            //设置该团组的汇率
-                            TeamRateDescAddCurrencyIdView teamRate = teamRates.Where(it => it.CurrencyId == grp_Decrease.Currency).FirstOrDefault();
-
-                            if (teamRate != null)
-                            {
-                                if (teamRate.CurrencyCode.Equals("CNY"))
-                                {
-                                    grp_CreditCardPayment.DayRate = 1.0000M;
-                                    grp_CreditCardPayment.RMBPrice = grp_CreditCardPayment.PayMoney;
-                                }
-                                else
-                                {
-                                    grp_CreditCardPayment.DayRate = teamRate.Rate;
-                                    grp_CreditCardPayment.RMBPrice = grp_CreditCardPayment.PayMoney * grp_CreditCardPayment.DayRate;
-                                }
-
-                            }
-                            else
-                            {
-                                RollbackTran();
-                                return new Result() { Code = -1, Msg = "修改失败！" };
-                            }
-
-                            int ispay = 0;
-                            if (dto.PayDId == 72) ispay = 1;
-
-
-                            int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>()
-                                                        .Where(a => a.Id == grp_CreditCardPayment.Id)
-                                                        .SetColumns(a => new Grp_CreditCardPayment
-                                                        {
-                                                            PayDId = dto.PayDId,
-                                                            IsPay = ispay,
-                                                            PayMoney = grp_Decrease.FeeTotal,
-                                                            PaymentCurrency = grp_Decrease.Currency,
-                                                            Payee = dto.SupplierName,
-                                                            OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer,
-                                                            DayRate = grp_CreditCardPayment.DayRate,
-                                                            RMBPrice = grp_CreditCardPayment.RMBPrice,
-
-                                                        }).ExecuteCommandAsync();
-                            if (CTable > 0)
-                            {
-                                CommitTran();
+                            CommitTran();
 
-                                var data = new { ccpId = grp_CreditCardPayment.Id, sign = 2 };
+                            var data = new { ccpId = grp_CreditCardPayment.Id, sign = 2 };
 
-                                return new Result() { Code = 0, Msg = "修改成功！", Data = data };
-                            }
-                            else
-                            {
-                                RollbackTran();
-                                return new Result() { Code = -1, Msg = "修改失败！" };
-                            }
-                        }
-                        else
-                        {
-                            RollbackTran();
-                            return new Result() { Code = -1, Msg = "修改失败！" };
+                            return new JsonView() { Code = 200, Msg = "修改成功！", Data = data };
                         }
                     }
-                    else
-                    {
-                        RollbackTran();
-                        return new Result() { Code = -1, Msg = "修改失败！" };
-                    }
                 }
 
-            }
-            catch (Exception ex)
-            {
                 RollbackTran();
-                return new Result() { Code = -2, Msg = ex.Message };
+                return new JsonView() { Code = 400, Msg = "修改失败！" };
             }
-            return result;
+            RollbackTran();
+            return new JsonView() { Code = 400, Msg = MsgTips.Fail }; ;
         }
 
         public async Task<Result> PostGroupNameAndEasy(DecreasePaymentsDto dto)
@@ -454,7 +428,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// <param name="dto"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<Result> QueryDecreasePaymentsById(DecreasePaymentsByIdDto dto)
+        public async Task<JsonView> QueryDecreasePaymentsById(DecreasePaymentsByIdDto dto)
         {
             string sql = string.Format($@"Select 
 											dp.Id,
@@ -464,6 +438,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
 											dp.SupplierName,
 											dp.SupplierContact,
 											dp.SupplierContactNumber,
+											dp.SupplierSocialAccount,
+											dp.SupplierEmail,
+											dp.SupplierAddress,
 											dp.PriceName,
 											dp.Price,
 											dp.Quantity,
@@ -472,14 +449,17 @@ namespace OASystem.Infrastructure.Repositories.Groups
 											dp.FilePath,
 											dp.Remark,
 											ccp.PayDId,
-											ccp.OrbitalPrivateTransfer
+											ccp.OrbitalPrivateTransfer,
+											ccp.OtherBankName,
+											ccp.OtherSideName,
+											ccp.OtherSideNo
 										From Grp_DecreasePayments dp With(NoLock)
 										Left Join Grp_CreditCardPayment ccp With(NoLock) On dp.Id = ccp.CId And dp.DiId = ccp.DIId And ccp.CTable = 98
-										Where dp.IsDel = 0  And dp.Id = {dto.Id}");
+										Where dp.IsDel = 0 And dp.Id = {dto.Id}");
 
             var info = await _sqlSugar.SqlQueryable<DecreasePaymentsInfoView>(sql).FirstAsync();
 
-            return new Result() { Code = 0, Msg = "查询成功！", Data = info };
+            return new JsonView() { Code = 200, Msg = MsgTips.Fail, Data = info };
         }
 
         /// <summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -905,7 +905,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
         //PostGroupNameScreen
 
         /// <summary>
-        /// 获取接团名称 PAge List
+        /// 获取接团名称 Page List
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -921,7 +921,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     sqlWhere += string.Format($@"And TeamName Like '%{groupName}%'");
                 }
 
-                if (userId != -1)
+                List<int> userIds = new List<int>() { -1, 21 };
+
+                if (!userIds.Contains(userId))
                 {
                     sqlWhere += string.Format($@"And JietuanOperator = {userId}");
                 }