Browse Source

修复返现逻辑问题

lcl 1 year ago
parent
commit
6d8b6039bc

+ 20 - 0
.vscode/launch.json

@@ -23,6 +23,26 @@
                 "/Views": "${workspaceFolder}/Views"
             }
         },
+        {
+            "name": ".NET Core Launch (pro)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/bin/Debug/netcoreapp3.0/MySystem.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "^\\s*Now listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Production"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
         {
             "name": ".NET Core Attach",
             "type": "coreclr",

+ 4 - 1
Util/HaoDa/ProfitHelper.cs

@@ -164,7 +164,9 @@ namespace MySystem
                                                     MerchantAddInfo merchantAdd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == suborder.MerchantId) ?? new MerchantAddInfo();
                                                     
                                                     //聚合支付退款
-                                                    var info = HaoDaHelper.Instance.AggregatedPayRefund(merchantAdd.OutMchtNo, merchantAdd.StoreNo, "HDTK" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), order.OrderNo, Math.Round(GetMoney, 2).ToString());
+                                                    decimal RefundAmount = GetMoney * 100;
+                                                    RefundAmount = Math.Round(RefundAmount, 2);
+                                                    var info = HaoDaHelper.Instance.AggregatedPayRefund(merchantAdd.OutMchtNo, merchantAdd.StoreNo, "HDTK" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), order.OrderNo, RefundAmount.ToString("f0"));
 
                                                     merchant.ActCurrentAmount += Math.Round(GetMoney, 2); //活动已返金额
                                                     db.SaveChanges();
@@ -176,6 +178,7 @@ namespace MySystem
                                                     {
                                                         OutCount += 1;
                                                     }
+                                                    Thread.Sleep(1000);
                                                 }
                                             }
                                             else

+ 2 - 2
Util/HaoDa/WeChatPayBackService.cs

@@ -98,7 +98,7 @@ namespace MySystem
                 try
                 {
                     WebCMSEntities db = new WebCMSEntities();
-                    DateTime checkDate = DateTime.Now.AddMinutes(-1);
+                    DateTime checkDate = DateTime.Now.AddMinutes(-2);
                     var list = db.ConsumerOrders.Select(m => new { m.Id, m.CreateDate, m.Status, m.IsAct, m.PayMode }).Where(m => m.Status == 1 && m.IsAct == 1 && m.CreateDate < checkDate).OrderBy(m => m.Id).Take(10).ToList();
                     foreach (var sub in list)
                     {
@@ -128,7 +128,7 @@ namespace MySystem
                                     //开始监听分账状态
                                     Dictionary<string, object> req = new Dictionary<string, object>();
                                     req.Add("ApplyNo", applyNo);
-                                    req.Add("OrderNo", orderNo);
+                                    req.Add("OrderNo", order.OrderNo);
                                     req.Add("MchtNo", mchtNo);
                                     RedisDbconn.Instance.AddList("ProfitShareHdQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
                                 }

+ 1 - 1
appsettings.Development.json

@@ -13,7 +13,7 @@
     "SqlConnStr1": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "SqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",
-    "RedisConnStr": "8.137.99.48:6379,password=kxsmp@2023,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
+    "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=5,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
     "OSSKey": "iL9dWgBunZRwGbHQ",