Browse Source

修复每月重置分仓额度bug,上月没出货的仓库默认20000

lichunlei 3 years ago
parent
commit
ff66abc678
4 changed files with 71 additions and 43 deletions
  1. 31 16
      AppStart/Timer/StoreApplyHelper.cs
  2. 13 0
      Controllers/HomeController.cs
  3. 25 25
      Startup.cs
  4. 2 2
      appsettings.json

+ 31 - 16
AppStart/Timer/StoreApplyHelper.cs

@@ -34,8 +34,8 @@ public class StoreApplyHelper
             OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
             try
             {
-                if(DateTime.Now.Day == 1 && DateTime.Now.Hour > 0 && DateTime.Now.Hour < 3)
-                {
+                // if(DateTime.Now.Day == 1 && DateTime.Now.Hour > 0 && DateTime.Now.Hour < 3)
+                // {
                     string check = function.ReadInstance("/StoreApply/" + DateTime.Now.ToString("yyyyMM") + ".txt");
                     if(string.IsNullOrEmpty(check))
                     {
@@ -44,19 +44,19 @@ public class StoreApplyHelper
                         string pre = DateTime.Now.AddMonths(-2).ToString("yyyy-MM") + "-01 00:00:00";
                         string start = DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01 00:00:00";
                         string end = DateTime.Parse(start).AddMonths(1).ToString("yyyy-MM-dd HH:mm:ss");
-                        DataTable dts = OtherMySqlConn.dtable("select UserId from StoreHouse where CreateDate>='" + pre + "' and CreateDate<'" + end + "' and UserId in (select UserId from (select UserId,count(Id) from StoreHouse group by UserId HAVING count(Id)=1) tb)");
-                        foreach(DataRow dr in dts.Rows)
-                        {
-                            int UserId = int.Parse(function.CheckInt(dr["UserId"].ToString()));
-                            if(!dataDic.ContainsKey(UserId))
-                            {
-                                dataDic.Add(UserId, 20000);
-                            }
-                            else
-                            {
-                                dataDic[UserId] += 20000;
-                            }
-                        }
+                        // DataTable dts = OtherMySqlConn.dtable("select UserId from StoreHouse where CreateDate>='" + pre + "' and CreateDate<'" + end + "' and UserId in (select UserId from (select UserId,count(Id) from StoreHouse group by UserId HAVING count(Id)=1) tb)");
+                        // foreach(DataRow dr in dts.Rows)
+                        // {
+                        //     int UserId = int.Parse(function.CheckInt(dr["UserId"].ToString()));
+                        //     if(!dataDic.ContainsKey(UserId))
+                        //     {
+                        //         dataDic.Add(UserId, 20000);
+                        //     }
+                        //     else
+                        //     {
+                        //         dataDic[UserId] += 20000;
+                        //     }
+                        // }
                         //上月出货额度
                         DataTable dt = OtherMySqlConn.dtable("select StoreId,count(Id) from StoreStockChange where CreateDate>='" + start + "' and CreateDate<'" + end + "' and BrandId in (1,2,4,6,7,8) and TransType in (10,11,2) and StoreId>0 group by StoreId");
                         foreach(DataRow dr in dt.Rows)
@@ -90,6 +90,21 @@ public class StoreApplyHelper
                                 dataDic[store.UserId] += AmountMore;
                             }
                         }
+                        //上月没出货的创库
+                        string ids = "0";
+                        foreach(int UserId in dataDic.Keys)
+                        {
+                            ids += "," + UserId;
+                        }
+                        DataTable dts = OtherMySqlConn.dtable("select distinct UserId from StoreHouse where UserId not in (" + ids + ") and Status>-1");
+                        foreach(DataRow dr in dts.Rows)
+                        {
+                            int UserId = int.Parse(function.CheckInt(dr[0].ToString()));
+                            if(!dataDic.ContainsKey(UserId))
+                            {
+                                dataDic.Add(UserId, 20000);
+                            }
+                        }
                         foreach(int UserId in dataDic.Keys)
                         {
                             decimal Amount = dataDic[UserId];
@@ -143,7 +158,7 @@ public class StoreApplyHelper
                         }
                         db.SaveChanges();
                     }
-                }
+                // }
             }
             catch (Exception ex)
             {

+ 13 - 0
Controllers/HomeController.cs

@@ -1283,5 +1283,18 @@ namespace MySystem.Controllers
             }
             return "失败";
         }
+    
+    
+        public string setdeposit()
+        {
+            string content = function.GetWebRequest("http://sp.kexiaoshuang.com/api/test/SetFee?merNo=M900065131JVMYUBl5&sn=00000320JBNL01471793&fee=0.63");
+            JsonData obj = JsonMapper.ToObject(content);
+            if (obj["code"].ToString() == "000000")
+            {
+                content = SetDepositService.Instance.Decrypt(obj["data"].ToString());
+            }
+            return content;
+        }
+    
     }
 }

+ 25 - 25
Startup.cs

@@ -91,8 +91,8 @@ namespace MySystem
             // services.AddHostedService<SycnSpTimer>(); //同步SP数据
 
             // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
-            services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
-            services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
+            // services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
+            // services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
 
             //services.AddHttpContextAccessor();
 
@@ -190,32 +190,32 @@ namespace MySystem
             // TradeStatTimer2.Instance.Start(); //交易统计
 
             //必须打开的
-            ActiveRewardTimer.Instance.Start(); //实时处理激活记录
-            TradeStatTimer.Instance.Start(); //交易统计
-            ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
-            MakeReferenceQrCodeService.Instance.StartListen(); //生成创客邀请二维码
-            SycnSpBindService.Instance.Start(); //同步SP绑定数据
-            SycnSpMerchantService.Instance.Start(); //同步SP商户数据
-            SycnSpActiveService.Instance.Start(); //同步SP激活数据
-            SycnSpTradeService.Instance.Start(); //同步SP交易数据
-            SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
-            SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
-            RedPackageV2Helper.Instance.Start(); //每天生成红包
-            RedPackageV2Helper.Instance.StartStatTop10(); //红包活动统计排行
-            RedPackageV2Helper.Instance.StartSendPrize(); //红包活动发奖
-            BalancePayBackService.Instance.Start(); //余额支付队列
-            ReservePayBackService.Instance.Start(); //储备金支付队列
-            LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
-            MessageCenterService.Instance.Start(); // 消息队列
-            RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
+            // ActiveRewardTimer.Instance.Start(); //实时处理激活记录
+            // TradeStatTimer.Instance.Start(); //交易统计
+            // ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
+            // MakeReferenceQrCodeService.Instance.StartListen(); //生成创客邀请二维码
+            // SycnSpBindService.Instance.Start(); //同步SP绑定数据
+            // SycnSpMerchantService.Instance.Start(); //同步SP商户数据
+            // SycnSpActiveService.Instance.Start(); //同步SP激活数据
+            // SycnSpTradeService.Instance.Start(); //同步SP交易数据
+            // SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
+            // SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
+            // RedPackageV2Helper.Instance.Start(); //每天生成红包
+            // RedPackageV2Helper.Instance.StartStatTop10(); //红包活动统计排行
+            // RedPackageV2Helper.Instance.StartSendPrize(); //红包活动发奖
+            // BalancePayBackService.Instance.Start(); //余额支付队列
+            // ReservePayBackService.Instance.Start(); //储备金支付队列
+            // LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
+            // MessageCenterService.Instance.Start(); // 消息队列
+            // RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
             StoreApplyHelper.Instance.Start(); // 每月1号重置仓库额度
-            StoreApplyHelper.Instance.StartEverTime();
-            StatService.Instance.StatUserLevel(); //升级并分润
+            // StoreApplyHelper.Instance.StartEverTime();
+            // StatService.Instance.StatUserLevel(); //升级并分润
             //必须打开的
 
-            HelpProfitHelper.Instance.Start();
-            HelpProfitPreMerchantHelper.Instance.Start();
-            SetDepositService.Instance.Start(); //费率设置队列
+            // HelpProfitHelper.Instance.Start();
+            // HelpProfitPreMerchantHelper.Instance.Start();
+            // SetDepositService.Instance.Start(); //费率设置队列
 
             // StatService.Instance.StartPosActNum(); //实时统计激活数
             // StatService.Instance.StartNewUserNum(); //实时统计新增创客数

+ 2 - 2
appsettings.json

@@ -17,8 +17,8 @@
     "Host": "http://localhost:5047/",
     "SourceHost": "http://bs.kexiaoshuang.com/",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;charset=utf8;",
-    "Pxc1SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;charset=utf8;",
+    "SqlConnStr": "server=47.108.231.170;port=3306;user=KxsMain;password=mzeqjriUWore0dwT;database=KxsMainServer;charset=utf8;",
+    "Pxc1SqlConnStr": "server=47.108.231.170;port=3306;user=KxsMain;password=mzeqjriUWore0dwT;database=KxsMainServer;charset=utf8;",
     "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
     "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "TendisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",