|
|
@@ -233,10 +233,13 @@ namespace MySystem
|
|
|
{
|
|
|
TradeAmount = TradeAmount / 100;
|
|
|
}
|
|
|
- if (trade.ProductType == "1")
|
|
|
+ if (trade.ProductType == "1" || trade.ProductType == "27")
|
|
|
{
|
|
|
if (trade.TradeType == "02") QrPayFlag = 1;
|
|
|
BankCardType = int.Parse(trade.BankCardType);
|
|
|
+ decimal feeRateStr = decimal.Parse(FeeRate) * 100;
|
|
|
+ FeeRate = feeRateStr.ToString().TrimEnd('0');
|
|
|
+ if(FeeRate != "0") FeeRate = FeeRate.TrimEnd('0');
|
|
|
if(FeeAmt != "0" && !string.IsNullOrEmpty(FeeAmt)) FeeAmt = FeeAmt.TrimEnd('0');
|
|
|
}
|
|
|
else if (trade.ProductType == "2")
|
|
|
@@ -266,6 +269,7 @@ namespace MySystem
|
|
|
decimal feeRateStr = decimal.Parse(FeeRate) / 10000;
|
|
|
FeeRate = feeRateStr.ToString().TrimEnd('0');
|
|
|
if(FeeRate != "0") FeeRate = FeeRate.TrimEnd('0');
|
|
|
+ if(FeeAmt != "0" && !string.IsNullOrEmpty(FeeAmt)) FeeAmt = FeeAmt.TrimEnd('0');
|
|
|
}
|
|
|
else if (trade.ProductType == "6")
|
|
|
{
|
|
|
@@ -303,6 +307,7 @@ namespace MySystem
|
|
|
decimal feeRateStr = decimal.Parse(FeeRate) / 10000;
|
|
|
FeeRate = feeRateStr.ToString().TrimEnd('0');
|
|
|
if(FeeRate != "0") FeeRate = FeeRate.TrimEnd('0');
|
|
|
+ if(FeeAmt != "0" && !string.IsNullOrEmpty(FeeAmt)) FeeAmt = FeeAmt.TrimEnd('0');
|
|
|
}
|
|
|
else if (trade.ProductType == "10" || trade.ProductType == "11")
|
|
|
{
|