费用审核 --> OP --> 排查、显示调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1529,7 +1529,9 @@ namespace OASystem.API.Controllers
                     /*
                      * 此次付款金额
                      */
-                    decimal CurrPayStr = 0;
+                    decimal CurrPayStr = 0.00M,
+                            OriginalCurrPay = 0.00M;
+                    
                     if (entity.PayPercentage == 0)
                     {
                         if (entity.PayThenMoney != 0)
@@ -1543,7 +1545,27 @@ namespace OASystem.API.Controllers
                         }
 
                     }
-                    _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
+                    if (_dto.Label == 79)
+                    {
+                        string original = string.Empty;
+                        if (hotelCurrncyCode.Equals("CNY"))
+                        {
+                            OriginalCurrPay = CurrPayStr;
+                            _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
+                        }
+                        else
+                        {
+                            OriginalCurrPay = ((entity.PayMoney / 100) * entity.PayPercentage).ConvertToDecimal1();
+                            //760 EUR（7600.00 CNY）
+                            _detail.CurrPay = $"{OriginalCurrPay.ToString("#0.00")} {hotelCurrncyCode}({CurrPayStr.ToString("#0.00")} CNY)";
+                        }
+
+                    }
+                    else
+                    {
+                        _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
+                    }
+                    
 
                     /*
                      * 剩余尾款
@@ -2034,7 +2056,7 @@ namespace OASystem.API.Controllers
                         CurrencyId = entity.PaymentCurrency,
                         CurrencyName = PaymentCurrency_WaitPay,
                         AmountPayable = entity.PayMoney,
-                        ThisPayment = CurrPayStr,
+                        ThisPayment = OriginalCurrPay,
                         BalancePayment = BalanceStr,
                         AuditedFunds = auditFee
                     });
@@ -2075,19 +2097,18 @@ namespace OASystem.API.Controllers
                     if (strs.Count > 0)
                     {
                         decimal amountPayable = strs.Sum(it => it.AmountPayable);
-
+                        decimal thisPayment = ccpCurrencyPrices.Sum(it => it.ThisPayment);
                         decimal balancePayment = strs.Sum(it => it.BalancePayment);
                         amountPayableStr += string.Format(@"{0}{1} | ", amountPayable.ToString("#0.00"), item.CurrencyName);
 
                         //单独处理此次付款金额
                         if (item.CurrencyId == 836) //人民币
                         {
-                            decimal thisPayment = ccpCurrencyPrices.Sum(it => it.ThisPayment);
                             thisPaymentStr += string.Format(@"{0}{1} | ", thisPayment.ToString("#0.00"), item.CurrencyName);
                         }
                         else
                         {
-                            thisPaymentStr += string.Format(@"{0}{1} | ", "0.00", item.CurrencyName);
+                            thisPaymentStr += string.Format(@"{0}{1} | ", thisPayment.ToString("#0.00"), item.CurrencyName);
                         }
 
                         balancePaymentStr += string.Format(@"{0}{1} | ", balancePayment.ToString("#0.00"), item.CurrencyName);