Просмотр исходного кода

优化货币汇率计算逻辑

在 `GroupsController.cs` 文件中,删除了原有的货币汇率计算逻辑,并将其替换为调用 `GeneralMethod.EnterExitCostLiveRate()` 方法来获取实时汇率信息。
在 `GeneralMethod.cs` 文件中,修改了货币汇率的计算方式。原先的计算方式是将汇率乘以 1.03 后再加上 0.01,现在改为直接将汇率乘以 1.0300。
LEIYI месяцев назад: 2
Родитель
Сommit
febb19c589

+ 1 - 32
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -7513,37 +7513,6 @@ FROM
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> EnterExitCostDraftCorrelationTips(EnterExitCostDraftCorrelationTipsDto dto)
         {
-            //var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().FirstAsync(it => it.Id == dto.DiId && it.IsDel == 0);
-
-            //默认币种显示
-            var _currencyInfos = _currencyInit;
-            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode!).ToArray());
-            List<dynamic> reteInfos = new List<dynamic>();
-            if (_currencyRate.Count > 0)
-            {
-                foreach (var item in _currencyInfos)
-                {
-                    var rateInfo = _currencyRate.Where(it => it.Name.Equals(item.CurrencyName)).FirstOrDefault();
-                    if (rateInfo != null)
-                    {
-                        item.Rate = Convert.ToDecimal((Convert.ToDecimal(rateInfo.FSellPri == null ? 0.00M : rateInfo.FSellPri) / 100.00M).ToString("#0.0000"));
-
-                        decimal rate1 = item.Rate;
-                        rate1 *= 1.03M;
-
-                        decimal rate2 = Convert.ToDecimal(rate1.ToString("#0.00")) + 0.01M;
-
-                        reteInfos.Add(new
-                        {
-                            currCode = item.CurrencyCode,
-                            currName = item.CurrencyName,
-                            rate = rate2,
-                            lastUpdateDt = rateInfo.Date + " " + rateInfo.Time
-                        });
-                    }
-                }
-            }
-
             //var visaData = await _visaFeeInfoRep.EntryAndExitTips(dto.DiId);
             //var airData = await _ticketBlackCodeRep.EntryAndExitTips(dto.DiId);
             return Ok(JsonView(true, "查询成功!", new
@@ -7551,7 +7520,7 @@ FROM
                 //GroupNameData = groupNameData.Data,
                 //visaData = visaData.Data,
                 //airData = airData.Data,
-                reteInfos = reteInfos
+                reteInfos = await GeneralMethod.EnterExitCostLiveRate()
             }));
         }
 

+ 3 - 5
OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -5350,16 +5350,14 @@ namespace OASystem.API.OAMethodLib
                     {
                         item.Rate = Convert.ToDecimal((Convert.ToDecimal(rateInfo.FSellPri == null ? 0.00M : rateInfo.FSellPri) / 100.00M).ToString("#0.0000"));
 
-                        decimal rate1 = item.Rate;
-                        rate1 *= 1.03M;
-
-                        decimal rate2 = Convert.ToDecimal(rate1.ToString("#0.00")) + 0.01M;
+                        decimal rate1 = item.Rate * 1.0300M;
+                        //rate1 += 0.01M;
 
                         reteInfos.Add(new
                         {
                             currCode = item.CurrencyCode,
                             currName = item.CurrencyName,
-                            rate = rate2,
+                            rate = rate1,
                             lastUpdateDt = rateInfo.Date + " " + rateInfo.Time
                         });
                     }