Merge branch 'feature-dgy-小分仓体系' into DuGuYang

删除队列代码

AppStart/SetDesposit.cs

@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Threading;
-using MySystem.Models;
-using Library;
-
-namespace MySystem
-{
-    /// <summary>
-    /// 设置预发机超过30天预发押金自动扣减
-    /// </summary>
-    public class SetDesposit
-    {
-        public readonly static SetDesposit Instance = new SetDesposit();
-        private SetDesposit()
-        { }
-
-        public void Start()
-        {
-            Thread th = new Thread(doSomething);
-            th.IsBackground = true;
-            th.Start();
-        }
-
-        public void doSomething()
-        {
-            while (true)
-            {
-                if (DateTime.Now.Hour > 0 && DateTime.Now.Hour < 17)
-                {
-                    try
-                    {
-                        string check = function.ReadInstance("/SetDesposit/check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
-                        if (string.IsNullOrEmpty(check))
-                        {
-                            function.WritePage("/SetDesposit/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
-                            WebCMSEntities db = new WebCMSEntities();
-                            var date = DateTime.Now.AddDays(-30);
-                            bool op = true;
-                            while (op)
-                            {
-                                var smallPos = db.PreSendStockDetail.Where(m => m.Status == 1 && m.Sort == 0 && m.CreateDate <= date && m.ApplyFlag == 0).ToList();
-                                foreach (var item in smallPos)
-                                {
-                                    var tuserAccount = db.UserAccount.FirstOrDefault(m => m.Id == item.ToUserId) ?? new UserAccount();
-                                    var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == item.BrandId);
-                                    var amount = 0;
-                                    if (brandInfo.Name.Contains("电签"))
-                                    {
-                                        amount = 200;
-                                    }
-                                    if (brandInfo.Name.Contains("大POS"))
-                                    {
-                                        amount = 300;
-                                    }
-                                    if (tuserAccount.Id > 0)
-                                    {
-                                        tuserAccount.SmallStoreDeposit += amount;//添加小分仓押金
-                                        var add = db.UserAccountRecord.Add(new UserAccountRecord()
-                                        {
-                                            CreateDate = DateTime.Now,
-                                            Remark = "小分仓押金暂扣",
-                                            ChangeType = 63,
-                                            BeforeBalanceAmount = tuserAccount.SmallStoreDeposit - amount, //变更前余额
-                                            AfterBalanceAmount = tuserAccount.SmallStoreDeposit, //变更后余额
-                                            ChangeAmount = amount, //变更金额
-                                            UserId = item.ToUserId,
-
-                                        }).Entity;
-                                        db.SaveChanges();
-                                    }
-                                    item.Sort = 1;
-                                    db.SaveChanges();
-                                }
-                            }
-                            db.Dispose();
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "设置预发机超过30天预发押金自动扣减异常");
-                    }
-                }
-                Thread.Sleep(5000);
-            }
-        }
-    }
-}

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -355,41 +355,41 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 pos.BindMerchantId = merchant.Id;
             }
-            var makerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
-            var prePos = db.PreSendStockDetail.FirstOrDefault(m => m.ToUserId == makerCode.UserId && m.SnId == pos.Id && m.CreateDate < DateTime.Now.AddDays(-30) && m.AuthFlag == 1 && m.ApplyFlag == 0) ?? new PreSendStockDetail();
-            if (makerCode.UserId > 0 && prePos.Id > 0)
-            {
-                if (prePos.CreateDate <= DateTime.Now.AddDays(-30))
-                {
-                    var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == prePos.BrandId);
-                    var amount = 0;
-                    if (brandInfo.Name.Contains("电签"))
-                    {
-                        amount = 200;
-                    }
-                    if (brandInfo.Name.Contains("大POS"))
-                    {
-                        amount = 300;
-                    }
-                    var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == makerCode.UserId) ?? new UserAccount();
-                    if (userAccount.Id > 0)
-                    {
-                        userAccount.SmallStoreDeposit -= amount;
-                        var add = db.UserAccountRecord.Add(new UserAccountRecord()
-                        {
-                            CreateDate = DateTime.Now,
-                            Remark = "小分仓押金退还",
-                            ChangeType = 65,
-                            BeforeBalanceAmount = userAccount.SmallStoreDeposit + amount, //变更前小分仓押金
-                            AfterBalanceAmount = userAccount.SmallStoreDeposit, //变更后小分仓押金
-                            ChangeAmount = amount,//变动金额
-                            UserId = userAccount.Id,
-
-                        }).Entity;
-                        db.SaveChanges();
-                    }
-                }
-            }
+            // var makerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
+            // var prePos = db.PreSendStockDetail.FirstOrDefault(m => m.ToUserId == makerCode.UserId && m.SnId == pos.Id && m.CreateDate < DateTime.Now.AddDays(-30) && m.AuthFlag == 1 && m.ApplyFlag == 0) ?? new PreSendStockDetail();
+            // if (makerCode.UserId > 0 && prePos.Id > 0)
+            // {
+            //     if (prePos.CreateDate <= DateTime.Now.AddDays(-30))
+            //     {
+            //         var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == prePos.BrandId);
+            //         var amount = 0;
+            //         if (brandInfo.Name.Contains("电签"))
+            //         {
+            //             amount = 200;
+            //         }
+            //         if (brandInfo.Name.Contains("大POS"))
+            //         {
+            //             amount = 300;
+            //         }
+            //         var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == makerCode.UserId) ?? new UserAccount();
+            //         if (userAccount.Id > 0)
+            //         {
+            //             userAccount.SmallStoreDeposit -= amount;
+            //             var add = db.UserAccountRecord.Add(new UserAccountRecord()
+            //             {
+            //                 CreateDate = DateTime.Now,
+            //                 Remark = "小分仓押金退还",
+            //                 ChangeType = 65,
+            //                 BeforeBalanceAmount = userAccount.SmallStoreDeposit + amount, //变更前小分仓押金
+            //                 AfterBalanceAmount = userAccount.SmallStoreDeposit, //变更后小分仓押金
+            //                 ChangeAmount = amount,//变动金额
+            //                 UserId = userAccount.Id,
+
+            //             }).Entity;
+            //             db.SaveChanges();
+            //         }
+            //     }
+            // }
             db.SaveChanges();
             function.WriteLog(DateTime.Now.ToString() + "\n" + SysUserName + "\nMakerCode:" + MakerCode + ", PosSn:" + PosSn + ", MerNo:" + MerNo + ", AddActPrize:" + AddActPrize + ", IsPre:" + IsPre, "机具补录日志");
             return "success";