暂存

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

@@ -340,6 +340,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     IsAct = ActFlag ? 1u : 0u,
                     MerchantActualAmount = ActFlag ? PayMoney * merchantset.GetPercent / 100 : PayMoney,
                     SeoDescription = Newtonsoft.Json.JsonConvert.SerializeObject(merchantset),
+                    SetRecordId = merchantset.Version, //活动参记录数Id
                 }).Entity;
                 maindb.SaveChanges();
                 maindb.ConsumerOrderForNo.Add(new ConsumerOrderForNo()

MainModels/ConsumerOrders.cs

@@ -33,5 +33,6 @@ namespace MySystem.MainModels
         public int DivideFlag { get; set; }
         public DateTime? DivideDate { get; set; }
         public string TradePayNo { get; set; }
+        public int SetRecordId { get; set; }
     }
 }

MainModels/MerchantAddInfo.cs

@@ -144,5 +144,6 @@ namespace MySystem.MainModels
         public string OutMchtNo { get; set; }
         public string AliMerchantId { get; set; }
         public string WeChatMerchantId { get; set; }
+        public string MerchantType { get; set; }
     }
 }

MainModels/WebCMSEntities.cs

@@ -2312,6 +2312,10 @@ namespace MySystem.MainModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.SetRecordId)
+                    .HasColumnType("int(11)")
+                    .HasComment("活动记录Id");
+
                 entity.Property(e => e.SnNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -5525,6 +5529,12 @@ namespace MySystem.MainModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.MerchantType)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MiniProgramAppid)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")

MainModels2/ConsumerOrders.cs

@@ -33,5 +33,6 @@ namespace MySystem.MainModels2
         public DateTime? DivideDate { get; set; }
         public string DivideLog { get; set; }
         public string TradePayNo { get; set; }
+        public int SetRecordId { get; set; }
     }
 }

MainModels2/MerchantAddInfo.cs

@@ -147,5 +147,6 @@ namespace MySystem.MainModels2
         public int HdStatus { get; set; }
         public DateTime? HdPassDate { get; set; }
         public ulong HdBindWeChat { get; set; }
+        public string MerchantType { get; set; }
     }
 }

MainModels2/WebCMSEntities.cs

@@ -2312,6 +2312,10 @@ namespace MySystem.MainModels2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.SetRecordId)
+                    .HasColumnType("int(11)")
+                    .HasComment("活动记录Id");
+
                 entity.Property(e => e.SnNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -5538,6 +5542,12 @@ namespace MySystem.MainModels2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.MerchantType)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MiniProgramAppid)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")