wifi订单统计逻辑变更

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -271,11 +271,30 @@ namespace MySystem
                                     edit.Status = 2;
                                     spdb.SaveChanges();
                                 }
-                                tran.Commit();
                             }
                             else if (Mer.Field2 == "解绑" && Mer.ProductType == "23")
                             {
-                                RedisDbconn.Instance.AddList("WifiUnBindQueue", Mer.SnNo);
+                                //备份解绑的商户信息
+                                CustomerSqlConn.op("insert into PosMerchantInfoBak select * from PosMerchantInfo where Id=" + pos.BindMerchantId, MysqlConn.SqlConnStr);
+                                PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mer.MerNo);
+                                if(merchant != null)
+                                {
+                                    PxcModels.MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == merchant.KqMerNo);
+                                    if (forMerNo != null)
+                                    {
+                                        db.MachineForMerNo.Remove(forMerNo);
+                                    }
+                                    pos.BindMerchantId = 0;
+                                    pos.BindingState = 0;
+                                    pos.BindingTime = null;
+                                    db.PosMerchantInfo.Remove(merchant);
+                                    PxcModels.WifiTradeRecord trade = db.WifiTradeRecord.FirstOrDefault(m => m.SnNo == pos.PosSn);
+                                    if(trade != null)
+                                    {
+                                        trade.DoMonths = trade.Duration;
+                                    }
+                                    db.SaveChanges();
+                                }
                             }
                             else
                             {
@@ -286,6 +305,7 @@ namespace MySystem
                                     spdb.SaveChanges();
                                 }
                             }
+                            tran.Commit();
                         }
                         catch (Exception ex)
                         {