修复返现金额四舍五入问题

.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",

AppStart/Helper/Profit/ProfitHelper.cs

@@ -260,7 +260,7 @@ namespace MySystem
                                                         ConsumerId = suborder.ConsumerId,
                                                         MerchantId = suborder.MerchantId,
                                                         OrderId = suborder.Id,
-                                                        GetMoney = GetMoney,
+                                                        GetMoney = Math.Round(GetMoney, 2),
                                                         QueryCount = PayMode,
                                                         Sort = OrderId,
                                                         SeoTitle = suborder.OrderNo,
@@ -270,12 +270,15 @@ namespace MySystem
                                                     MerchantAddInfo merchantAdd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == suborder.MerchantId) ?? new MerchantAddInfo();
                                                     if(order.PayMode == 1)
                                                     {
-                                                        AlipayFunction.Instance.Refund(suborder.SeoTitle, GetMoney.ToString("f2"), "门店分红", merchantAdd.AlipayAuthToken);
+                                                        AlipayFunction.Instance.Refund(suborder.SeoTitle, Math.Round(GetMoney, 2).ToString(), "门店分红", merchantAdd.AlipayAuthToken);
                                                     }
                                                     else
                                                     {
-                                                        Dictionary<string, string> dic = WeChatFunction.Instance.Refund(merchantAdd.SubMchid, GetMoney, suborder.PayMoney, suborder.OrderNo, DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), "门店分红");
+                                                        Dictionary<string, string> dic = WeChatFunction.Instance.Refund(merchantAdd.SubMchid, Math.Round(GetMoney, 2), suborder.PayMoney, suborder.OrderNo, DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), "门店分红");
                                                     }
+                                                    merchant.ActCurrentAmount += Math.Round(GetMoney, 2); //活动已返金额
+                                                    db.SaveChanges();
+
                                                     if (suborder.CurDivi < suborder.MaxDivi)
                                                     {
                                                         RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + PayMode + ":" + MerchantId, suborder);

Controllers/HomeController.cs

@@ -98,13 +98,17 @@ namespace MySystem.Controllers
             // string content = AlipayFunction.Instance.BindSettleRelation(DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), AlipayFunction.Instance.Pid, "202307BB6d61386d17104395831e3ea6309f0X57");
 
             List<string> ordernos = new List<string>();
-            ordernos.Add("2023083019332524572956227");
-            ordernos.Add("2023083019074537864707613");
-            ordernos.Add("2023083018462355777416530");
-            ordernos.Add("2023083117294078199622992");
-            ordernos.Add("2023083019084486627044747");
-            ordernos.Add("2023083018570978806149820");
-            ordernos.Add("2023083015062525323846663");
+            ordernos.Add("2023083018185453946193409");
+            ordernos.Add("2023083020130453429050364");
+            ordernos.Add("2023083020120518590325447");
+            ordernos.Add("2023083018145549174540449");
+            ordernos.Add("2023083018233529291795428");
+            ordernos.Add("2023083019384237451076842");
+            ordernos.Add("2023091220063534056177559");
+            ordernos.Add("2023083019193537632563171");
+            ordernos.Add("2023083019152337193420395");
+            ordernos.Add("2023083018121967866866300");
+            ordernos.Add("2023081715193607722249986");
             WebCMSEntities db = new WebCMSEntities();
             List<ConsumerOrders> orders = db.ConsumerOrders.Where(m => ordernos.Contains(m.OrderNo)).OrderBy(m => m.Id).ToList();
             foreach(ConsumerOrders order in orders)

Models/MerchantInfo.cs

@@ -43,5 +43,7 @@ namespace MySystem.Models
         public int ActStat { get; set; }
         public DateTime? SignDate { get; set; }
         public decimal AllocationAmount { get; set; }
+        public decimal ActMaxAmount { get; set; }
+        public decimal ActCurrentAmount { get; set; }
     }
 }

Models/MerchantTradeSummary.cs

@@ -17,14 +17,14 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public decimal AliPayInFactAmount { get; set; }
+        public decimal WeChatInfactAmount { get; set; }
         public int OderCount { get; set; }
         public decimal InFactAmount { get; set; }
         public decimal TradeAmount { get; set; }
         public string TradeDate { get; set; }
         public string TradeMonth { get; set; }
         public int MerchantId { get; set; }
-        public decimal AliPayInFactAmount { get; set; }
-        public decimal WeChatInfactAmount { get; set; }
         public decimal ActAmount { get; set; }
         public decimal NonActAmount { get; set; }
     }

Models/WebCMSEntities.cs

@@ -5308,7 +5308,7 @@ namespace MySystem.Models
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.BizStoreAddress)
-                    .HasColumnType("varchar(50)")
+                    .HasColumnType("varchar(100)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -5816,7 +5816,7 @@ namespace MySystem.Models
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.WeChatSignUrl)
-                    .HasColumnType("longtext")
+                    .HasColumnType("varchar(500)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -6503,6 +6503,14 @@ namespace MySystem.Models
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.ActCurrentAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("活动已返金额");
+
+                entity.Property(e => e.ActMaxAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("活动应返金额");
+
                 entity.Property(e => e.ActStat)
                     .HasColumnType("int(11)")
                     .HasComment("激活统计标记");