暂存

AppStart/Tables/OpAmountItem.cs

@@ -45,5 +45,8 @@ namespace MySystem
 
         //来源Id，表的主键Id
         public int DataId { get; set; }
+
+        //是否入账(0 是 1 否)
+        public int NoAccount { get; set; }
     }
 }

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -568,10 +568,8 @@ namespace MySystem.Areas.Admin.Controllers
                         if (UseAmount > 0)
                         {
                             var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
-
-                            var ValidAmount = amount.ValidAmount - sto.Deposit + data.Deposit;
-
-                            // PublicFunction.AddAmountRecordNew(3, "分仓押金变更", 31, amount.ValidAmount, amount.TotalAmount, amount.ValidForGetAmount, OperateType, amount.ValidAmount + amount.TotalAmt + amount.ValidForGetAmount - sto.Deposit + data.Deposit, amount.ValidAmount + amount.TotalAmt + amount.ValidForGetAmount, UseAmount, 0, sto.OpId, ValidAmount, 0, 0, sto.Id, 2);
+                            var bValidAmount = amount.ValidAmount;
+                            var aValidAmount = amount.ValidAmount - sto.Deposit + data.Deposit;
 
                             OpAmountItem opAmountItem = new OpAmountItem
                             {
@@ -582,41 +580,14 @@ namespace MySystem.Areas.Admin.Controllers
                                 UseAmount = UseAmount,//变更总额度
                                 UseValidForGetAmount = 0,//变更可提现额度
                                 UseTotalAmt = 0,//变更未使用额度
-                                UseValidAmount = ValidAmount,//变更关联分仓额度
+                                UseValidAmount = Math.Max(0, bValidAmount - aValidAmount),//变更关联分仓额度
                                 DataType = 7,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                                DataId = sto.Id//来源Id，表的主键Id
+                                DataId = sto.Id,//来源Id，表的主键Id
+                                NoAccount = 1//是否入账(0 是 1 否)
                             };
 
                             RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
 
-                            // var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord()
-                            // {
-                            //     Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                            //     CreateDate = DateTime.Now,
-                            //     UserId = sto.OpId,
-                            //     SeoDescription = "分仓押金变更",
-                            //     OperateType = OperateType,
-                            //     UseAmount = UseAmount,
-                            //     BeforeAmount = amount.ValidAmount,
-                            //     AfterAmount = amount.ValidAmount + UseAmount,
-                            //     AfterTotalAmt = amount.TotalAmt,
-                            //     AfterValidForGetAmount = amount.ValidForGetAmount,
-                            //     AfterValidAmount = amount.ValidAmount + UseAmount,
-                            // }).Entity;
-
-                            // var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                            // {
-                            //     AmountType = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                            //     CreateDate = DateTime.Now,
-                            //     Title = "分仓押金变更",
-                            //     UserId = sto.OpId, //运营中心Id
-                            //     Operater = SysUserName + "-" + SysRealName,
-                            //     BeforeAmount = amount.ValidAmount,//使用前剩余额度
-                            //     AfterAmount = amount.ValidAmount + UseAmount,//使用后剩余额度
-                            //     ChangeAmount = UseAmount,//操作金额
-                            //     OperateType = OperateType,//操作类别
-                            // }).Entity;
-
                             amount.ValidAmount -= sto.Deposit;
                             amount.ValidAmount += data.Deposit;
                         }
@@ -674,9 +645,8 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
 
-                        var ValidAmount = amount.ValidAmount - sto.Deposit + data.Deposit;
-
-                        // PublicFunction.AddAmountRecordNew(3, "分仓押金变更", 31, amount.ValidAmount, amount.TotalAmount, amount.ValidForGetAmount, OperateType, amount.ValidAmount + amount.TotalAmt + amount.ValidForGetAmount - sto.Deposit + data.Deposit, amount.ValidAmount + amount.TotalAmt + amount.ValidForGetAmount, UseAmount, 0, sto.OpId, ValidAmount, 0, 0, sto.Id, 2);
+                        var bValidAmount = amount.ValidAmount;
+                        var aValidAmount = amount.ValidAmount - sto.Deposit + data.Deposit;
 
                         OpAmountItem opAmountItem = new OpAmountItem
                         {
@@ -687,41 +657,14 @@ namespace MySystem.Areas.Admin.Controllers
                             UseAmount = UseAmount,//变更总额度
                             UseValidForGetAmount = 0,//变更可提现额度
                             UseTotalAmt = 0,//变更未使用额度
-                            UseValidAmount = ValidAmount,//变更关联分仓额度
+                            UseValidAmount = Math.Max(0, bValidAmount - aValidAmount),//变更关联分仓额度
                             DataType = 7,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                            DataId = sto.Id//来源Id，表的主键Id
+                            DataId = sto.Id,//来源Id，表的主键Id
+                            NoAccount = 1//是否入账(0 是 1 否)
                         };
 
                         RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
 
-                        // var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord()
-                        // {
-                        //     Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                        //     CreateDate = DateTime.Now,
-                        //     UserId = sto.OpId,
-                        //     SeoDescription = "分仓押金变更",
-                        //     OperateType = OperateType,
-                        //     UseAmount = UseAmount,
-                        //     BeforeAmount = amount.ValidAmount,
-                        //     AfterAmount = amount.ValidAmount + UseAmount,
-                        //     AfterTotalAmt = amount.TotalAmt,
-                        //     AfterValidForGetAmount = amount.ValidForGetAmount,
-                        //     AfterValidAmount = amount.ValidAmount + UseAmount,
-                        // }).Entity;
-
-                        // var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                        // {
-                        //     AmountType = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                        //     CreateDate = DateTime.Now,
-                        //     Title = "分仓押金变更",
-                        //     UserId = sto.OpId, //运营中心Id
-                        //     Operater = SysUserName + "-" + SysRealName,
-                        //     BeforeAmount = amount.ValidAmount,//使用前剩余额度
-                        //     AfterAmount = amount.ValidAmount + UseAmount,//使用后剩余额度
-                        //     ChangeAmount = UseAmount,//操作金额
-                        //     OperateType = OperateType,//操作类别
-                        // }).Entity;
-
                         amount.ValidAmount -= sto.Deposit;
                         amount.ValidAmount += data.Deposit;
                     }
@@ -2193,7 +2136,8 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         if (IsOk == "1")
                         {
-                            // PublicFunction.AddAmountRecordNew(2, "关联分仓", 31, userAmount.ValidAmount, userAmount.TotalAmount, userAmount.ValidForGetAmount, 0, TotalAmount + deposit - tamount, TotalAmount, deposit + tamount, 0, sysAdmin.UserId, ValidAmount, TotalAmt, ValidForGetAmount, 0, 0);
+
+                            var aTotalAmount = TotalAmount + deposit - tamount;
 
                             OpAmountItem opAmountItem = new OpAmountItem
                             {
@@ -2201,84 +2145,16 @@ namespace MySystem.Areas.Admin.Controllers
                                 OperateType = 0,//操作类型(0 总和 1 增加 2 减少)
                                 ChangeType = 2,//类别
                                 Remark = "关联分仓",//备注
-                                UseAmount = TotalAmount + deposit - tamount,//变更总额度
+                                UseAmount = Math.Max(0, TotalAmount - aTotalAmount),//变更总额度
                                 UseValidForGetAmount = ValidForGetAmount,//变更可提现额度
                                 UseTotalAmt = TotalAmt,//变更未使用额度
                                 UseValidAmount = ValidAmount,//变更关联分仓额度
                                 DataType = 0,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                                DataId = 0//来源Id，表的主键Id
+                                DataId = 0,//来源Id，表的主键Id
+                                NoAccount = 1//是否入账(0 是 1 否)
                             };
 
                             RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
-
-                            // var OperateType = 0;
-                            // var Amount = 0.00M;
-                            // if (deposit >= tamount)
-                            // {
-                            //     OperateType = 1;
-                            //     Amount = deposit - tamount;
-                            // }
-                            // if (deposit < tamount)
-                            // {
-                            //     OperateType = 2;
-                            //     Amount = tamount - deposit;
-                            // }
-                            // if (Amount > 0)
-                            // {
-                            //     var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                            //     {
-                            //         CreateDate = DateTime.Now,
-                            //         UserId = sysAdmin.UserId,
-                            //         SeoDescription = "关联分仓",
-                            //         OperateType = OperateType,
-                            //         UseAmount = Amount,
-                            //         BeforeAmount = TotalAmount,
-                            //         AfterAmount = TotalAmount + deposit - tamount,
-                            //         AfterTotalAmt = userAmount.TotalAmt,
-                            //         AfterValidForGetAmount = userAmount.ValidForGetAmount,
-                            //         AfterValidAmount = userAmount.ValidAmount,
-                            //     }).Entity;
-                            // }
-
-                            // for (int i = 1; i <= 3; i++)
-                            // {
-                            //     var UseAmount = 0.00M;
-                            //     var BeforeAmount = 0.00M;
-                            //     var AfterAmount = 0.00M;
-                            //     if (i == 1)
-                            //     {
-                            //         UseAmount = TotalAmt;
-                            //         BeforeAmount = userAmount.TotalAmt + UseAmount;
-                            //         AfterAmount = userAmount.TotalAmt;
-                            //     }
-                            //     if (i == 2)
-                            //     {
-                            //         UseAmount = ValidForGetAmount;
-                            //         BeforeAmount = userAmount.ValidForGetAmount + UseAmount;
-                            //         AfterAmount = userAmount.ValidForGetAmount;
-                            //     }
-                            //     if (i == 3)
-                            //     {
-                            //         UseAmount = ValidAmount;
-                            //         BeforeAmount = userAmount.ValidAmount + UseAmount;
-                            //         AfterAmount = userAmount.ValidAmount;
-                            //     }
-                            //     if (i > 0 && UseAmount > 0)
-                            //     {
-                            //         var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                            //         {
-                            //             AmountType = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                            //             CreateDate = DateTime.Now,
-                            //             Title = "关联分仓",
-                            //             UserId = sysAdmin.UserId, //运营中心Id
-                            //             Operater = SysUserName + "-" + SysRealName,
-                            //             BeforeAmount = BeforeAmount,//使用前剩余额度
-                            //             AfterAmount = AfterAmount,//使用后剩余额度
-                            //             ChangeAmount = UseAmount,//操作金额
-                            //             OperateType = OperateType,//操作类别
-                            //         }).Entity;
-                            //     }
-                            // }
                             opdb.SaveChanges();
                         }
                         sysAdmin.StoreCount += idlist.Count();//添加关联分仓数
@@ -2466,6 +2342,9 @@ namespace MySystem.Areas.Admin.Controllers
                                 opdb.SaveChanges();
                             }
                         }
+                        var bValidAmount = userAmount.ValidAmount;
+                        var aValidAmount = userAmount.ValidAmount - deposit + ValidAmount;
+
                         userAmount.ValidAmount -= deposit;//扣减关联分仓押金
                         userAmount.ValidAmount += ValidAmount;
                         userAmount.TotalAmt += TotalAmt;
@@ -2474,92 +2353,22 @@ namespace MySystem.Areas.Admin.Controllers
                         sysAdmin.StoreCount -= idlist.Count();//减少关联分仓数
                         sysAdmin.TotalMachineCount -= pCount;//减少关联分仓机具数
 
-                        // PublicFunction.AddAmountRecordNew(2, "取消关联分仓", 31, userAmount.ValidAmount, userAmount.TotalAmount, userAmount.ValidForGetAmount, 0, TotalAmount + deposit - tamount, TotalAmount, deposit + tamount, 0, sysAdmin.UserId, Math.Max(0, deposit - ValidAmount), TotalAmt, ValidForGetAmount, 0, 0);
-
                         OpAmountItem opAmountItem = new OpAmountItem
                         {
                             UserId = sysAdmin.UserId,//创客Id
                             OperateType = 0,//操作类型(0 总和 1 增加 2 减少)
                             ChangeType = 22,//类别
                             Remark = "取消关联分仓",//备注
-                            UseAmount = Math.Max(0, deposit - tamount),//变更总额度
+                            UseAmount = Math.Max(0, bValidAmount - aValidAmount),//变更总额度
                             UseValidForGetAmount = ValidForGetAmount,//变更可提现额度
                             UseTotalAmt = TotalAmt,//变更未使用额度
-                            UseValidAmount = Math.Max(0, deposit - ValidAmount),//变更关联分仓额度
+                            UseValidAmount = Math.Max(0, bValidAmount - aValidAmount),//变更关联分仓额度
                             DataType = 0,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                            DataId = 0//来源Id，表的主键Id
+                            DataId = 0,//来源Id，表的主键Id
+                            NoAccount = 1//是否入账(0 是 1 否)
                         };
 
                         RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
-
-                        // var OperateType = 0;
-                        // var Amount = 0.00M;
-                        // if (deposit >= tamount)
-                        // {
-                        //     OperateType = 1;
-                        //     Amount = deposit - tamount;
-                        // }
-                        // if (deposit < tamount)
-                        // {
-                        //     OperateType = 2;
-                        //     Amount = tamount - deposit;
-                        // }
-                        // if (Amount > 0)
-                        // {
-                        //     var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                        //     {
-                        //         CreateDate = DateTime.Now,
-                        //         UserId = sysAdmin.UserId,
-                        //         SeoDescription = "取消关联分仓",
-                        //         OperateType = OperateType,
-                        //         UseAmount = Amount,
-                        //         BeforeAmount = TotalAmount,
-                        //         AfterAmount = TotalAmount - deposit + tamount,
-                        //         AfterTotalAmt = userAmount.TotalAmt,
-                        //         AfterValidForGetAmount = userAmount.ValidForGetAmount,
-                        //         AfterValidAmount = userAmount.ValidAmount,
-                        //     }).Entity;
-                        // }
-
-                        // for (int i = 1; i <= 3; i++)
-                        // {
-                        //     var UseAmount = 0.00M;
-                        //     var BeforeAmount = 0.00M;
-                        //     var AfterAmount = 0.00M;
-                        //     if (i == 1)
-                        //     {
-                        //         UseAmount = TotalAmt;
-                        //         BeforeAmount = userAmount.TotalAmt - UseAmount;
-                        //         AfterAmount = userAmount.TotalAmt;
-                        //     }
-                        //     if (i == 2)
-                        //     {
-                        //         UseAmount = ValidForGetAmount;
-                        //         BeforeAmount = userAmount.ValidForGetAmount - UseAmount;
-                        //         AfterAmount = userAmount.ValidForGetAmount;
-                        //     }
-                        //     if (i == 3)
-                        //     {
-                        //         UseAmount = ValidAmount;
-                        //         BeforeAmount = userAmount.ValidAmount - UseAmount;
-                        //         AfterAmount = userAmount.ValidAmount;
-                        //     }
-                        //     if (i > 0 && UseAmount > 0)
-                        //     {
-                        //         var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                        //         {
-                        //             AmountType = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                        //             CreateDate = DateTime.Now,
-                        //             Title = "取消关联分仓",
-                        //             UserId = sysAdmin.UserId, //运营中心Id
-                        //             Operater = SysUserName + "-" + SysRealName,
-                        //             BeforeAmount = BeforeAmount,//使用前剩余额度
-                        //             AfterAmount = AfterAmount,//使用后剩余额度
-                        //             ChangeAmount = UseAmount,//操作金额
-                        //             OperateType = OperateType,//操作类别
-                        //         }).Entity;
-                        //     }
-                        // }
                         opdb.SaveChanges();
                     }
                     else

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1663,13 +1663,11 @@ namespace MySystem.Areas.Admin.Controllers
                     if (oldpos.ActivationState == 0)
                     {
                         var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
-                        decimal TotalAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount;//旧的总金额
+
                         opUserAccount.ValidAmount += oldpos.OpReserve3;
                         opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
                         opUserAccount.TotalAmt += oldpos.OpReserve1;
 
-                        // PublicFunction.AddAmountRecordNew(8, "机具换绑", 31, opUserAccount.ValidAmount, opUserAccount.TotalAmount, opUserAccount.ValidForGetAmount, 2, TotalAmount, TotalAmount + oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1, oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1, 0, oldpos.OpId, oldpos.OpReserve3, oldpos.OpReserve2, oldpos.OpReserve1, newpos.Id, 1);
-
                         OpAmountItem opAmountItem = new OpAmountItem
                         {
                             UserId = oldpos.OpId,//创客Id
@@ -1681,68 +1679,12 @@ namespace MySystem.Areas.Admin.Controllers
                             UseTotalAmt = oldpos.OpReserve1,//变更未使用额度
                             UseValidAmount = oldpos.OpReserve3,//变更关联分仓额度
                             DataType = 2,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                            DataId = newpos.Id//来源Id，表的主键Id
+                            DataId = newpos.Id,//来源Id，表的主键Id
+                            NoAccount = 1//是否入账(0 是 1 否)
                         };
 
                         RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
 
-                        // if (oldpos.OpReserve1 > 0 || oldpos.OpReserve2 > 0 || oldpos.OpReserve3 > 0)
-                        // {
-                        //     var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                        //     {
-                        //         CreateDate = DateTime.Now,
-                        //         UserId = oldpos.OpId,
-                        //         SeoDescription = "机具换绑",
-                        //         OperateType = 1,
-                        //         UseAmount = oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
-                        //         BeforeAmount = TotalAmount,
-                        //         AfterAmount = TotalAmount + oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
-                        //         AfterTotalAmt = opUserAccount.TotalAmt,
-                        //         AfterValidForGetAmount = opUserAccount.ValidForGetAmount,
-                        //         AfterValidAmount = opUserAccount.ValidAmount,
-                        //     }).Entity;
-                        // }
-
-                        // for (int a = 1; a <= 3; a++)
-                        // {
-                        //     var UseAmount = 0.00M;
-                        //     var BeforeAmount = 0.00M;
-                        //     var AfterAmount = 0.00M;
-                        //     if (a == 1)
-                        //     {
-                        //         UseAmount = oldpos.OpReserve1;
-                        //         BeforeAmount = opUserAccount.TotalAmt - UseAmount;
-                        //         AfterAmount = opUserAccount.TotalAmt;
-                        //     }
-                        //     if (a == 2)
-                        //     {
-                        //         UseAmount = oldpos.OpReserve2;
-                        //         BeforeAmount = opUserAccount.ValidForGetAmount - UseAmount;
-                        //         AfterAmount = opUserAccount.ValidForGetAmount;
-                        //     }
-                        //     if (a == 3)
-                        //     {
-                        //         UseAmount = oldpos.OpReserve3;
-                        //         BeforeAmount = opUserAccount.ValidAmount - UseAmount;
-                        //         AfterAmount = opUserAccount.ValidAmount;
-                        //     }
-                        //     if (a > 0 && UseAmount > 0)
-                        //     {
-                        //         var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                        //         {
-                        //             AmountType = a,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                        //             CreateDate = DateTime.Now,
-                        //             Title = "机具换绑",
-                        //             UserId = oldpos.OpId, //运营中心Id
-                        //             Operater = SysUserName + "-" + SysRealName,
-                        //             BeforeAmount = BeforeAmount,//使用前剩余额度
-                        //             AfterAmount = AfterAmount,//使用后剩余额度
-                        //             ChangeAmount = UseAmount,//操作金额
-                        //             OperateType = 1,//操作类别
-                        //         }).Entity;
-                        //     }
-                        // }
-
                         oldpos.OpReserve1 = 0;
                         oldpos.OpReserve2 = 0;
                         oldpos.OpReserve3 = 0;
@@ -1752,13 +1694,11 @@ namespace MySystem.Areas.Admin.Controllers
                         if (newpos.OpId > 0)
                         {
                             var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == newpos.OpId && m.UserId == newpos.OpId) ?? new OpModels.UserAccount();
-                            decimal TotalAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount;//旧的总金额
+
                             opUserAccount.ValidAmount += newpos.OpReserve3;
                             opUserAccount.ValidForGetAmount += newpos.OpReserve2;
                             opUserAccount.TotalAmt += newpos.OpReserve1;
 
-                            // PublicFunction.AddAmountRecordNew(8, "机具换绑", 31, opUserAccount.ValidAmount, opUserAccount.TotalAmount, opUserAccount.ValidForGetAmount, 2, TotalAmount + oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1, TotalAmount, oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1, 0, newpos.OpId, oldpos.OpReserve3, oldpos.OpReserve2, oldpos.OpReserve1, newpos.Id, 1);
-
                             OpAmountItem opAmountItem = new OpAmountItem
                             {
                                 UserId = oldpos.OpId,//创客Id
@@ -1770,68 +1710,12 @@ namespace MySystem.Areas.Admin.Controllers
                                 UseTotalAmt = oldpos.OpReserve1,//变更未使用额度
                                 UseValidAmount = oldpos.OpReserve3,//变更关联分仓额度
                                 DataType = 2,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                                DataId = newpos.Id//来源Id，表的主键Id
+                                DataId = newpos.Id,//来源Id，表的主键Id
+                                NoAccount = 1//是否入账(0 是 1 否)
                             };
 
                             RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
 
-                            // if (newpos.OpReserve1 > 0 || newpos.OpReserve2 > 0 || newpos.OpReserve3 > 0)
-                            // {
-                            //     var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                            //     {
-                            //         CreateDate = DateTime.Now,
-                            //         UserId = newpos.OpId,
-                            //         SeoDescription = "机具换绑",
-                            //         OperateType = 1,
-                            //         UseAmount = newpos.OpReserve3 + newpos.OpReserve2 + newpos.OpReserve1,
-                            //         BeforeAmount = TotalAmount,
-                            //         AfterAmount = TotalAmount + newpos.OpReserve3 + newpos.OpReserve2 + newpos.OpReserve1,
-                            //         AfterTotalAmt = opUserAccount.TotalAmt,
-                            //         AfterValidForGetAmount = opUserAccount.ValidForGetAmount,
-                            //         AfterValidAmount = opUserAccount.ValidAmount,
-                            //     }).Entity;
-                            // }
-
-                            // for (int a = 1; a <= 3; a++)
-                            // {
-                            //     var UseAmount = 0.00M;
-                            //     var BeforeAmount = 0.00M;
-                            //     var AfterAmount = 0.00M;
-                            //     if (a == 1)
-                            //     {
-                            //         UseAmount = oldpos.OpReserve1;
-                            //         BeforeAmount = opUserAccount.TotalAmt - UseAmount;
-                            //         AfterAmount = opUserAccount.TotalAmt;
-                            //     }
-                            //     if (a == 2)
-                            //     {
-                            //         UseAmount = oldpos.OpReserve2;
-                            //         BeforeAmount = opUserAccount.ValidForGetAmount - UseAmount;
-                            //         AfterAmount = opUserAccount.ValidForGetAmount;
-                            //     }
-                            //     if (a == 3)
-                            //     {
-                            //         UseAmount = oldpos.OpReserve1;
-                            //         BeforeAmount = opUserAccount.ValidAmount - UseAmount;
-                            //         AfterAmount = opUserAccount.ValidAmount;
-                            //     }
-                            //     if (a > 0 && UseAmount > 0)
-                            //     {
-                            //         var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                            //         {
-                            //             AmountType = a,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                            //             CreateDate = DateTime.Now,
-                            //             Title = "机具换绑",
-                            //             UserId = newpos.OpId, //运营中心Id
-                            //             Operater = SysUserName + "-" + SysRealName,
-                            //             BeforeAmount = BeforeAmount,//使用前剩余额度
-                            //             AfterAmount = AfterAmount,//使用后剩余额度
-                            //             ChangeAmount = UseAmount,//操作金额
-                            //             OperateType = 1,//操作类别
-                            //         }).Entity;
-                            //     }
-                            // }
-
                             newpos.OpReserve1 = 0;
                             newpos.OpReserve2 = 0;
                             newpos.OpReserve3 = 0;
@@ -2066,72 +1950,11 @@ namespace MySystem.Areas.Admin.Controllers
                                 UseTotalAmt = oldpos.OpReserve1,//变更未使用额度
                                 UseValidAmount = oldpos.OpReserve3,//变更关联分仓额度
                                 DataType = 2,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                                DataId = newpos.Id//来源Id，表的主键Id
+                                DataId = newpos.Id,//来源Id，表的主键Id
+                                NoAccount = 1//是否入账(0 是 1 否)
                             };
 
                             RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
-
-                            // for (int a = 1; a <= 3; a++)
-                            // {
-                            //     var UseAmount = 0.00M;
-                            //     var BeforeAmount = 0.00M;
-                            //     var AfterAmount = 0.00M;
-                            //     if (a == 1)
-                            //     {
-                            //         UseAmount = oldpos.OpReserve1;
-                            //         BeforeAmount = opUserAccount.TotalAmt;
-                            //         AfterAmount = opUserAccount.TotalAmt + UseAmount;
-                            //     }
-                            //     if (a == 2)
-                            //     {
-                            //         UseAmount = oldpos.OpReserve2;
-                            //         BeforeAmount = opUserAccount.ValidForGetAmount;
-                            //         AfterAmount = opUserAccount.ValidForGetAmount + UseAmount;
-                            //     }
-                            //     if (a == 3)
-                            //     {
-                            //         UseAmount = oldpos.OpReserve1;
-                            //         BeforeAmount = opUserAccount.ValidAmount;
-                            //         AfterAmount = opUserAccount.ValidAmount + UseAmount;
-                            //     }
-                            //     if (a > 0 && UseAmount > 0)
-                            //     {
-                            //         var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                            //         {
-                            //             AmountType = a,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                            //             CreateDate = DateTime.Now,
-                            //             Title = "机具换绑",
-                            //             UserId = newpos.OpId, //运营中心Id
-                            //             Operater = SysUserName + "-" + SysRealName,
-                            //             BeforeAmount = BeforeAmount,//使用前剩余额度
-                            //             AfterAmount = AfterAmount,//使用后剩余额度
-                            //             ChangeAmount = UseAmount,//操作金额
-                            //             OperateType = 1,//操作类别
-                            //         }).Entity;
-                            //     }
-                            // }
-
-                            // decimal TotalAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount;//旧的总金额
-                            // opUserAccount.ValidAmount += oldpos.OpReserve3;
-                            // opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
-                            // opUserAccount.TotalAmt += oldpos.OpReserve1;
-
-                            // if (oldpos.OpReserve1 > 0 || oldpos.OpReserve2 > 0 || oldpos.OpReserve3 > 0)
-                            // {
-                            //     var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                            //     {
-                            //         CreateDate = DateTime.Now,
-                            //         UserId = oldpos.OpId,
-                            //         SeoDescription = "坏机换新",
-                            //         OperateType = 1,
-                            //         UseAmount = oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
-                            //         BeforeAmount = TotalAmount,
-                            //         AfterAmount = TotalAmount + oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
-                            //         AfterTotalAmt = opUserAccount.TotalAmt,
-                            //         AfterValidForGetAmount = opUserAccount.ValidForGetAmount,
-                            //         AfterValidAmount = opUserAccount.ValidAmount,
-                            //     }).Entity;
-                            // }
                         }
                         if (newpos.OpId == 0)
                         {
@@ -2392,72 +2215,11 @@ namespace MySystem.Areas.Admin.Controllers
                                 UseTotalAmt = oldpos.OpReserve1,//变更未使用额度
                                 UseValidAmount = oldpos.OpReserve3,//变更关联分仓额度
                                 DataType = 2,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                                DataId = newpos.Id//来源Id，表的主键Id
+                                DataId = newpos.Id,//来源Id，表的主键Id
+                                NoAccount = 1//是否入账(0 是 1 否)
                             };
 
                             RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
-
-                            // for (int a = 1; a <= 3; a++)
-                            // {
-                            //     var UseAmount = 0.00M;
-                            //     var BeforeAmount = 0.00M;
-                            //     var AfterAmount = 0.00M;
-                            //     if (a == 1)
-                            //     {
-                            //         UseAmount = oldpos.OpReserve1;
-                            //         BeforeAmount = opUserAccount.TotalAmt;
-                            //         AfterAmount = opUserAccount.TotalAmt + UseAmount;
-                            //     }
-                            //     if (a == 2)
-                            //     {
-                            //         UseAmount = oldpos.OpReserve2;
-                            //         BeforeAmount = opUserAccount.ValidForGetAmount;
-                            //         AfterAmount = opUserAccount.ValidForGetAmount + UseAmount;
-                            //     }
-                            //     if (a == 3)
-                            //     {
-                            //         UseAmount = oldpos.OpReserve1;
-                            //         BeforeAmount = opUserAccount.ValidAmount;
-                            //         AfterAmount = opUserAccount.ValidAmount + UseAmount;
-                            //     }
-                            //     if (a > 0 && UseAmount > 0)
-                            //     {
-                            //         var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                            //         {
-                            //             AmountType = a,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                            //             CreateDate = DateTime.Now,
-                            //             Title = "机具换绑",
-                            //             UserId = newpos.OpId, //运营中心Id
-                            //             Operater = SysUserName + "-" + SysRealName,
-                            //             BeforeAmount = BeforeAmount,//使用前剩余额度
-                            //             AfterAmount = AfterAmount,//使用后剩余额度
-                            //             ChangeAmount = UseAmount,//操作金额
-                            //             OperateType = 1,//操作类别
-                            //         }).Entity;
-                            //     }
-                            // }
-
-                            // decimal TotalAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount;//旧的总金额
-                            // opUserAccount.ValidAmount += oldpos.OpReserve3;
-                            // opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
-                            // opUserAccount.TotalAmt += oldpos.OpReserve1;
-
-                            // if (oldpos.OpReserve1 > 0 || oldpos.OpReserve2 > 0 || oldpos.OpReserve3 > 0)
-                            // {
-                            //     var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                            //     {
-                            //         CreateDate = DateTime.Now,
-                            //         UserId = oldpos.OpId,
-                            //         SeoDescription = "坏机换新",
-                            //         OperateType = 1,
-                            //         UseAmount = oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
-                            //         BeforeAmount = TotalAmount,
-                            //         AfterAmount = TotalAmount + oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
-                            //         AfterTotalAmt = opUserAccount.TotalAmt,
-                            //         AfterValidForGetAmount = opUserAccount.ValidForGetAmount,
-                            //         AfterValidAmount = opUserAccount.ValidAmount,
-                            //     }).Entity;
-                            // }
                         }
                         if (newpos.OpId == 0)
                         {
@@ -2707,72 +2469,11 @@ namespace MySystem.Areas.Admin.Controllers
                             UseTotalAmt = oldpos.OpReserve1,//变更未使用额度
                             UseValidAmount = oldpos.OpReserve3,//变更关联分仓额度
                             DataType = 2,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                            DataId = newpos.Id//来源Id，表的主键Id
+                            DataId = newpos.Id,//来源Id，表的主键Id
+                            NoAccount = 1//是否入账(0 是 1 否)
                         };
 
                         RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
-
-                        // for (int a = 1; a <= 3; a++)
-                        // {
-                        //     var UseAmount = 0.00M;
-                        //     var BeforeAmount = 0.00M;
-                        //     var AfterAmount = 0.00M;
-                        //     if (a == 1)
-                        //     {
-                        //         UseAmount = oldpos.OpReserve1;
-                        //         BeforeAmount = opUserAccount.TotalAmt;
-                        //         AfterAmount = opUserAccount.TotalAmt + UseAmount;
-                        //     }
-                        //     if (a == 2)
-                        //     {
-                        //         UseAmount = oldpos.OpReserve2;
-                        //         BeforeAmount = opUserAccount.ValidForGetAmount;
-                        //         AfterAmount = opUserAccount.ValidForGetAmount + UseAmount;
-                        //     }
-                        //     if (a == 3)
-                        //     {
-                        //         UseAmount = oldpos.OpReserve1;
-                        //         BeforeAmount = opUserAccount.ValidAmount;
-                        //         AfterAmount = opUserAccount.ValidAmount + UseAmount;
-                        //     }
-                        //     if (a > 0 && UseAmount > 0)
-                        //     {
-                        //         var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                        //         {
-                        //             AmountType = a,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                        //             CreateDate = DateTime.Now,
-                        //             Title = "机具换绑",
-                        //             UserId = newpos.OpId, //运营中心Id
-                        //             Operater = SysUserName + "-" + SysRealName,
-                        //             BeforeAmount = BeforeAmount,//使用前剩余额度
-                        //             AfterAmount = AfterAmount,//使用后剩余额度
-                        //             ChangeAmount = UseAmount,//操作金额
-                        //             OperateType = 1,//操作类别
-                        //         }).Entity;
-                        //     }
-                        // }
-
-                        // decimal TotalAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount;//旧的总金额
-                        // opUserAccount.ValidAmount += oldpos.OpReserve3;
-                        // opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
-                        // opUserAccount.TotalAmt += oldpos.OpReserve1;
-
-                        // if (oldpos.OpReserve1 > 0 || oldpos.OpReserve2 > 0 || oldpos.OpReserve3 > 0)
-                        // {
-                        //     var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                        //     {
-                        //         CreateDate = DateTime.Now,
-                        //         UserId = oldpos.OpId,
-                        //         SeoDescription = "创客跨品牌换机",
-                        //         OperateType = 1,
-                        //         UseAmount = oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
-                        //         BeforeAmount = TotalAmount,
-                        //         AfterAmount = TotalAmount + oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
-                        //         AfterTotalAmt = opUserAccount.TotalAmt,
-                        //         AfterValidForGetAmount = opUserAccount.ValidForGetAmount,
-                        //         AfterValidAmount = opUserAccount.ValidAmount,
-                        //     }).Entity;
-                        // }
                     }
                     if (newpos.OpId == 0)
                     {

Areas/Admin/Controllers/OperateServer/StoreMachineApplyOperateController.cs

@@ -406,67 +406,12 @@ namespace MySystem.Areas.Admin.Controllers
                         UseTotalAmt = TotalAmt,//变更未使用额度
                         UseValidAmount = ValidAmount,//变更关联分仓额度
                         DataType = 3,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                        DataId = query.Id//来源Id，表的主键Id
+                        DataId = query.Id,//来源Id，表的主键Id
+                        NoAccount = 1//是否入账(0 是 1 否)
                     };
 
                     RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
 
-                    // var amountRecord = opdb.AmountRecord.Add(new AmountRecord()
-                    // {
-                    //     CreateDate = DateTime.Now,
-                    //     CreateMan = SysUserName + "-" + SysRealName,
-                    //     SeoDescription = "机具申请驳回",
-                    //     OperateType = 1,//增加
-                    //     BeforeAmount = users.ValidAmount + users.TotalAmt + users.ValidForGetAmount,
-                    //     AfterAmount = users.ValidAmount + users.TotalAmt + users.ValidForGetAmount + query.UseAmount,
-                    //     AfterTotalAmt = users.TotalAmt + TotalAmt,
-                    //     AfterValidForGetAmount = users.ValidForGetAmount + ValidForGetAmount,
-                    //     AfterValidAmount = users.ValidAmount + ValidAmount,
-                    //     UseAmount = query.UseAmount,
-                    //     UserId = query.UserId,
-                    //     ApplyId = query.Id,
-                    // }).Entity;
-
-                    // for (int a = 1; a <= 3; a++)
-                    // {
-                    //     var UseAmount = 0.00M;
-                    //     var BeforeAmount = 0.00M;
-                    //     var AfterAmount = 0.00M;
-                    //     if (a == 1)
-                    //     {
-                    //         UseAmount = TotalAmt;
-                    //         BeforeAmount = users.TotalAmt + UseAmount;
-                    //         AfterAmount = users.TotalAmt;
-                    //     }
-                    //     if (a == 2)
-                    //     {
-                    //         UseAmount = ValidForGetAmount;
-                    //         BeforeAmount = users.ValidForGetAmount + UseAmount;
-                    //         AfterAmount = users.ValidForGetAmount;
-                    //     }
-                    //     if (a == 3)
-                    //     {
-                    //         UseAmount = ValidAmount;
-                    //         BeforeAmount = users.ValidAmount + UseAmount;
-                    //         AfterAmount = users.ValidAmount;
-                    //     }
-                    //     if (a > 0 && UseAmount > 0)
-                    //     {
-                    //         var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                    //         {
-                    //             AmountType = a,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                    //             CreateDate = DateTime.Now,
-                    //             Title = "机具申请驳回",
-                    //             UserId = query.UserId, //运营中心Id
-                    //             Operater = SysUserName + "-" + SysRealName,
-                    //             BeforeAmount = BeforeAmount,//使用前剩余额度
-                    //             AfterAmount = AfterAmount,//使用后剩余额度
-                    //             ChangeAmount = UseAmount,//操作金额
-                    //             OperateType = 1,//操作类别
-                    //         }).Entity;
-                    //     }
-                    // }
-
                     users.ValidAmount += ValidAmount;
                     users.TotalAmt += TotalAmt;
                     users.ValidForGetAmount += ValidForGetAmount;

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -603,7 +603,7 @@ namespace MySystem.Areas.Admin.Controllers
                 account.TotalAmt -= decimal.Parse(OperationAmount);
                 OperateType = 2;//系统扣减
                 description = "系统扣减未使用额度";
-                ChangeType = 13; 
+                ChangeType = 13;
             }
 
             //增加
@@ -612,7 +612,7 @@ namespace MySystem.Areas.Admin.Controllers
                 account.TotalAmt += decimal.Parse(OperationAmount);
                 OperateType = 1;//系统增加
                 description = "系统增加未使用额度";
-                ChangeType = 12; 
+                ChangeType = 12;
             }
             decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额
 
@@ -629,42 +629,11 @@ namespace MySystem.Areas.Admin.Controllers
                     UseTotalAmt = decimal.Parse(OperationAmount),//变更未使用额度
                     UseValidAmount = 0,//变更关联分仓额度
                     DataType = 0,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                    DataId = 0//来源Id，表的主键Id
+                    DataId = 0,//来源Id，表的主键Id
+                    NoAccount = 1//是否入账(0 是 1 否)
                 };
 
                 RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
-
-                // AmountRecord amountRecord = opdb.AmountRecord.Add(new AmountRecord()
-                // {
-                //     Version = 1,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                //     CreateDate = DateTime.Now,
-                //     SeoKeyword = Note,
-                //     SeoDescription = description,
-                //     UserId = sysAdmin.UserId, //运营中心Id
-                //     CreateMan = SysUserName + "-" + SysRealName,
-                //     UseAmount = decimal.Parse(OperationAmount),//操作金额
-                //     BeforeAmount = BeforeAmount,//使用前剩余额度
-                //     AfterAmount = AfterAmount,//使用后剩余额度
-                //     AfterTotalAmt = account.TotalAmt,
-                //     AfterValidForGetAmount = account.ValidForGetAmount,
-                //     AfterValidAmount = account.ValidAmount,
-                //     OperateType = OperateType,//操作类别
-                // }).Entity;
-
-                // AmountChangeRecord amountChangeRecord = opdb.AmountChangeRecord.Add(new AmountChangeRecord()
-                // {
-                //     AmountType = 1,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                //     CreateDate = DateTime.Now,
-                //     Title = description,
-                //     Remark = Note,
-                //     UserId = sysAdmin.UserId, //运营中心Id
-                //     Operater = SysUserName + "-" + SysRealName,
-                //     BeforeAmount = bAmount,//使用前剩余额度
-                //     AfterAmount = account.TotalAmt,//使用后剩余额度
-                //     ChangeAmount = decimal.Parse(OperationAmount),//操作金额
-                //     OperateType = OperateType,//操作类别
-                // }).Entity;
-                // opdb.SaveChanges();
                 AddSysLog(data.Id.ToString(), "SysAdmin", "EditAmt");
             }
             return "success";
@@ -707,7 +676,7 @@ namespace MySystem.Areas.Admin.Controllers
                 account.ValidForGetAmount -= decimal.Parse(OperationAmount);
                 OperateType = 2;
                 description = "系统扣减可提现额度";
-                ChangeType = 13; 
+                ChangeType = 13;
             }
             else if (Kind == 1 && decimal.Parse(OperationAmount) > account.ValidForGetAmount)
             {
@@ -718,7 +687,7 @@ namespace MySystem.Areas.Admin.Controllers
                 account.ValidForGetAmount += decimal.Parse(OperationAmount);
                 OperateType = 1;
                 description = "系统增加可提现额度";
-                ChangeType = 12; 
+                ChangeType = 12;
             }
             decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额
             if (OperateType > 0 && decimal.Parse(OperationAmount) > 0)
@@ -735,41 +704,12 @@ namespace MySystem.Areas.Admin.Controllers
                     UseTotalAmt = decimal.Parse(OperationAmount),//变更未使用额度
                     UseValidAmount = 0,//变更关联分仓额度
                     DataType = 0,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                    DataId = 0//来源Id，表的主键Id
+                    DataId = 0,//来源Id，表的主键Id
+                    NoAccount = 1//是否入账(0 是 1 否)
                 };
 
                 RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
 
-                // AmountRecord amountRecord = opdb.AmountRecord.Add(new AmountRecord()
-                // {
-                //     Version = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                //     CreateDate = DateTime.Now,
-                //     SeoKeyword = Note,
-                //     SeoDescription = description,
-                //     UserId = sysAdmin.UserId, //运营中心Id
-                //     CreateMan = SysUserName + "-" + SysRealName,
-                //     UseAmount = decimal.Parse(OperationAmount),//操作金额
-                //     BeforeAmount = BeforeAmount,//使用前剩余额度
-                //     AfterAmount = AfterAmount,//使用后剩余额度
-                //     AfterTotalAmt = account.TotalAmt,
-                //     AfterValidForGetAmount = account.ValidForGetAmount,
-                //     AfterValidAmount = account.ValidAmount,
-                //     OperateType = OperateType,//操作类别
-                // }).Entity;
-
-                // AmountChangeRecord amountChangeRecord = opdb.AmountChangeRecord.Add(new AmountChangeRecord()
-                // {
-                //     AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                //     CreateDate = DateTime.Now,
-                //     Title = description,
-                //     Remark = Note,
-                //     UserId = sysAdmin.UserId, //运营中心Id
-                //     Operater = SysUserName + "-" + SysRealName,
-                //     BeforeAmount = bAmount,//使用前剩余额度
-                //     AfterAmount = account.ValidForGetAmount,//使用后剩余额度
-                //     ChangeAmount = decimal.Parse(OperationAmount),//操作金额
-                //     OperateType = OperateType,//操作类别
-                // }).Entity;
                 AddSysLog(data.Id.ToString(), "SysAdmin", "EditBalance");
                 opdb.SaveChanges();
             }

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -554,34 +554,6 @@ namespace MySystem.Areas.Admin.Controllers
                     };
 
                     RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
-
-                    // opdb.AmountRecord.Add(new AmountRecord()
-                    // {
-                    //     CreateDate = DateTime.Now,
-                    //     UserId = edit.UserId, //创客
-                    //     SeoDescription = "提现驳回",
-                    //     UseAmount = TradeAmount, //变更金额
-                    //     BeforeAmount = BeforeAmount, //变更前总金额
-                    //     AfterAmount = AfterAmount, //变更后总金额
-                    //     AfterTotalAmt = account.TotalAmt,
-                    //     AfterValidForGetAmount = account.ValidForGetAmount,
-                    //     AfterValidAmount = account.ValidAmount,
-                    //     OperateType = 1,
-                    // });
-
-                    // var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                    // {
-                    //     AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                    //     CreateDate = DateTime.Now,
-                    //     Title = "机具申请驳回",
-                    //     UserId = edit.UserId, //运营中心Id
-                    //     Operater = SysUserName + "-" + SysRealName,
-                    //     BeforeAmount = account.ValidForGetAmount - TradeAmount,//使用前剩余额度
-                    //     AfterAmount = account.ValidForGetAmount,//使用后剩余额度
-                    //     ChangeAmount = TradeAmount,//操作金额
-                    //     OperateType = 1,//操作类别
-                    // }).Entity;
-                    // opdb.SaveChanges();
                 }
 
                 opdb.SaveChanges();

Areas/Admin/Controllers/OperateServer/UserCashRecordOperatesController.cs

@@ -596,7 +596,7 @@ namespace MySystem.Areas.Admin.Controllers
                     decimal BeforeTotalAmount = account.ValidForGetAmount; //变更前总金额
                     account.ValidForGetAmount += TradeAmount;//返回可提现余额
                     decimal AfterTotalAmount = account.ValidForGetAmount; //变更后总金额
-                    
+
                     OpAmountItem opAmountItem = new OpAmountItem
                     {
                         UserId = edit.UserId,//创客Id
@@ -608,38 +608,11 @@ namespace MySystem.Areas.Admin.Controllers
                         UseTotalAmt = 0,//变更未使用额度
                         UseValidAmount = 0,//变更关联分仓额度
                         DataType = 0,//来源类型，区分表(1订单，2机具，3申请记录，4购买运营中心，5预扣款 6兑换大盟主 7仓库)
-                        DataId = 0//来源Id，表的主键Id
+                        DataId = 0,//来源Id，表的主键Id
+                        NoAccount = 1//是否入账(0 是 1 否)
                     };
 
                     RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
-
-                    // opdb.AmountRecord.Add(new AmountRecord()
-                    // {
-                    //     CreateDate = DateTime.Now,
-                    //     UserId = edit.UserId, //创客
-                    //     SeoDescription = "提现驳回",
-                    //     UseAmount = TradeAmount, //变更金额
-                    //     BeforeAmount = BeforeAmount, //变更前总金额
-                    //     AfterAmount = AfterAmount, //变更后总金额
-                    //     AfterTotalAmt = account.TotalAmt,
-                    //     AfterValidForGetAmount = account.ValidForGetAmount,
-                    //     AfterValidAmount = account.ValidAmount,
-                    //     OperateType = 1,
-                    // });
-
-                    // var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                    // {
-                    //     AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                    //     CreateDate = DateTime.Now,
-                    //     Title = "机具申请驳回",
-                    //     UserId = edit.UserId, //运营中心Id
-                    //     Operater = SysUserName + "-" + SysRealName,
-                    //     BeforeAmount = account.ValidForGetAmount - TradeAmount,//使用前剩余额度
-                    //     AfterAmount = account.ValidForGetAmount,//使用后剩余额度
-                    //     ChangeAmount = TradeAmount,//操作金额
-                    //     OperateType = 1,//操作类别
-                    // }).Entity;
-                    // opdb.SaveChanges();
                 }
 
                 opdb.SaveChanges();