Sfoglia il codice sorgente

完成,待测试

DuGuYang 2 anni fa
parent
commit
e6461a6a5c

+ 3 - 0
AppStart/ExcelHelper.cs

@@ -43,6 +43,7 @@ namespace MySystem
                     while (DoCount < list.Rows.Count)
                     {
                         WebCMSEntities db = new WebCMSEntities();
+                        //机具入库
                         if (_Kind == "1")
                         {
                             var tran = db.Database.BeginTransaction();
@@ -233,6 +234,7 @@ namespace MySystem
                             }
                             tran.Dispose();
                         }
+                        //仓库调拨
                         else if (_Kind == "2")
                         {
                             Dictionary<string, int> storeData = new Dictionary<string, int>();
@@ -505,6 +507,7 @@ namespace MySystem
                                 }
                             }
                         }
+                        //仓库发货至创客
                         else if (_Kind == "3")
                         {
                             Dictionary<string, int> storeData = new Dictionary<string, int>();

+ 6 - 0
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -941,9 +941,15 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             prizes.Add(50);
                         }
+                        //9月1日-9月30日立刷机具刷5000激活时额外奖励30元立刷活动奖
+                        else if (pos.BrandId == 6 && pos.CreditTrade >= 5000M && pos.ActivationTime >= DateTime.Parse("2023-08-31 00:00:00") && pos.ActivationTime < DateTime.Parse("2023-10-01 00:00:00"))
+                        {
+                            prizes.Add(30);
+                        }
                         foreach (decimal prize in prizes)
                         {
                             int ChangeType = prize == 40 ? 12 : 0;
+                            if (prize == 30) ChangeType = 133;
                             bool check = db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn && m.RewardAmount == prize);
                             if (!check)
                             {