Эх сурвалжийг харах

修复了乐刷换绑解绑自动bug

lichunlei 2 жил өмнө
parent
commit
207f23306a

+ 9 - 0
AppStart/Helper/SycnSpServer/SycnSpChangeBindService.cs

@@ -132,6 +132,15 @@ namespace MySystem
                             add.ChangeDeviceNum = 1; //转换机具数量
                             add.ChangeSnExpand = ChangeSnExpand; //机具SN
                             db.SaveChanges();
+
+                            ChangeBindRecord edit = spdb.ChangeBindRecord.FirstOrDefault(m => m.Id == Bind.Id);
+                            if (edit != null)
+                            {
+                                edit.Status = 2;
+                                spdb.SaveChanges();
+                            }
+
+                            tran.Commit();
                         }
                         catch (Exception ex)
                         {

+ 10 - 2
AppStart/Helper/SycnSpServer/SycnSpUnBindService.cs

@@ -40,8 +40,8 @@ namespace MySystem
                             string MerNo = Bind.MerNo;
                             PxcModels.MachineForSnNo forSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn);
                             PxcModels.MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == MerNo);
-                            PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId && m.Id == forMerNo.SnId);
-                            if (pos.ActivationState == 0 && pos.BuyUserId == 0 && pos.BindingState == 0)
+                            PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId);
+                            if (pos.ActivationState == 0 && pos.BuyUserId > 0 && pos.BindingState == 0)
                             {                            
                                 if (forMerNo != null)
                                 {
@@ -77,7 +77,15 @@ namespace MySystem
                                 userData.BindCount -= 1;
                                 userData.UnBindCount += 1;
                                 db.SaveChanges();
+
+                                UnBindRecord edit = spdb.UnBindRecord.FirstOrDefault(m => m.Id == Bind.Id);
+                                if (edit != null)
+                                {
+                                    edit.Status = 2;
+                                    spdb.SaveChanges();
+                                }
                             }
+                            tran.Commit();
                         }
                         catch (Exception ex)
                         {

+ 3 - 3
appsettings.json

@@ -17,9 +17,9 @@
     "Host": "http://localhost:5047/",
     "SourceHost": "http://bs.kexiaoshuang.com/",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=Rw2imhXQQt5ODWIF;database=KxsMainServer;charset=utf8;",
-    "Pxc1SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=Rw2imhXQQt5ODWIF;database=KxsMainServer;charset=utf8;",
-    "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
+    "SqlConnStr": "server=47.108.231.170;port=3306;user=KxsMain;password=mzeqjriUWore0dwT;database=KxsMainServer;charset=utf8;",
+    "Pxc1SqlConnStr": "server=47.108.231.170;port=3306;user=KxsMain;password=mzeqjriUWore0dwT;database=KxsMainServer;charset=utf8;",
+    "SpSqlConnStr": "server=47.108.229.115;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
     "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "TendisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",