联动调试完毕

AppStart/Helper/StatService.cs

@@ -369,7 +369,11 @@ namespace MySystem
                         {
                             TopUserId = int.Parse(ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                         }
-                        if((pos.BrandId == 6 || pos.BrandId == 10 || pos.BrandId == 11) && pos.IsFirst == 1) //首台无押金机返50
+                        if(pos.BrandId == 6) //首台无押金机返50
+                        {
+                            doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 50);
+                        }
+                        else if((pos.BrandId == 10 || pos.BrandId == 11) && pos.IsFirst == 1) //首台无押金机返50
                         {
                             doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 50);
                         }

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -82,6 +82,10 @@ namespace MySystem
                                         {
                                             Name = Mer.SeoTitle;
                                         }
+                                        else if (Mer.ProductType == "10")
+                                        {
+                                            Name = Name.Replace("*", "");
+                                        }
                                         Name = Name.Replace("个体户", "");
                                         Name = Name.Replace("个体商户", "");
                                         Name = Name.Replace("企业户", "");

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -31,7 +31,24 @@ namespace MySystem
                     PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
                     DateTime start = DateTime.Now.AddDays(-10);
                     int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/TradeRecordId.txt")));
-                    IQueryable<TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && m.CreateDate >= start && m.Status == 1).OrderBy(m => m.CreateDate);
+                    // IQueryable<TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && m.CreateDate >= start && m.Status == 1).OrderBy(m => m.CreateDate);
+                    List<TradeRecord> trades = new List<TradeRecord>();
+                    trades.Add(new TradeRecord()
+                    {
+                        ProductType = "10",
+                        Field2 = "620522****0017",
+                        Field1 = "199****5853",
+                        DigAmt = 0.00M,
+                        SerEntryMode = "0",
+                        BankCardType = "01",
+                        TradeType = "M015",
+                        TradeAmount = 1000M,
+                        TradeSnNo = "0000320226624650120068",
+                        TradeSerialNo = "23032117055533128544",
+                        MerName = "王**",
+                        MerNo = "110000004032435",
+                        CreateDate = DateTime.Parse("2023-03-21 17:05:55.0"),
+                    });
                     foreach (TradeRecord trade in trades.ToList())
                     {
                         bool op = true;
@@ -201,7 +218,19 @@ namespace MySystem
                                                 BankCardType = 0;
                                             }
                                             if (trade.TradeType == "F010") QrPayFlag = 1;
-
+                                            PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+                                            if(merchant != null)
+                                            {
+                                                if(string.IsNullOrEmpty(merchant.MerIdcardNo) && !string.IsNullOrEmpty(trade.Field2))
+                                                {
+                                                    merchant.MerIdcardNo = trade.Field2; //商户身份证号
+                                                }
+                                                if(!string.IsNullOrEmpty(trade.Field1))
+                                                {
+                                                    merchant.MerchantMobile = trade.Field1; //商户手机号
+                                                }
+                                                db.SaveChanges();
+                                            }
                                         }
                                         int BrandId = pos.BrandId;
                                         // int BrandId = int.Parse(trade.ProductType);
@@ -233,7 +262,8 @@ namespace MySystem
                                             }
                                             else if (DepositAmt > 0 && pos.IsFirst == 1)
                                             {
-                                                int Days = int.Parse(RedisDbconn.Instance.Get<string>("pobjrule:" + pos.BrandId + ":HelpPolicy:Days")); //天数
+                                                string DayString = RedisDbconn.Instance.Get<string>("pobjrule:" + pos.BrandId + ":HelpPolicy:Days");
+                                                int Days = int.Parse(DayString); //天数
                                                 if (pos.BindingTime != null)
                                                 {
                                                     if (pos.BindingTime.Value.AddDays(Days) > DateTime.Now)
@@ -242,6 +272,10 @@ namespace MySystem
                                                     }
                                                 }
                                             }
+                                            if((pos.BrandId == 10 || pos.BrandId == 11) && trade.TradeType == "T015" && MerHelpFlag == 1)
+                                            {
+                                                MerHelpFlag = 0;
+                                            }
                                             int CapFlag = 0;
                                             if(BankCardType == 0 && TradeAmount >= 1666.67M)
                                             {
@@ -287,7 +321,7 @@ namespace MySystem
                                         {
                                             CheckMoney = 5000;
                                         }
-                                        if (BankCardType == 1 || (BankCardType == 2 && pos.BrandId == 1) || (BankCardType == 2 && pos.BrandId == 3))
+                                        if (BankCardType == 1 || (BankCardType == 2 && pos.BrandId == 1) || (BankCardType == 2 && pos.BrandId == 3) || (BankCardType == 1 && trade.TradeType == "M015" && (pos.BrandId == 10 || pos.BrandId == 11)))
                                         {
                                             pos.CreditTrade += SourceTradeAmount;
                                         }
@@ -305,11 +339,6 @@ namespace MySystem
                                             {
                                                 merchant.ActiveStatus = 1;
                                                 merchant.MerStandardDate = DateTime.Now;
-                                                if((pos.BrandId == 10 || pos.BrandId == 11) && string.IsNullOrEmpty(merchant.MerIdcardNo))
-                                                {
-                                                    merchant.MerIdcardNo = trade.Field2; //商户身份证号
-                                                    merchant.MerchantMobile = trade.Field1; //商户手机号
-                                                }
                                                 db.SaveChanges();
 
                                                 // 推荐王逻辑(激活)
@@ -317,7 +346,10 @@ namespace MySystem
                                                 RedisDbconn.Instance.AddList("RecommendActStatQueue", SendData);
 
                                                 //发放开机奖励
-                                                RedisDbconn.Instance.AddList("OpenRewardQueue", pos.Id.ToString());
+                                                if(pos.IsFirst == 1)
+                                                {
+                                                    RedisDbconn.Instance.AddList("OpenRewardQueue", pos.Id.ToString());
+                                                }
                                             }
                                             //发放大盟主奖励
                                             if(pos.LeaderUserId > 0)

Controllers/HomeController.cs

@@ -1174,12 +1174,7 @@ namespace MySystem.Controllers
 
         public string test6()
         {
-            // string result = SetDepositPostService.Instance.LDServiceFee("0000320226636450126740", 99, 11);
-            string result = SetDepositPostService.Instance.LDFeeRate("91635559596276314112", "0.0060", 11);
-            // string content = "IARp4zPEPPcsJJiFrflSJn2dC+K8M1Aig1ch+39tCejtYfIZf62+0963QDhK6DDr9gh0V817KifLVEaMJwKeoXhH1ez58HvGeQz0xahzhUz8nLnQ1Uf5uw98/fHJabW3kZ0tdEN/2w/0m9g6hLsyQ5TQOoF9a//Pu1jbgQRro9w9GtsEi+IHd3Vlkf/B5vwu1ITAUycopfc27g8JwVC4Q+q+lKz6N00LDxUfBUWbZeidEHeq5rNtffZnSp5rrJ7ZUKqC/OlNYbLICPA/XcbgV7xKRxYAIcqa/mumlF9KyIQO4iYvf65sj5LVP9vh0YaWcEhBYyczwHvTxRni9VV4RCMHiQ9fTOMiPnTn0RyPcOMKzNYyxraDuEmla2c/lKRzZvHNwxIrUzpaTaXs+VmEtpEU/T8BBYxowE5gMt+bm5riJ6qbHmZfrBnqXRsRdk3/STZqZ3Goz9nE7bV0kyqYnpK/sg/qrhLGtAjpu9WvTBo7IrF00rahV4IpVXXKLFvjh+0ghKVglQ7ahUU3jx8RsoK8PTSm9LvKEoEDdmOdK7m2atzm6rG/EB67Rs/Mp1yxZTvjlMBuBMnna3LmLFfCkMRBQlIpha2GZKcc1NyH5z2EMOtxTfrt8rYlMRbYRhviDWk96N2Ha169/jzhye495pFJbbIkWssn9XwbvoB2z0Vmsuk7A+IvQ2paogmgeZGpaguWD5YBRTw5zMKlKMHN/Ph5JLaOvjYaHlYOCRPCrFt7WrAKj/Gobrs3MeMT+Bp1z8TpUWL/PqmGP8q/T+rZ7bX9d6F0QO2wKo631eXe0Z6EOXYaAEd/OAfn2NsSyw6BP5DtHxzLMCLJmMoi3E4llA==";
-            // string result = SetDepositPostService.Instance.LDDecrypt(content);
-            //{"mercId":"91635559596276314112","mercName":"刘**","posSn":"0000320226636450126740","bindTime":"2023-03-14 16:32:55","id":"e514cba6ff19466bb9a062a1153175db"}
-            return result;
+            return "ok";
         }
 
         public string sethkfee()

Startup.cs

@@ -135,15 +135,15 @@ namespace MySystem
             {
                 app.UseDeveloperExceptionPage();
                 // app.UseExceptionHandler("/Home/Error");
-                Library.ConfigurationManager.EnvironmentFlag = 1;
+                // Library.ConfigurationManager.EnvironmentFlag = 1;
             }
             else
             {
                 app.UseExceptionHandler("/Home/Error");
                 app.UseHsts();
-                Library.ConfigurationManager.EnvironmentFlag = 2;
+                // Library.ConfigurationManager.EnvironmentFlag = 2;
             }
-            // Library.ConfigurationManager.EnvironmentFlag = 2;
+            Library.ConfigurationManager.EnvironmentFlag = 2;
             Library.function.WritePage("/", "WebRootPath.txt", env.WebRootPath);
             // app.UseStatusCodePagesWithReExecute("/public/errpage/pc/{0}.html");
 

appsettings.Development.json

@@ -22,7 +22,7 @@
     "MainSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsStatServer;charset=utf8;",
     "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
     "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;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",
     "AndroidAppVersion": "1.0.0",
     "OSSKey": "iL9dWgBunZRwGbHQ",