更新商城购券打大盟主标记逻辑

AppStart/Helper/AlipayPayBack2Service.cs

@@ -358,7 +358,7 @@ namespace MySystem
                                 if(account.LeaderReserve >= TotalPrice)
                                 {
                                     function.WriteLog("盟主储蓄金够，可返", "操作小盟主购买逻辑监控日志");
-                                    int ReserveRecordId = OpReserve(db, order, LeaderUserId, TotalPrice, 2, 0, "推荐小盟主");
+                                    int ReserveRecordId = OpReserve(db, order, LeaderUserId, TotalPrice, 2, order.UserId, "推荐小盟主");
                                     OpLeaderAccount(db, order, LeaderUserId, TotalPrice, 1, 1, ReserveRecordId);
                                     LeaderUserId = 0;
                                     result = false;

AppStart/Helper/PosCouponPrize/PosCouponPrizeService.cs

@@ -768,7 +768,18 @@ namespace MySystem
             foreach(int couponId in couponIds)
             {
                 PosCoupons coupon = db.PosCoupons.FirstOrDefault(m => m.Id == couponId);
-                if(coupon != null && pacccount.LeaderReserve >= 400 * Count)
+                decimal LeaderReserve = pacccount.LeaderReserve;
+                decimal CheckReserve = 400 * Count;
+                if(LeaderReserve < CheckReserve)
+                {
+                    LeaderReserveRecord ReserveRecord = db.LeaderReserveRecord.FirstOrDefault(m => m.UserId == LeaderUserId && m.Remark == "推荐小盟主" && m.ChangeAmt - m.UsedReserve >= CheckReserve);
+                    if(ReserveRecord != null)
+                    {
+                        LeaderReserve = ReserveRecord.ChangeAmt - ReserveRecord.UsedReserve;
+                        ReserveRecord.UsedReserve += CheckReserve;
+                    }
+                }
+                if(coupon != null && LeaderReserve >= CheckReserve)
                 {
                     coupon.LeaderUserId = LeaderUserId;
                     SetCount += 1;

PxcModels/LeaderReserveRecord.cs

@@ -25,5 +25,6 @@ namespace MySystem.PxcModels
         public string TradeMonth { get; set; }
         public int UserId { get; set; }
         public int AccountRecordId { get; set; }
+        public decimal UsedReserve { get; set; }
     }
 }

PxcModels/PosChannelSet.cs

@@ -15,5 +15,6 @@ namespace MySystem.PxcModels
         public int BrandId { get; set; }
         public string ChannelNo { get; set; }
         public int UserId { get; set; }
+        public int Kind { get; set; }
     }
 }

PxcModels/UpUserRelation.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UpUserRelation
+    {
+        public int UserId { get; set; }
+        public int Floor { get; set; }
+        public int UpUserId { get; set; }
+    }
+}

PxcModels/WebCMSEntities.cs

@@ -254,6 +254,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<TradeDaySummaryBefore> TradeDaySummaryBefore { get; set; }
         public virtual DbSet<TradeRecord> TradeRecord { get; set; }
         public virtual DbSet<TradeRecordTest> TradeRecordTest { get; set; }
+        public virtual DbSet<UpUserRelation> UpUserRelation { get; set; }
         public virtual DbSet<UploadParams> UploadParams { get; set; }
         public virtual DbSet<UserAccount> UserAccount { get; set; }
         public virtual DbSet<UserAccountRecord> UserAccountRecord { get; set; }
@@ -5384,6 +5385,10 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
 
+                entity.Property(e => e.UsedReserve)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("已出款额度");
+
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
@@ -9835,6 +9840,10 @@ namespace MySystem.PxcModels
                     .HasColumnType("datetime")
                     .HasComment("创建时间");
 
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("操作人类型");
+
                 entity.Property(e => e.SnCount)
                     .HasColumnType("int(11)")
                     .HasComment("机具数");
@@ -10537,7 +10546,7 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.MatchTime).HasColumnType("datetime");
 
                 entity.Property(e => e.MerIdcardNo)
-                    .HasColumnType("varchar(18)")
+                    .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -18055,6 +18064,24 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<UpUserRelation>(entity =>
+            {
+                entity.HasKey(e => new { e.UserId, e.UpUserId })
+                    .HasName("PRIMARY");
+
+                entity.HasComment("上级关联表");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpUserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("上级ID");
+
+                entity.Property(e => e.Floor)
+                    .HasColumnType("int(11)")
+                    .HasComment("层级");
+            });
+
             modelBuilder.Entity<UploadParams>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");