屏蔽运营中心新的额度记录

AppStart/Helper/AddActService.cs

@@ -75,26 +75,26 @@ namespace MySystem
                                 {
                                     RedisDbconn.Instance.AddList("OperatePrizeQueue", pos.Id);
                                 }
-                                // AlipayPayBack2Service.Instance.ActReserveBack(pos.OpId, pos.OpReserve1, pos.OpReserve2, pos.OpReserve3);
+                                AlipayPayBack2Service.Instance.ActReserveBack(pos.OpId, pos.OpReserve1, pos.OpReserve2, pos.OpReserve3);
 
                                 //统计激活数
                                 RedisDbconn.Instance.AddList("StatActQueue", "{\"TradeDate\":\"" + DateTime.Now.ToString("yyyyMMdd") + "\",\"UserId\":\"" + pos.BuyUserId + "\",\"BrandId\":\"" + pos.BrandId + "\"}");
 
                                 //运营中心额度变更
-                                OpAmountItem item = new OpAmountItem()
-                                {
-                                    UserId = pos.OpId,
-                                    OperateType = 1,
-                                    ChangeType = 9,
-                                    Remark = "机具激活",
-                                    UseAmount = pos.OpReserve1 + pos.OpReserve2 + pos.OpReserve3,
-                                    UseValidForGetAmount = pos.OpReserve2,
-                                    UseTotalAmt = pos.OpReserve1,
-                                    UseValidAmount = pos.OpReserve3,
-                                    DataType = 2,
-                                    DataId = pos.Id,
-                                };
-                                RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
+                                // OpAmountItem item = new OpAmountItem()
+                                // {
+                                //     UserId = pos.OpId,
+                                //     OperateType = 1,
+                                //     ChangeType = 9,
+                                //     Remark = "机具激活",
+                                //     UseAmount = pos.OpReserve1 + pos.OpReserve2 + pos.OpReserve3,
+                                //     UseValidForGetAmount = pos.OpReserve2,
+                                //     UseTotalAmt = pos.OpReserve1,
+                                //     UseValidAmount = pos.OpReserve3,
+                                //     DataType = 2,
+                                //     DataId = pos.Id,
+                                // };
+                                // RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
                             }
                             db.Dispose();
                         }

AppStart/Helper/AlipayPayBack2Service.cs

@@ -375,21 +375,21 @@ namespace MySystem
                                 }
                                 if(TotalPrice > 0)
                                 {
-                                    // OperateAmountChange(opdb, LeaderUserId, TotalPrice, 2, 1, "商城购机", true, order.Id);
-                                    // OperateAmountChange(opdb, LeaderUserId, TotalPrice, 1, 2, "商城购机", true, order.Id);
-                                    OpAmountItem item = new OpAmountItem()
-                                    {
-                                        UserId = LeaderUserId,
-                                        OperateType = 0,
-                                        ChangeType = 14,
-                                        Remark = "购买小盟主",
-                                        UseAmount = TotalPrice,
-                                        UseValidForGetAmount = TotalPrice,
-                                        UseTotalAmt = TotalPrice,
-                                        DataType = 1,
-                                        DataId = order.Id,
-                                    };
-                                    RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
+                                    OperateAmountChange(opdb, LeaderUserId, TotalPrice, 2, 1, "商城购机", true, order.Id);
+                                    OperateAmountChange(opdb, LeaderUserId, TotalPrice, 1, 2, "商城购机", true, order.Id);
+                                    // OpAmountItem item = new OpAmountItem()
+                                    // {
+                                    //     UserId = LeaderUserId,
+                                    //     OperateType = 0,
+                                    //     ChangeType = 14,
+                                    //     Remark = "购买小盟主",
+                                    //     UseAmount = TotalPrice,
+                                    //     UseValidForGetAmount = TotalPrice,
+                                    //     UseTotalAmt = TotalPrice,
+                                    //     DataType = 1,
+                                    //     DataId = order.Id,
+                                    // };
+                                    // RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
                                     LeaderUserId = 0;
                                     result = false;
                                 }
@@ -673,21 +673,21 @@ namespace MySystem
                         OpModels.UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == UserId) ?? new OpModels.UserAccount();
                         if(account.TotalAmt >= Money)
                         {
-                            // OperateAmountChange(db, UserId, Money, 2, 1, "商城购机", true, OrderId);
-                            // OperateAmountChange(db, UserId, Money, 1, 2, "商城购机", true, OrderId);
-                            OpAmountItem item = new OpAmountItem()
-                            {
-                                UserId = UserId,
-                                OperateType = 0,
-                                ChangeType = 5,
-                                Remark = Remark,
-                                UseAmount = Money,
-                                UseValidForGetAmount = Money,
-                                UseTotalAmt = Money,
-                                DataType = 1,
-                                DataId = OrderId,
-                            };
-                            RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
+                            OperateAmountChange(db, UserId, Money, 2, 1, "商城购机", true, OrderId);
+                            OperateAmountChange(db, UserId, Money, 1, 2, "商城购机", true, OrderId);
+                            // OpAmountItem item = new OpAmountItem()
+                            // {
+                            //     UserId = UserId,
+                            //     OperateType = 0,
+                            //     ChangeType = 5,
+                            //     Remark = Remark,
+                            //     UseAmount = Money,
+                            //     UseValidForGetAmount = Money,
+                            //     UseTotalAmt = Money,
+                            //     DataType = 1,
+                            //     DataId = OrderId,
+                            // };
+                            // RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
                             UserId = 0;
                         }
                         else
@@ -721,21 +721,21 @@ namespace MySystem
             }
             if(Money > 0)
             {
-                // OperateAmountChange(db, UserId, Money, 2, 1, "商城购机", true, OrderId);
-                // OperateAmountChange(db, UserId, Money, 1, 2, "商城购机", true, OrderId);
-                OpAmountItem item = new OpAmountItem()
-                {
-                    UserId = UserId,
-                    OperateType = 0,
-                    ChangeType = 5,
-                    Remark = "商城购机",
-                    UseAmount = Money,
-                    UseValidForGetAmount = Money,
-                    UseTotalAmt = Money,
-                    DataType = 2,
-                    DataId = OrderId,
-                };
-                RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
+                OperateAmountChange(db, UserId, Money, 2, 1, "商城购机", true, OrderId);
+                OperateAmountChange(db, UserId, Money, 1, 2, "商城购机", true, OrderId);
+                // OpAmountItem item = new OpAmountItem()
+                // {
+                //     UserId = UserId,
+                //     OperateType = 0,
+                //     ChangeType = 5,
+                //     Remark = "商城购机",
+                //     UseAmount = Money,
+                //     UseValidForGetAmount = Money,
+                //     UseTotalAmt = Money,
+                //     DataType = 2,
+                //     DataId = OrderId,
+                // };
+                // RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
             }
             db.Dispose();
         }

AppStart/Helper/Operate/OperateAmountService.cs

@@ -39,63 +39,63 @@ namespace MySystem
                         int Kind = int.Parse(function.CheckInt(jsonObj["Kind"].ToString())); //1-机具，2-机具券
                         decimal Amount = decimal.Parse(function.CheckNum(jsonObj["Amount"].ToString()));
                         
-                        // UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == UserId);
-                        // if (account == null)
-                        // {
-                        //     account = db.UserAccount.Add(new UserAccount()
-                        //     {
-                        //         Id = UserId,
-                        //         UserId = UserId,
-                        //     }).Entity;
-                        //     db.SaveChanges();
-                        // }
-                        // decimal BeforeAmount = account.ValidAmount; //变更前总金额
-                        // account.ValidAmount += Amount;
-                        // decimal AfterAmount = account.ValidAmount; //变更后总金额
-                        // AmountRecord add = db.AmountRecord.Add(new AmountRecord()
-                        // {
-                        //     CreateDate = DateTime.Now,
-                        //     UpdateDate = DateTime.Now,
-                        //     OperateType = 1,
-                        //     AfterAmount = AfterAmount,
-                        //     AfterValidForGetAmount = account.ValidForGetAmount,
-                        //     AfterTotalAmt = account.TotalAmt,
-                        //     AfterValidAmount = account.ValidAmount,
-                        //     BeforeAmount = BeforeAmount,
-                        //     UseAmount = Amount,
-                        //     UserId = UserId,
-                        //     ApplyId = DataId,
-                        //     SeoDescription = Kind == 1 ? "机具激活返还" : "机具券兑换返还",
-                        //     Version = 3,
-                        // }).Entity;
-                        // db.SaveChanges();
-
-                        // AmountChangeRecord amountChangeRecord = db.AmountChangeRecord.Add(new AmountChangeRecord()
-                        // {
-                        //     AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                        //     CreateDate = DateTime.Now,
-                        //     Title = Kind == 1 ? "机具激活返还" : "机具券兑换返还",
-                        //     UserId = UserId, //运营中心Id
-                        //     BeforeAmount = BeforeAmount,//使用前剩余额度
-                        //     AfterAmount = AfterAmount,//使用后剩余额度
-                        //     ChangeAmount = Amount,//操作金额
-                        //     OperateType = 1,//操作类别
-                        // }).Entity;
-
-                        // db.Dispose();
-
-                        OpAmountItem item = new OpAmountItem()
+                        UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == UserId);
+                        if (account == null)
                         {
-                            UserId = UserId,
+                            account = db.UserAccount.Add(new UserAccount()
+                            {
+                                Id = UserId,
+                                UserId = UserId,
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        decimal BeforeAmount = account.ValidAmount; //变更前总金额
+                        account.ValidAmount += Amount;
+                        decimal AfterAmount = account.ValidAmount; //变更后总金额
+                        AmountRecord add = db.AmountRecord.Add(new AmountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
                             OperateType = 1,
-                            ChangeType = Kind == 1 ? 9 : 23,
-                            Remark = Kind == 1 ? "机具激活返还" : "机具券兑换返还",
+                            AfterAmount = AfterAmount,
+                            AfterValidForGetAmount = account.ValidForGetAmount,
+                            AfterTotalAmt = account.TotalAmt,
+                            AfterValidAmount = account.ValidAmount,
+                            BeforeAmount = BeforeAmount,
                             UseAmount = Amount,
-                            UseValidAmount = Amount,
-                            DataType = Kind == 1 ? 2 : 6,
-                            DataId = DataId,
-                        };
-                        RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
+                            UserId = UserId,
+                            ApplyId = DataId,
+                            SeoDescription = Kind == 1 ? "机具激活返还" : "机具券兑换返还",
+                            Version = 3,
+                        }).Entity;
+                        db.SaveChanges();
+
+                        AmountChangeRecord amountChangeRecord = db.AmountChangeRecord.Add(new AmountChangeRecord()
+                        {
+                            AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
+                            CreateDate = DateTime.Now,
+                            Title = Kind == 1 ? "机具激活返还" : "机具券兑换返还",
+                            UserId = UserId, //运营中心Id
+                            BeforeAmount = BeforeAmount,//使用前剩余额度
+                            AfterAmount = AfterAmount,//使用后剩余额度
+                            ChangeAmount = Amount,//操作金额
+                            OperateType = 1,//操作类别
+                        }).Entity;
+
+                        db.Dispose();
+
+                        // OpAmountItem item = new OpAmountItem()
+                        // {
+                        //     UserId = UserId,
+                        //     OperateType = 1,
+                        //     ChangeType = Kind == 1 ? 9 : 23,
+                        //     Remark = Kind == 1 ? "机具激活返还" : "机具券兑换返还",
+                        //     UseAmount = Amount,
+                        //     UseValidAmount = Amount,
+                        //     DataType = Kind == 1 ? 2 : 6,
+                        //     DataId = DataId,
+                        // };
+                        // RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
                     }
                     catch (Exception ex)
                     {

AppStart/Helper/PosCouponPrize/PosCouponPrizeService.cs

@@ -185,24 +185,24 @@ namespace MySystem
                             {
                                 BackAccountFlag = true;
                                 decimal GetAmount = GetWithdrawMoney(parentUser) * order.BuyCount;
-                                // //扣减备用金
-                                // OperateAmountChange(opdb, parentUser.Id, GetAmount, 2, 1, "商城购机", true, order.Id);
-                                // //返回到余额
-                                // OperateAmountChange(opdb, parentUser.Id, GetAmount, 1, 2, "商城购机", true, order.Id);
+                                //扣减备用金
+                                OperateAmountChange(opdb, parentUser.Id, GetAmount, 2, 1, "商城购机", true, order.Id);
+                                //返回到余额
+                                OperateAmountChange(opdb, parentUser.Id, GetAmount, 1, 2, "商城购机", true, order.Id);
 
-                                OpAmountItem item = new OpAmountItem()
-                                {
-                                    UserId = parentUser.Id,
-                                    OperateType = 0,
-                                    ChangeType = 5,
-                                    Remark = "商城购机",
-                                    UseAmount = GetAmount,
-                                    UseValidForGetAmount = GetAmount,
-                                    UseTotalAmt = GetAmount,
-                                    DataType = 1,
-                                    DataId = order.Id,
-                                };
-                                RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
+                                // OpAmountItem item = new OpAmountItem()
+                                // {
+                                //     UserId = parentUser.Id,
+                                //     OperateType = 0,
+                                //     ChangeType = 5,
+                                //     Remark = "商城购机",
+                                //     UseAmount = GetAmount,
+                                //     UseValidForGetAmount = GetAmount,
+                                //     UseTotalAmt = GetAmount,
+                                //     DataType = 1,
+                                //     DataId = order.Id,
+                                // };
+                                // RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
                             }
                         }
                     }

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -850,24 +850,24 @@ namespace MySystem
                 }
                 if(pos.CardType < 100)
                 {
-                    // AlipayPayBack2Service.Instance.ActReserveBack(pos.OpId, pos.OpReserve1, pos.OpReserve2, pos.OpReserve3);
+                    AlipayPayBack2Service.Instance.ActReserveBack(pos.OpId, pos.OpReserve1, pos.OpReserve2, pos.OpReserve3);
                     //统计激活数
                     RedisDbconn.Instance.AddList("StatActQueue", "{\"TradeDate\":\"" + now.ToString("yyyyMMdd") + "\",\"UserId\":\"" + pos.BuyUserId + "\",\"BrandId\":\"" + pos.BrandId + "\"}");
                     //运营中心额度变更
-                    OpAmountItem item = new OpAmountItem()
-                    {
-                        UserId = pos.OpId,
-                        OperateType = 1,
-                        ChangeType = 9,
-                        Remark = "机具激活",
-                        UseAmount = pos.OpReserve1 + pos.OpReserve2 + pos.OpReserve3,
-                        UseValidForGetAmount = pos.OpReserve2,
-                        UseTotalAmt = pos.OpReserve1,
-                        UseValidAmount = pos.OpReserve3,
-                        DataType = 2,
-                        DataId = pos.Id,
-                    };
-                    RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
+                    // OpAmountItem item = new OpAmountItem()
+                    // {
+                    //     UserId = pos.OpId,
+                    //     OperateType = 1,
+                    //     ChangeType = 9,
+                    //     Remark = "机具激活",
+                    //     UseAmount = pos.OpReserve1 + pos.OpReserve2 + pos.OpReserve3,
+                    //     UseValidForGetAmount = pos.OpReserve2,
+                    //     UseTotalAmt = pos.OpReserve1,
+                    //     UseValidAmount = pos.OpReserve3,
+                    //     DataType = 2,
+                    //     DataId = pos.Id,
+                    // };
+                    // RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
                 }
                 //清理预扣款
                 RedisDbconn.Instance.AddList("PosWithholdQueue", "{\"UserId\":\"" + pos.BuyUserId + "\",\"SnNo\":\"" + pos.PosSn + "\"}");

AppStart/Helper/TimeOutPosChargeService.cs

@@ -250,29 +250,29 @@ namespace MySystem
                     {
                         if (opUserAccount.ValidForGetAmount >= record.ChargeAmount)
                         {
-                            // var amoutRecord = opdb.AmountRecord.Add(new MySystem.OpModels.AmountRecord
-                            // {
-                            //     CreateDate = DateTime.Now,
-                            //     UserId = items.UserId,
-                            //     SeoDescription = "运营中心预扣款",
-                            //     UseAmount = record.ChargeAmount,
-                            //     OperateType = 2,
-                            //     BeforeAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount,
-                            //     AfterAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount - record.ChargeAmount,
-                            //     Version = 2,
-                            // }).Entity;
+                            var amoutRecord = opdb.AmountRecord.Add(new MySystem.OpModels.AmountRecord
+                            {
+                                CreateDate = DateTime.Now,
+                                UserId = items.UserId,
+                                SeoDescription = "运营中心预扣款",
+                                UseAmount = record.ChargeAmount,
+                                OperateType = 2,
+                                BeforeAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount,
+                                AfterAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount - record.ChargeAmount,
+                                Version = 2,
+                            }).Entity;
 
-                            // OpModels.AmountChangeRecord amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                            // {
-                            //     AmountType = 2,
-                            //     CreateDate = DateTime.Now,
-                            //     Title = "运营中心预扣款",
-                            //     UserId = UserId, //运营中心Id
-                            //     BeforeAmount = opUserAccount.ValidForGetAmount,//使用前剩余额度
-                            //     AfterAmount = opUserAccount.ValidForGetAmount - record.ChargeAmount,//使用后剩余额度
-                            //     ChangeAmount = record.ChargeAmount,//操作金额
-                            //     OperateType = 2,//操作类别
-                            // }).Entity;
+                            OpModels.AmountChangeRecord amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
+                            {
+                                AmountType = 2,
+                                CreateDate = DateTime.Now,
+                                Title = "运营中心预扣款",
+                                UserId = UserId, //运营中心Id
+                                BeforeAmount = opUserAccount.ValidForGetAmount,//使用前剩余额度
+                                AfterAmount = opUserAccount.ValidForGetAmount - record.ChargeAmount,//使用后剩余额度
+                                ChangeAmount = record.ChargeAmount,//操作金额
+                                OperateType = 2,//操作类别
+                            }).Entity;
 
                             function.WriteLog("OperateToChargeAmount:" + userAccount.OperateToChargeAmount + ";ChargeAmount:" + record.ChargeAmount + ";", "扣款监听日志");
                             if (userAccount.OperateToChargeAmount >= record.ChargeAmount)
@@ -280,23 +280,23 @@ namespace MySystem
                                 function.WriteLog("ok", "扣款监听日志");
                                 userAccount.OperateToChargeAmount -= record.ChargeAmount;//扣减运营中心预扣款
                             }
-                            // opUserAccount.ValidForGetAmount -= record.ChargeAmount;//扣减运营中心可提现余额
-                            // amoutRecord.AfterValidForGetAmount = opUserAccount.ValidForGetAmount;
-                            // amoutRecord.AfterTotalAmt = opUserAccount.TotalAmt;
-                            // amoutRecord.AfterValidAmount = opUserAccount.ValidAmount;
+                            opUserAccount.ValidForGetAmount -= record.ChargeAmount;//扣减运营中心可提现余额
+                            amoutRecord.AfterValidForGetAmount = opUserAccount.ValidForGetAmount;
+                            amoutRecord.AfterTotalAmt = opUserAccount.TotalAmt;
+                            amoutRecord.AfterValidAmount = opUserAccount.ValidAmount;
 
-                            OpAmountItem item = new OpAmountItem()
-                            {
-                                UserId = items.UserId,
-                                OperateType = 2,
-                                ChangeType = 17,
-                                Remark = "运营中心预扣款",
-                                UseAmount = record.ChargeAmount,
-                                UseValidForGetAmount = record.ChargeAmount,
-                                DataType = 5,
-                                DataId = record.Id,
-                            };
-                            RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
+                            // OpAmountItem item = new OpAmountItem()
+                            // {
+                            //     UserId = items.UserId,
+                            //     OperateType = 2,
+                            //     ChangeType = 17,
+                            //     Remark = "运营中心预扣款",
+                            //     UseAmount = record.ChargeAmount,
+                            //     UseValidForGetAmount = record.ChargeAmount,
+                            //     DataType = 5,
+                            //     DataId = record.Id,
+                            // };
+                            // RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", item);
 
                             check = true;
                         }