瀏覽代碼

下单存商家实收比例

lcl 1 年之前
父節點
當前提交
3047444b52

+ 1 - 0
Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs

@@ -284,6 +284,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 OrderNo = OrderNo,
                 MaxDivi = ActFlag ? PayMoney * merchantset.DiviPercent / 100 : 0,
                 IsAct = ActFlag ? 1u : 0u,
+                MerchantActualAmount = ActFlag ? PayMoney * merchantset.GetPercent / 100 : PayMoney,
                 SeoDescription = Newtonsoft.Json.JsonConvert.SerializeObject(merchantset),
             }).Entity;
             maindb.SaveChanges();

+ 1 - 0
MainModels/ConsumerOrders.cs

@@ -28,5 +28,6 @@ namespace MySystem.MainModels
         public int MerchantId { get; set; }
         public ulong IsAct { get; set; }
         public int UserId { get; set; }
+        public decimal MerchantActualAmount { get; set; }
     }
 }

+ 1 - 0
MainModels/MerchantInfo.cs

@@ -40,5 +40,6 @@ namespace MySystem.MainModels
         public int ActivationStatus { get; set; }
         public decimal TotalActActual { get; set; }
         public decimal TotalActAmount { get; set; }
+        public int ActStat { get; set; }
     }
 }

+ 8 - 0
MainModels/WebCMSEntities.cs

@@ -2120,6 +2120,10 @@ namespace MySystem.MainModels
 
                 entity.Property(e => e.MaxDivi).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.MerchantActualAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("商家实收");
+
                 entity.Property(e => e.MerchantId).HasColumnType("int(11)");
 
                 entity.Property(e => e.OrderNo)
@@ -5920,6 +5924,10 @@ namespace MySystem.MainModels
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.ActStat)
+                    .HasColumnType("int(11)")
+                    .HasComment("激活统计标记");
+
                 entity.Property(e => e.ActivationDate).HasColumnType("datetime");
 
                 entity.Property(e => e.ActivationStatus).HasColumnType("int(11)");