数据推送逻辑调整

AppStart/Helper/PosPushDataNewHelper.cs

@@ -389,5 +389,10 @@ namespace MySystem
             }
             return DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
         }
+
+        public static string getRequestId(string str, string type)
+        {
+            return function.MD5_32(str + type);
+        }
     }
 }

AppStart/Helper/SycnSpServer/SycnSpBindService.cs

@@ -51,10 +51,6 @@ namespace MySystem
                             }
                             else
                             {
-                                if(Bind.ProductType == "12" || Bind.ProductType == "30")
-                                {
-                                    RedisDbconn.Instance.Set("sppos:" + Bind.MerNo, Bind.MerSnNo);
-                                }
                                 if(Utils.Instance.IsWifi(int.Parse(Bind.ProductType)))
                                 {
                                     Bind.MerNo = Bind.MerSnNo;

AppStart/Helper/SycnSpServer/SycnSpMerchantRecordService.cs

@@ -37,26 +37,6 @@ namespace MySystem
                         var tran = db.Database.BeginTransaction();
                         try
                         {
-                            if(Mer.ProductType == "12") 
-                            {
-                                Mer.MerSnNo = RedisDbconn.Instance.Get<string>("sppos:" + Mer.MerNo);
-                                RedisDbconn.Instance.SetExpire("sppos:" + Mer.MerNo, -1);
-                            }
-                            if(Mer.ProductType == "30") 
-                            {
-                                Mer.MerSnNo = RedisDbconn.Instance.Get<string>("sppos:" + Mer.Field3);
-                                RedisDbconn.Instance.SetExpire("sppos:" + Mer.MerNo, -1);
-                                if(!db.LklMerNo.Any(m => m.ExtMerNo == Mer.Field3))
-                                {
-                                    db.LklMerNo.Add(new PxcModels.LklMerNo()
-                                    {
-                                        ExtMerNo = Mer.Field3,
-                                        MerNo = Mer.MerNo,
-                                    });
-                                    db.SaveChanges();
-                                }
-                            }
-                            PosPushDataNewHelper.Bind2(Mer);                            
                             MerchantRecord edit = spdb.MerchantRecord.FirstOrDefault(m => m.Id == Mer.Id);
                             if (edit != null)
                             {

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -38,13 +38,30 @@ namespace MySystem
                         var tran = db.Database.BeginTransaction();
                         try
                         {
-                            if(Mer.Field2 != "解绑" && Mer.Field2 != "UNBIND" && Mer.ProductType != "12" && Mer.ProductType != "30")
+                            if(Mer.Field2 != "解绑" && Mer.Field2 != "UNBIND")
                             {
                                 if(Utils.Instance.IsWifi(int.Parse(Mer.ProductType)))
                                 {
                                     Mer.MerNo = Mer.SnNo;
+                                    PosPushDataNewHelper.Bind(Mer);
+                                }
+                                if(Mer.ProductType == "12" || Mer.ProductType == "30")
+                                {
+                                    MerchantRecord merInfo = new MerchantRecord();
+                                    if(Mer.ProductType == "12") merInfo = spdb.MerchantRecord.FirstOrDefault(m => m.MerNo == Mer.MerNo);
+                                    if(Mer.ProductType == "30") merInfo = spdb.MerchantRecord.FirstOrDefault(m => m.Field3 == Mer.MerNo);
+                                    if(merInfo != null)
+                                    {
+                                        Mer.MerNo = merInfo.MerNo;
+                                        Mer.MerIdcardNo = merInfo.LegalIdCard;
+                                        Mer.MerName = merInfo.MerName;
+                                        if(Mer.ProductType == "30")
+                                        {
+                                            Mer.MerMobile = merInfo.Field2;
+                                        }
+                                        PosPushDataNewHelper.Bind(Mer);
+                                    }
                                 }
-                                PosPushDataNewHelper.Bind(Mer);
                             }
                             Merchants edit = spdb.Merchants.FirstOrDefault(m => m.Id == Mer.Id);
                             if (edit != null)