暂存

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -586,64 +586,74 @@ namespace MySystem.Areas.Admin.Controllers
                 json += "\"OrgDivi\":\"" + OrgDivi + "\"";
                 json += "}";
 
-                bool op = true;                
+                bool op = true;
                 string OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
                 decimal TotalAmountNum = decimal.Parse(function.CheckNum(numberString: TotalAmount));
                 DateTime CreateDate = DateTime.Parse(OrderCreateTime);
                 string CheckDate = DateTime.Now.AddMonths(-3).ToString("yyyyMM");
-                if(int.Parse(CreateMonth) >= int.Parse(CheckDate)) op = false;
-                if(OrderStatus == "待激活") op = false;
-                if(UserStatus == "已注销" || UserStatus.Contains("欠费"))
+                if (int.Parse(CreateMonth) >= int.Parse(CheckDate)) op = false;
+                if (OrderStatus == "待激活") op = false;
+                if (UserStatus.Contains("注销") || UserStatus.Contains("欠费"))
                 {
                     op = false;
                     SimposMerchantInfo checkSimMer = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
-                    if(checkSimMer != null)
+                    if (checkSimMer != null)
                     {
                         checkSimMer.Status = -1;
-                        if(UserStatus.Contains("欠费"))
+                        if (UserStatus.Contains("欠费") && checkSimMer.Status != -1)
                         {
                             checkSimMer.Status = -2;
                         }
                         db.SaveChanges();
                     }
                     PosMerchantInfo checkMer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
-                    if(checkMer != null)
+                    if (checkMer != null)
                     {
                         checkMer.Status = -1;
-                        if(UserStatus.Contains("欠费"))
+                        if (UserStatus.Contains("欠费") && checkMer.Status != -1)
                         {
                             checkMer.Status = -2;
                         }
                         db.SaveChanges();
                     }
                     PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SimNo);
-                    if(pos != null)
+                    if (pos != null)
                     {
                         pos.Status = -1;
-                        if(UserStatus.Contains("欠费"))
+                        if (UserStatus.Contains("欠费") && pos.Status != -1)
                         {
                             pos.Status = -2;
                         }
                         db.SaveChanges();
                     }
                 }
-                if(UserStatus == "正常")
+                if (UserStatus.Contains("正常"))
                 {
                     SimposMerchantInfo checkSimMer = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
-                    if(checkSimMer != null)
+                    if (checkSimMer != null)
                     {
-                        checkSimMer.Status = 0;
+                        if (checkSimMer.Status == -2) checkSimMer.Status = 0;
                         db.SaveChanges();
                     }
                     PosMerchantInfo checkMer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
-                    if(checkMer != null)
+                    if (checkMer != null)
                     {
-                        checkMer.Status = 1;
+                        if (checkMer.Status == -2) checkMer.Status = 1;
+                        db.SaveChanges();
+                    }
+
+                    PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SimNo);
+                    if (pos != null && pos.Status < 0)
+                    {
+                        if (pos.Status == -2)
+                        {
+                            pos.Status = 0;
+                        }
                         db.SaveChanges();
                     }
                 }
-                
-                if(TotalAmountNum > 0 && op)
+
+                if (TotalAmountNum > 0 && op)
                 {
                     spdb.TradeRecord.Add(new SpModels.TradeRecord()
                     {