lcl 10 mesi fa
parent
commit
4cd31a5ba1

+ 2 - 1
AppStart/Helper/AlipayPayBack2Service.cs

@@ -180,7 +180,7 @@ namespace MySystem
                                 CouponCount = 50 * pro.ProductCount;
                             }
                             string Codes = "";
-                            var coupons = db.PosCoupons.Where(m => m.IsLock == 0 && m.IsUse == 0 && m.UserId == 0 && m.QueryCount == Kind).OrderBy(m => m.Id).Take(CouponCount).ToList();
+                            var coupons = db.PosCoupons.Where(m => m.IsLock == 0 && m.IsUse == 0 && m.Sort == 0 && m.UserId == 0 && m.QueryCount == Kind).OrderBy(m => m.Id).Take(CouponCount).ToList();
                             int RecordId = 0;
                             if(coupons.Count > 0 && (pro.ProductId == 34 || pro.ProductId == -2))
                             {
@@ -200,6 +200,7 @@ namespace MySystem
                                 {
                                     item.CreateDate = DateTime.Now;
                                     item.UserId = order.UserId;
+                                    item.Sort = 1;
                                     item.UpdateDate = DateTime.Now.AddDays(180);
                                     if(pro.ProductId == 34 || pro.ProductId == -2)
                                     {

+ 4 - 2
AppStart/Helper/LeaderApplyCouponsHelper.cs

@@ -50,11 +50,12 @@ namespace MySystem
                             //电签
                             if (type == 1)
                             {
-                                var dposCoupons = db.PosCoupons.Where(m => m.QueryCount == 1 && m.UserId == 0 && m.LeaderUserId == 0 && m.IsUse == 0 && m.IsLock == 0 && m.OpId == 0).Take(num).ToList();//电签券
+                                var dposCoupons = db.PosCoupons.Where(m => m.QueryCount == 1 && m.UserId == 0 && m.LeaderUserId == 0 && m.IsUse == 0 && m.IsLock == 0 && m.Sort == 0 && m.OpId == 0).Take(num).ToList();//电签券
                                 foreach (var item in dposCoupons)
                                 {
                                     var posCoupon = db.PosCoupons.FirstOrDefault(m => m.Id == item.Id) ?? new PosCoupons();
                                     posCoupon.UserId = queryList.UserId;
+                                    posCoupon.Sort = 1;
                                     db.UserSnDelayChange.Add(new UserSnDelayChange()
                                     {
                                         CreateDate = DateTime.Now,
@@ -70,11 +71,12 @@ namespace MySystem
                             //大机
                             if (type == 2)
                             {
-                                var bposCoupons = db.PosCoupons.Where(m => m.QueryCount == 2 && m.UserId == 0 && m.LeaderUserId == 0 && m.IsUse == 0 && m.IsLock == 0 && m.OpId == 0).Take(num).ToList();//大机券
+                                var bposCoupons = db.PosCoupons.Where(m => m.QueryCount == 2 && m.UserId == 0 && m.LeaderUserId == 0 && m.IsUse == 0 && m.IsLock == 0 && m.Sort == 0 && m.OpId == 0).Take(num).ToList();//大机券
                                 foreach (var items in bposCoupons)
                                 {
                                     var posCoupon = db.PosCoupons.FirstOrDefault(m => m.Id == items.Id) ?? new PosCoupons();
                                     posCoupon.UserId = queryList.UserId;
+                                    posCoupon.Sort = 1;
                                     db.UserSnDelayChange.Add(new UserSnDelayChange()
                                     {
                                         CreateDate = DateTime.Now,