调整

AppStart/SetDesposit.cs

@@ -28,7 +28,7 @@ namespace MySystem
         {
             while (true)
             {
-                if (DateTime.Now.Hour > 0 && DateTime.Now.Hour < 4)
+                if (DateTime.Now.Hour > 0 && DateTime.Now.Hour < 17)
                 {
                     try
                     {

Areas/Admin/Controllers/MainServer/PreSendStockDetailController.cs

@@ -624,7 +624,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             // string condition = " and Status>-1 and DATE_SUB(CURDATE(), INTERVAL 30 DAY) >= date(CreateDate) and ApplyFlag =0 and AuthFlag =1";
-            string condition = " and Status>-1 and DATE_SUB(CURDATE(), INTERVAL 30 DAY) >= date(CreateDate) and ApplyFlag =0";
+            string condition = " and Status=1 and DATE_SUB(CURDATE(), INTERVAL 30 DAY) >= date(CreateDate) and ApplyFlag =0";
             //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -372,36 +372,17 @@ namespace MySystem.Areas.Admin.Controllers
                 var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == makerCode.UserId) ?? new UserAccount();
                 if (userAccount.Id > 0)
                 {
-                    if (userAccount.SmallStoreDeposit - amount >= 0)
+                    userAccount.SmallStoreDeposit -= amount;
+                    var add = db.UserAccountRecord.Add(new UserAccountRecord()
                     {
-                        userAccount.BalanceAmount += amount;
-                        userAccount.SmallStoreDeposit -= amount;
-                        var add = db.UserAccountRecord.Add(new UserAccountRecord()
-                        {
-                            Remark = "小分仓押金解冻",
-                            ChangeType = 62,
-                            BeforeBalanceAmount = userAccount.BalanceAmount - amount, //变更前余额
-                            AfterBalanceAmount = userAccount.BalanceAmount, //变更后余额
-                            UserId = userAccount.Id,
+                        Remark = "小分仓押金解冻",
+                        ChangeType = 62,
+                        BeforeBalanceAmount = userAccount.SmallStoreDeposit - amount, //变更前小分仓押金
+                        AfterBalanceAmount = userAccount.SmallStoreDeposit, //变更后小分仓押金
+                        UserId = userAccount.Id,
 
-                        }).Entity;
-                        db.SaveChanges();
-                    }
-                    else
-                    {
-                        userAccount.BalanceAmount += userAccount.SmallStoreDeposit;
-                        userAccount.SmallStoreDeposit -= userAccount.SmallStoreDeposit;
-                        var add = db.UserAccountRecord.Add(new UserAccountRecord()
-                        {
-                            Remark = "小分仓押金解冻",
-                            ChangeType = 62,
-                            BeforeBalanceAmount = userAccount.BalanceAmount, //变更前余额
-                            AfterBalanceAmount = userAccount.BalanceAmount + userAccount.SmallStoreDeposit, //变更后余额
-                            UserId = userAccount.Id,
-
-                        }).Entity;
-                        db.SaveChanges();
-                    }
+                    }).Entity;
+                    db.SaveChanges();
                 }
             }
             db.SaveChanges();