未分配活动金额数据

Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -608,7 +608,9 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("TotalOrder", TotalOrder); //累计订单
             Obj.Add("TotalUser", TotalUser); //会员数
             Obj.Add("TotalActual", TotalActual); //实收总额
-            Obj.Add("AllocationAmount", 0); //未分配活动金额 // TODO:需要统计
+            MerchantInfo merchant = new MerchantInfoService().Query(Id);
+            decimal AllocationAmount = merchant.ActMaxAmount - merchant.ActCurrentAmount;
+            Obj.Add("AllocationAmount", AllocationAmount); //未分配活动金额
 
             return Obj;
         }

MainModels/MerchantInfo.cs

@@ -43,5 +43,7 @@ namespace MySystem.MainModels
         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; }
     }
 }

MainModels/MerchantTradeSummary.cs

@@ -17,14 +17,14 @@ namespace MySystem.MainModels
         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; }
     }

MainModels/WebCMSEntities.cs

@@ -5308,7 +5308,7 @@ namespace MySystem.MainModels
                     .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.MainModels
                     .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.MainModels
             {
                 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("激活统计标记");