立刷为智能区分

AppStart/Helper/PosPushDataNewHelper.cs

@@ -17,6 +17,10 @@ namespace MySystem
         {
             try
             {
+                if(mer.ProductType == "22")
+                {
+                    mer.ProductType = GetLiShuaBrand(mer.SnNo);
+                }
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", mer.SnNo); //机具sn
                 dataContent.Add("mer_no", mer.MerNo); //商户号
@@ -41,6 +45,10 @@ namespace MySystem
         {
             try
             {
+                if(mer.ProductType == "22")
+                {
+                    mer.ProductType = GetLiShuaBrand(mer.MerSnNo);
+                }
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", mer.MerSnNo); //机具sn
                 dataContent.Add("mer_no", mer.MerNo); //商户号
@@ -61,6 +69,10 @@ namespace MySystem
         {
             try
             {
+                if(mer.ProductType == "22")
+                {
+                    mer.ProductType = GetLiShuaBrand(mer.MerSnNo);
+                }
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", mer.MerSnNo); //机具sn
                 dataContent.Add("mer_no", mer.MerNo); //商户号
@@ -134,10 +146,15 @@ namespace MySystem
                 BrandIds.Add("22");
                 BrandIds.Add("27");
                 BrandIds.Add("30");
+                BrandIds.Add("33");
                 if(BrandIds.Contains(act.ProductType))
                 {
                     TradeAmount = TradeAmount / 100;
                 }
+                if(act.ProductType == "22")
+                {
+                    act.ProductType = GetLiShuaBrand(act.SnNo);
+                }
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", act.SnNo); //机具sn
                 dataContent.Add("mer_no", act.MerNo); //商户号
@@ -191,10 +208,15 @@ namespace MySystem
                 BrandIds.Add("22");
                 BrandIds.Add("27");
                 BrandIds.Add("30");
+                BrandIds.Add("33");
                 if(BrandIds.Contains(trade.ProductType))
                 {
                     TradeAmount = TradeAmount / 100;
                 }
+                if(trade.ProductType == "22")
+                {
+                    trade.ProductType = GetLiShuaBrand(trade.TradeSnNo);
+                }
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", trade.TradeSnNo); //机具sn
                 dataContent.Add("mer_no", trade.MerNo); //商户号
@@ -216,6 +238,10 @@ namespace MySystem
         {
             try
             {
+                if(act.ProductType == "22")
+                {
+                    act.ProductType = GetLiShuaBrand(act.SnNo);
+                }
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", act.SnNo); //机具sn
                 dataContent.Add("mobile", act.MerMobile); //商户号
@@ -251,10 +277,15 @@ namespace MySystem
                 BrandIds.Add("22");
                 BrandIds.Add("27");
                 BrandIds.Add("30");
+                BrandIds.Add("33");
                 if(BrandIds.Contains(trade.ProductType))
                 {
                     TradeAmount = TradeAmount / 100;
                 }
+                if(trade.ProductType == "22")
+                {
+                    trade.ProductType = GetLiShuaBrand(trade.TradeSnNo);
+                }
                 if (trade.ProductType == "1" || trade.ProductType == "27")
                 {
                     if (trade.TradeType == "02") QrPayFlag = 1;
@@ -293,7 +324,7 @@ namespace MySystem
                     if(FeeRate != "0") FeeRate = FeeRate.TrimEnd('0');
                     if(FeeAmt != "0" && !string.IsNullOrEmpty(FeeAmt)) FeeAmt = FeeAmt.TrimEnd('0');
                 }
-                else if (trade.ProductType == "6" || trade.ProductType == "22")
+                else if (trade.ProductType == "6" || trade.ProductType == "22" || trade.ProductType == "33")
                 {
                     if (trade.BankCardType == "02" || trade.BankCardType == "12" || trade.Field2 == "1517")
                     {
@@ -425,5 +456,20 @@ namespace MySystem
         {
             return function.MD5_32(str + type);
         }
+    
+    
+        public static string GetLiShuaBrand(string PosSn)
+        {
+            string brand = "22";
+            JavaProductModels.WebCMSEntities db = new JavaProductModels.WebCMSEntities();
+            JavaProductModels.KxsMachine pos = db.KxsMachine.FirstOrDefault(m => m.possn == PosSn);
+            if(pos != null)
+            {
+                brand = pos.BrandId.ToString();
+            }
+            db.Dispose();
+            return brand;
+        }
+    
     }
 }