暂存

Areas/Api/Controllers/Main/ConsumerOrdersController.cs

@@ -134,7 +134,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             var ledgerModel = ActFlag ? "5" : "1";
 
-            var infos = ConsumerOrdersUtil.AddConsumerOrders(MerchantId, ConsumerId, merchant.UserId, PayMode, PayMoney, SnNo, OrderNo, ActFlag ? (PayMoney * 0.99M) * merchantset.DiviPercent / 100 : 0, ActFlag ? 1u : 0u, ActFlag ? PayMoney * merchantset.GetPercent / 100 : PayMoney, Newtonsoft.Json.JsonConvert.SerializeObject(merchantset));
+            var infos = ConsumerOrdersUtil.AddConsumerOrders(MerchantId, ConsumerId, merchant.UserId, PayMode, PayMoney, SnNo, OrderNo, ActFlag ? (PayMoney * 0.99M) * merchantset.DiviPercent / 100 : 0, ActFlag ? 1u : 0u, ActFlag ? PayMoney * merchantset.GetPercent / 100 : PayMoney, Newtonsoft.Json.JsonConvert.SerializeObject(merchantset), merchantset.Version);
             ConsumerOrderForNoUtil.AddConsumerOrderForNo(OrderNo, int.Parse(infos.Data.ToString()));
             if (PayMode == 1)
             {

Models/Main/ConsumerOrders.cs

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

Models/Main/MerchantAddInfo.cs

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

Models/Main/WebCMSEntities.cs

@@ -2312,6 +2312,10 @@ namespace MySystem.Models.Main
                     .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.Models.Main
                     .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")

Models/Main1/ConsumerOrders.cs

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

Models/Main1/MerchantAddInfo.cs

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

Models/Main1/WebCMSEntities.cs

@@ -2312,6 +2312,10 @@ namespace MySystem.Models.Main1
                     .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.Models.Main1
                     .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")

Util/Main/ConsumerOrdersUtil.cs

@@ -24,8 +24,9 @@ namespace MySystem
         /// <param name="IsAct"></param>
         /// <param name="MerchantActualAmount"></param>
         /// <param name="SeoDescription"></param>
+        /// <param name="SetRecordId"></param>
         /// <returns></returns>
-        public static AppResultJson AddConsumerOrders(int MerchantId, int ConsumerId, int UserId, int PayMode, decimal PayMoney, string SnNo, string OrderNo, decimal MaxDivi, uint IsAct, decimal MerchantActualAmount, string SeoDescription)
+        public static AppResultJson AddConsumerOrders(int MerchantId, int ConsumerId, int UserId, int PayMode, decimal PayMoney, string SnNo, string OrderNo, decimal MaxDivi, uint IsAct, decimal MerchantActualAmount, string SeoDescription, int SetRecordId)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("MerchantId", MerchantId);
@@ -39,6 +40,7 @@ namespace MySystem
             Fields.Add("IsAct", IsAct);
             Fields.Add("MerchantActualAmount", MerchantActualAmount);
             Fields.Add("SeoDescription", SeoDescription);
+            Fields.Add("SetRecordId", SetRecordId);
             var info = ConsumerOrdersService.Add(Fields);
             return info;
         }