推送交易数据带上费率

AppStart/Helper/PosPushDataNewHelper.cs

@@ -192,6 +192,8 @@ namespace MySystem
             {
                 int QrPayFlag = 0;
                 int BankCardType = 1;
+                string FeeRate = trade.ErrorCode;
+                string FeeAmt = trade.ErrorMsg;
                 List<string> BrandIds = new List<string>();
                 decimal TradeAmount = trade.TradeAmount;
                 BrandIds.Add("1");
@@ -212,6 +214,7 @@ namespace MySystem
                 {
                     if (trade.TradeType == "02") QrPayFlag = 1;
                     BankCardType = int.Parse(trade.BankCardType);
+                    if(FeeAmt != "0" && !string.IsNullOrEmpty(FeeAmt)) FeeAmt = FeeAmt.TrimEnd('0');
                 }
                 else if (trade.ProductType == "2")
                 {
@@ -224,6 +227,7 @@ namespace MySystem
                     {
                         BankCardType = 0;
                     }
+                    FeeRate = FeeRate.Replace("0.00", "0.");
                 }
                 else if (trade.ProductType == "4")
                 {
@@ -236,6 +240,9 @@ namespace MySystem
                     {
                         BankCardType = 0;
                     }
+                    decimal feeRateStr = decimal.Parse(FeeRate) / 10000;
+                    FeeRate = feeRateStr.ToString().TrimEnd('0');
+                    if(FeeRate != "0") FeeRate = FeeRate.TrimEnd('0');
                 }
                 else if (trade.ProductType == "6")
                 {
@@ -270,6 +277,9 @@ namespace MySystem
                     {
                         BankCardType = 0;
                     }
+                    decimal feeRateStr = decimal.Parse(FeeRate) / 10000;
+                    FeeRate = feeRateStr.ToString().TrimEnd('0');
+                    if(FeeRate != "0") FeeRate = FeeRate.TrimEnd('0');
                 }
                 else if (trade.ProductType == "10" || trade.ProductType == "11")
                 {
@@ -282,6 +292,7 @@ namespace MySystem
                     {
                         BankCardType = 0;
                     }
+                    FeeRate = FeeRate.Replace("0.00", "0.");
                 }
                 else if (trade.ProductType == "12") //盒易付
                 {
@@ -305,6 +316,7 @@ namespace MySystem
                     {
                         BankCardType = 0;
                     }
+                    if(FeeAmt != "0") FeeAmt = FeeAmt.TrimEnd('0');
                 }
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", trade.TradeSnNo); //机具sn
@@ -315,6 +327,8 @@ namespace MySystem
                 dataContent.Add("brand", int.Parse(function.CheckInt(trade.ProductType))); //品牌
                 dataContent.Add("card_type", BankCardType); //卡类型
                 dataContent.Add("qr_pay_flag", QrPayFlag); //云闪付标记
+                dataContent.Add("fee_rate", trade.ErrorCode); //费率
+                dataContent.Add("fee_amt", trade.ErrorMsg); //秒到费
                 Push("trade", dataContent);
             }
             catch (Exception ex)