Эх сурвалжийг харах

开店宝调低费率流程

lichunlei 3 жил өмнө
parent
commit
a0a529d42e

+ 7 - 1
AppStart/Helper/Profit/HelpProfitHelper.cs

@@ -44,8 +44,12 @@ namespace MySystem
             function.WritePage("/HelpProfitStat/", Month + ".txt", DateTime.Now.ToString());
             function.WritePage("/HelpProfitStat/", Month + ".txt", DateTime.Now.ToString());
             WebCMSEntities db = new WebCMSEntities();
             WebCMSEntities db = new WebCMSEntities();
             List<HelpProfitMerTradeSummay> list = db.HelpProfitMerTradeSummay.Where(m => m.TradeMonth == Month).ToList();
             List<HelpProfitMerTradeSummay> list = db.HelpProfitMerTradeSummay.Where(m => m.TradeMonth == Month).ToList();
+            function.WriteLog("开始:" + DateTime.Now.ToString(), "助利宝分润日志");
+            function.WriteLog("总数:" + list.Count(), "助利宝分润日志");
+            int index = 0;
             foreach(HelpProfitMerTradeSummay sub in list)
             foreach(HelpProfitMerTradeSummay sub in list)
             {
             {
+                index += 1;
                 int MerchantId = sub.MerchantId;
                 int MerchantId = sub.MerchantId;
                 decimal TradeAmount = sub.TradeAmount;
                 decimal TradeAmount = sub.TradeAmount;
                 string TradeDate = sub.TradeDate;
                 string TradeDate = sub.TradeDate;
@@ -181,9 +185,11 @@ namespace MySystem
                     // }
                     // }
                     // selfStat.CreditRewardAmount += money2;
                     // selfStat.CreditRewardAmount += money2;
                     // db.SaveChanges();
                     // db.SaveChanges();
-                }
+                }                
+                function.WriteLog(index + "--Id:" + sub.Id + ";MerchantId:" + sub.MerchantId + ";", "助利宝分润日志");
             }
             }
             db.Dispose();
             db.Dispose();
+            function.WriteLog("结束:" + DateTime.Now.ToString(), "助利宝分润日志");
         }
         }
 
 
         private void AddProfitRecord(WebCMSEntities db, Users puser, PosMachinesTwo pos, PosMerchantInfo merchant, decimal TradeAmount, decimal Prize, string TradeDate, int RewardType)
         private void AddProfitRecord(WebCMSEntities db, Users puser, PosMachinesTwo pos, PosMerchantInfo merchant, decimal TradeAmount, decimal Prize, string TradeDate, int RewardType)

+ 1 - 1
AppStart/Helper/SetDepositPostService.cs

@@ -91,7 +91,7 @@ namespace MySystem
                                             db.SaveChanges();
                                             db.SaveChanges();
                                         }
                                         }
                                     }
                                     }
-                                    else if(pos.BrandId == 2 && Kind == 1) //开店宝
+                                    else if(pos.BrandId == 2) //开店宝
                                     {
                                     {
                                         Fee = Fee / 100;
                                         Fee = Fee / 100;
                                         string content = ModifyFee(pos.PosSn, Fee);
                                         string content = ModifyFee(pos.PosSn, Fee);

+ 2 - 2
AppStart/Helper/SetDepositService.cs

@@ -78,7 +78,7 @@ namespace MySystem
                                         merchant.Status = 1;
                                         merchant.Status = 1;
                                         // merchant.SeoKeyword = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                                         // merchant.SeoKeyword = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                                     }
                                     }
-                                    else if(Kind == 2 && pos.BrandId != 2)
+                                    else if(Kind == 2)
                                     {
                                     {
                                         pos.DownFeeFlag = 1;
                                         pos.DownFeeFlag = 1;
                                         pos.DownFeeMan = OpMan;
                                         pos.DownFeeMan = OpMan;
@@ -89,7 +89,7 @@ namespace MySystem
                                     }
                                     }
                                     db.SaveChanges();
                                     db.SaveChanges();
                                     pos.QueryCount = Kind;
                                     pos.QueryCount = Kind;
-                                    if(Kind > 1 && pos.BrandId != 2) //只有调降发消息
+                                    if(Kind > 1) //只有调降发消息
                                     {
                                     {
                                         if(userPosList.ContainsKey(pos.BuyUserId))
                                         if(userPosList.ContainsKey(pos.BuyUserId))
                                         {
                                         {

+ 23 - 4
Controllers/HomeController.cs

@@ -1227,15 +1227,34 @@ namespace MySystem.Controllers
     
     
         public string setdeposit()
         public string setdeposit()
         {
         {
-            List<string> ordernos = new List<string>();
-            ordernos.Add("17343379");
+            // List<string> ordernos = new List<string>();
+            // ordernos.Add("17343379");
             string content = "";
             string content = "";
-            foreach(string orderno in ordernos)
+            // foreach(string orderno in ordernos)
+            // {
+            //     content += SetDepositPostService.Instance.QueryFee(orderno) + "\n";
+            // }
+            List<string> snnos = new List<string>();
+            foreach(string snno in snnos)
             {
             {
-                content += SetDepositPostService.Instance.QueryFee(orderno) + "\n";
+                content += SetDepositPostService.Instance.ModifyFee(snno, 0.0006M) + "\n";
             }
             }
             return content;
             return content;
         }
         }
+
+        public string putdata()
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            var list = db.PosMachinesFeeChangeRecord.Where(m => m.Sort == 2 && m.Status == 0).ToList();
+            foreach(var sub in list)
+            {
+                Users user = db.Users.FirstOrDefault(m => m.Id == sub.UserId) ?? new Users();
+                string info = "{\"RecordId\":\"" + sub.Id + "\",\"PosId\":\"" + sub.PosId + "\",\"Fee\": \"0.6\",\"Kind\": \"2\",\"OpMan\": \"" + user.MakerCode + "\"}";
+                RedisDbconn.Instance.AddList("SetDepositQueue", info);
+            }
+            db.Dispose();
+            return "ok";
+        }
     
     
     }
     }
 }
 }

+ 26 - 26
Startup.cs

@@ -91,8 +91,8 @@ namespace MySystem
             // services.AddHostedService<SycnSpTimer>(); //同步SP数据
             // services.AddHostedService<SycnSpTimer>(); //同步SP数据
 
 
             // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
             // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
-            services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
-            services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
+            // services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
+            // services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
 
 
             //services.AddHttpContextAccessor();
             //services.AddHttpContextAccessor();
 
 
@@ -185,33 +185,33 @@ namespace MySystem
             });
             });
 
 
             //必须打开的
             //必须打开的
-            ActiveRewardTimer.Instance.Start(); //实时处理激活记录
-            ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
-            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();
+            // ActiveRewardTimer.Instance.Start(); //实时处理激活记录
+            // ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
+            // 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(); //升级并分润
             // StatService.Instance.StatUserLevel(); //升级并分润
             //必须打开的
             //必须打开的
 
 
-            HelpProfitHelper.Instance.Start();
-            HelpProfitPreMerchantHelper.Instance.Start();
-            SetDepositService.Instance.Start(); //调整费率(通知、标记)
-            SetDepositPostService.Instance.Start(); //提交支付公司设置费率接口
-            SetDepositPostService.Instance.StartKdb(); //监控开店宝费率设置结果
-            SetFeeFlagService.Instance.Start(); //178天提前通知创客费率调升消息
+            // HelpProfitHelper.Instance.Start();
+            // HelpProfitPreMerchantHelper.Instance.Start();
+            // SetDepositService.Instance.Start(); //调整费率(通知、标记)
+            // SetDepositPostService.Instance.Start(); //提交支付公司设置费率接口
+            // SetDepositPostService.Instance.StartKdb(); //监控开店宝费率设置结果
+            // SetFeeFlagService.Instance.Start(); //178天提前通知创客费率调升消息
 
 
             // StatService.Instance.StartPosActNum(); //实时统计激活数
             // StatService.Instance.StartPosActNum(); //实时统计激活数
             // StatService.Instance.StartNewUserNum(); //实时统计新增创客数
             // StatService.Instance.StartNewUserNum(); //实时统计新增创客数

+ 3 - 3
appsettings.json

@@ -17,10 +17,10 @@
     "Host": "http://localhost:5047/",
     "Host": "http://localhost:5047/",
     "SourceHost": "http://bs.kexiaoshuang.com/",
     "SourceHost": "http://bs.kexiaoshuang.com/",
     "Database": "KxsMainServer",
     "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;",
     "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",
+    "RedisConnStr": "47.108.207.184:6379,password=skb@redis2022,DefaultDatabase=0,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
     "OSSKey": "iL9dWgBunZRwGbHQ",
     "OSSKey": "iL9dWgBunZRwGbHQ",