完成，待测试

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -553,52 +553,34 @@ namespace MySystem.Areas.Admin.Controllers
                     userAccountOld.TempAmountForBalance = 0;
                     if (sto.OpId > 0)
                     {
-                        var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
-                        if (newdeposit > olddeposit)
+                        var UseAmount = 0.00M;
+                        var OperateType = 0;
+                        if (newdeposit >= olddeposit)
                         {
-                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord()
-                            {
-                                Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                                CreateDate = DateTime.Now,
-                                UserId = sto.OpId,
-                                SeoDescription = "分仓押金变更",
-                                OperateType = 1,
-                                UseAmount = newdeposit - olddeposit,
-                                BeforeAmount = amount.ValidAmount,
-                                AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
-                                AfterTotalAmt = amount.TotalAmt,
-                                AfterValidForGetAmount = amount.ValidForGetAmount,
-                                AfterValidAmount = amount.ValidAmount + newdeposit - olddeposit,
-                            }).Entity;
-
-                            var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                            {
-                                AmountType = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                                CreateDate = DateTime.Now,
-                                Title = "分仓押金变更",
-                                UserId = sto.OpId, //运营中心Id
-                                // CreateMan = SysUserName + "-" + SysRealName,
-                                BeforeAmount = amount.ValidAmount,//使用前剩余额度
-                                AfterAmount = amount.ValidAmount + newdeposit - olddeposit,//使用后剩余额度
-                                ChangeAmount = newdeposit - olddeposit,//操作金额
-                                OperateType = 1,//操作类别
-                            }).Entity;
+                            UseAmount = newdeposit - olddeposit;
+                            OperateType = 1;
                         }
                         if (newdeposit < olddeposit)
                         {
-                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            UseAmount = olddeposit - newdeposit;
+                            OperateType = 2;
+                        }
+                        if (UseAmount > 0)
+                        {
+                            var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
+                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord()
                             {
                                 Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
                                 CreateDate = DateTime.Now,
                                 UserId = sto.OpId,
                                 SeoDescription = "分仓押金变更",
-                                OperateType = 2,
-                                UseAmount = olddeposit - newdeposit,
+                                OperateType = OperateType,
+                                UseAmount = UseAmount,
                                 BeforeAmount = amount.ValidAmount,
-                                AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
+                                AfterAmount = amount.ValidAmount + UseAmount,
                                 AfterTotalAmt = amount.TotalAmt,
                                 AfterValidForGetAmount = amount.ValidForGetAmount,
-                                AfterValidAmount = amount.ValidAmount + newdeposit - olddeposit
+                                AfterValidAmount = amount.ValidAmount + UseAmount,
                             }).Entity;
 
                             var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
@@ -607,15 +589,16 @@ namespace MySystem.Areas.Admin.Controllers
                                 CreateDate = DateTime.Now,
                                 Title = "分仓押金变更",
                                 UserId = sto.OpId, //运营中心Id
-                                // CreateMan = SysUserName + "-" + SysRealName,
+                                                   // Operater = SysUserName + "-" + SysRealName,
                                 BeforeAmount = amount.ValidAmount,//使用前剩余额度
-                                AfterAmount = amount.ValidAmount + newdeposit - olddeposit,//使用后剩余额度
-                                ChangeAmount = olddeposit - newdeposit,//操作金额
-                                OperateType = 2,//操作类别
+                                AfterAmount = amount.ValidAmount + UseAmount,//使用后剩余额度
+                                ChangeAmount = UseAmount,//操作金额
+                                OperateType = OperateType,//操作类别
                             }).Entity;
+
+                            amount.ValidAmount -= sto.Deposit;
+                            amount.ValidAmount += data.Deposit;
                         }
-                        amount.ValidAmount -= sto.Deposit;
-                        amount.ValidAmount += data.Deposit;
                     }
                     var oldUserInfo = db.Users.FirstOrDefault(m => m.Id == sto.UserId) ?? new Users();
                     var newUserInfo = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
@@ -654,52 +637,34 @@ namespace MySystem.Areas.Admin.Controllers
                 userAccount.StoreDeposit = data.Deposit;
                 if (sto.OpId > 0)
                 {
-                    var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
-                    if (newdeposit > olddeposit)
+                    var UseAmount = 0.00M;
+                    var OperateType = 0;
+                    if (newdeposit >= olddeposit)
                     {
-                        var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                        {
-                            Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                            CreateDate = DateTime.Now,
-                            UserId = sto.OpId,
-                            SeoDescription = "分仓押金变更",
-                            OperateType = 1,
-                            UseAmount = newdeposit - olddeposit,
-                            BeforeAmount = amount.ValidAmount,
-                            AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
-                            AfterTotalAmt = amount.TotalAmt,
-                            AfterValidForGetAmount = amount.ValidForGetAmount,
-                            AfterValidAmount = amount.ValidAmount + newdeposit - olddeposit
-                        }).Entity;
-
-                        var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                        {
-                            AmountType = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                            CreateDate = DateTime.Now,
-                            Title = "分仓押金变更",
-                            UserId = sto.OpId, //运营中心Id
-                            // CreateMan = SysUserName + "-" + SysRealName,
-                            BeforeAmount = amount.ValidAmount,//使用前剩余额度
-                            AfterAmount = amount.ValidAmount + newdeposit - olddeposit,//使用后剩余额度
-                            ChangeAmount = newdeposit - olddeposit,//操作金额
-                            OperateType = 1,//操作类别
-                        }).Entity;
+                        UseAmount = newdeposit - olddeposit;
+                        OperateType = 1;
                     }
                     if (newdeposit < olddeposit)
                     {
-                        var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                        UseAmount = olddeposit - newdeposit;
+                        OperateType = 2;
+                    }
+                    if (UseAmount > 0)
+                    {
+                        var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
+                        var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord()
                         {
                             Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
                             CreateDate = DateTime.Now,
                             UserId = sto.OpId,
                             SeoDescription = "分仓押金变更",
-                            OperateType = 2,
-                            UseAmount = olddeposit - newdeposit,
+                            OperateType = OperateType,
+                            UseAmount = UseAmount,
                             BeforeAmount = amount.ValidAmount,
-                            AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
+                            AfterAmount = amount.ValidAmount + UseAmount,
                             AfterTotalAmt = amount.TotalAmt,
                             AfterValidForGetAmount = amount.ValidForGetAmount,
-                            AfterValidAmount = amount.ValidAmount + newdeposit - olddeposit
+                            AfterValidAmount = amount.ValidAmount + UseAmount,
                         }).Entity;
 
                         var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
@@ -708,15 +673,16 @@ namespace MySystem.Areas.Admin.Controllers
                             CreateDate = DateTime.Now,
                             Title = "分仓押金变更",
                             UserId = sto.OpId, //运营中心Id
-                            // CreateMan = SysUserName + "-" + SysRealName,
+                                               // Operater = SysUserName + "-" + SysRealName,
                             BeforeAmount = amount.ValidAmount,//使用前剩余额度
-                            AfterAmount = amount.ValidAmount + newdeposit - olddeposit,//使用后剩余额度
-                            ChangeAmount = olddeposit - newdeposit,//操作金额
-                            OperateType = 2,//操作类别
+                            AfterAmount = amount.ValidAmount + UseAmount,//使用后剩余额度
+                            ChangeAmount = UseAmount,//操作金额
+                            OperateType = OperateType,//操作类别
                         }).Entity;
+
+                        amount.ValidAmount -= sto.Deposit;
+                        amount.ValidAmount += data.Deposit;
                     }
-                    amount.ValidAmount -= sto.Deposit;
-                    amount.ValidAmount += data.Deposit;
                 }
                 foreach (var item in store)
                 {
@@ -2187,7 +2153,7 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             var OperateType = 0;
                             var Amount = 0.00M;
-                            if (deposit > tamount)
+                            if (deposit >= tamount)
                             {
                                 OperateType = 1;
                                 Amount = deposit - tamount;
@@ -2197,19 +2163,23 @@ namespace MySystem.Areas.Admin.Controllers
                                 OperateType = 2;
                                 Amount = tamount - deposit;
                             }
-                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            if (Amount > 0)
                             {
-                                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;
+                                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;
@@ -2218,19 +2188,19 @@ namespace MySystem.Areas.Admin.Controllers
                                 if (i == 1)
                                 {
                                     UseAmount = TotalAmt;
-                                    BeforeAmount = userAmount.TotalAmt - UseAmount;
+                                    BeforeAmount = userAmount.TotalAmt + UseAmount;
                                     AfterAmount = userAmount.TotalAmt;
                                 }
                                 if (i == 2)
                                 {
                                     UseAmount = ValidForGetAmount;
-                                    BeforeAmount = userAmount.ValidForGetAmount - UseAmount;
+                                    BeforeAmount = userAmount.ValidForGetAmount + UseAmount;
                                     AfterAmount = userAmount.ValidForGetAmount;
                                 }
                                 if (i == 3)
                                 {
                                     UseAmount = ValidAmount;
-                                    BeforeAmount = userAmount.ValidAmount - UseAmount;
+                                    BeforeAmount = userAmount.ValidAmount + UseAmount;
                                     AfterAmount = userAmount.ValidAmount;
                                 }
                                 if (i > 0 && UseAmount > 0)
@@ -2241,7 +2211,7 @@ namespace MySystem.Areas.Admin.Controllers
                                         CreateDate = DateTime.Now,
                                         Title = "关联分仓",
                                         UserId = sysAdmin.UserId, //运营中心Id
-                                                                  // CreateMan = SysUserName + "-" + SysRealName,
+                                        Operater = SysUserName + "-" + SysRealName,
                                         BeforeAmount = BeforeAmount,//使用前剩余额度
                                         AfterAmount = AfterAmount,//使用后剩余额度
                                         ChangeAmount = UseAmount,//操作金额
@@ -2443,38 +2413,35 @@ namespace MySystem.Areas.Admin.Controllers
 
                         sysAdmin.StoreCount -= idlist.Count();//减少关联分仓数
                         sysAdmin.TotalMachineCount -= pCount;//减少关联分仓机具数
-                                                             // if (deposit > tamount)
-                                                             // {
-                                                             //     var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                                                             //     {
-                                                             //         CreateDate = DateTime.Now,
-                                                             //         UserId = sysAdmin.UserId,
-                                                             //         SeoDescription = "取消关联分仓",
-                                                             //         OperateType = 2,
-                                                             //         UseAmount = deposit - tamount,
-                                                             //         BeforeAmount = TotalAmount,
-                                                             //         AfterAmount = TotalAmount - deposit + tamount,
-                                                             //         AfterTotalAmt = userAmount.TotalAmt,
-                                                             //         AfterValidForGetAmount = userAmount.ValidForGetAmount,
-                                                             //         AfterValidAmount = userAmount.ValidAmount,
-                                                             //     }).Entity;
-                                                             // }
-                                                             // if (deposit < tamount)
-                                                             // {
-                                                             //     var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                                                             //     {
-                                                             //         CreateDate = DateTime.Now,
-                                                             //         UserId = sysAdmin.UserId,
-                                                             //         SeoDescription = "取消关联分仓",
-                                                             //         OperateType = 1,
-                                                             //         UseAmount = tamount - deposit,
-                                                             //         BeforeAmount = TotalAmount,
-                                                             //         AfterAmount = TotalAmount - deposit + tamount,
-                                                             //         AfterTotalAmt = userAmount.TotalAmt,
-                                                             //         AfterValidForGetAmount = userAmount.ValidForGetAmount,
-                                                             //         AfterValidAmount = userAmount.ValidAmount,
-                                                             //     }).Entity;
-                                                             // }
+
+                        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++)
                         {
@@ -2499,64 +2466,19 @@ namespace MySystem.Areas.Admin.Controllers
                                 BeforeAmount = userAmount.ValidAmount - UseAmount;
                                 AfterAmount = userAmount.ValidAmount;
                             }
-                            if (deposit > tamount && UseAmount > 0)
+                            if (i > 0 && UseAmount > 0)
                             {
-                                var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                                {
-                                    Version = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                                    CreateDate = DateTime.Now,
-                                    UserId = sysAdmin.UserId,
-                                    SeoDescription = "取消关联分仓",
-                                    OperateType = 2,
-                                    UseAmount = UseAmount,
-                                    BeforeAmount = TotalAmount,
-                                    AfterAmount = TotalAmount - deposit + tamount,
-                                    AfterTotalAmt = userAmount.TotalAmt,
-                                    AfterValidForGetAmount = userAmount.ValidForGetAmount,
-                                    AfterValidAmount = userAmount.ValidAmount,
-                                }).Entity;
-
-                                var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
-                                {
-                                    AmountType = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                                    CreateDate = DateTime.Now,
-                                    Title = "取消关联分仓",
-                                    UserId = sysAdmin.UserId, //运营中心Id
-                                                              // CreateMan = SysUserName + "-" + SysRealName,
-                                    BeforeAmount = BeforeAmount,//使用前剩余额度
-                                    AfterAmount = AfterAmount,//使用后剩余额度
-                                    ChangeAmount = UseAmount,//操作金额
-                                    OperateType = 1,//操作类别
-                                }).Entity;
-                            }
-                            if (deposit < tamount && UseAmount > 0)
-                            {
-                                var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
-                                {
-                                    Version = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                                    CreateDate = DateTime.Now,
-                                    UserId = sysAdmin.UserId,
-                                    SeoDescription = "取消关联分仓",
-                                    OperateType = 1,
-                                    UseAmount = UseAmount,
-                                    BeforeAmount = TotalAmount,
-                                    AfterAmount = TotalAmount - deposit + tamount,
-                                    AfterTotalAmt = userAmount.TotalAmt,
-                                    AfterValidForGetAmount = userAmount.ValidForGetAmount,
-                                    AfterValidAmount = userAmount.ValidAmount,
-                                }).Entity;
-
                                 var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
                                 {
                                     AmountType = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
                                     CreateDate = DateTime.Now,
                                     Title = "取消关联分仓",
                                     UserId = sysAdmin.UserId, //运营中心Id
-                                                              // CreateMan = SysUserName + "-" + SysRealName,
+                                    Operater = SysUserName + "-" + SysRealName,
                                     BeforeAmount = BeforeAmount,//使用前剩余额度
                                     AfterAmount = AfterAmount,//使用后剩余额度
                                     ChangeAmount = UseAmount,//操作金额
-                                    OperateType = 2,//操作类别
+                                    OperateType = OperateType,//操作类别
                                 }).Entity;
                             }
                         }

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1667,20 +1667,22 @@ namespace MySystem.Areas.Admin.Controllers
                         opUserAccount.ValidAmount += oldpos.OpReserve3;
                         opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
                         opUserAccount.TotalAmt += oldpos.OpReserve1;
-
-                        var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                        if (oldpos.OpReserve1 > 0 || oldpos.OpReserve2 > 0 || oldpos.OpReserve3 > 0)
                         {
-                            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;
+                            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++)
                         {
@@ -1701,23 +1703,25 @@ namespace MySystem.Areas.Admin.Controllers
                             }
                             if (a == 3)
                             {
-                                UseAmount = oldpos.OpReserve1;
+                                UseAmount = oldpos.OpReserve3;
                                 BeforeAmount = opUserAccount.ValidAmount - UseAmount;
                                 AfterAmount = opUserAccount.ValidAmount;
                             }
-
-                            var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
+                            if (a > 0 && UseAmount > 0)
                             {
-                                AmountType = a,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                                CreateDate = DateTime.Now,
-                                Title = "机具换绑",
-                                UserId = oldpos.OpId, //运营中心Id
-                                // CreateMan = SysUserName + "-" + SysRealName,
-                                BeforeAmount = BeforeAmount,//使用前剩余额度
-                                AfterAmount = AfterAmount,//使用后剩余额度
-                                ChangeAmount = UseAmount,//操作金额
-                                OperateType = 1,//操作类别
-                            }).Entity;
+                                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;
@@ -1734,19 +1738,22 @@ namespace MySystem.Areas.Admin.Controllers
                             opUserAccount.ValidForGetAmount += newpos.OpReserve2;
                             opUserAccount.TotalAmt += newpos.OpReserve1;
 
-                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            if (newpos.OpReserve1 > 0 || newpos.OpReserve2 > 0 || newpos.OpReserve3 > 0)
                             {
-                                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;
+                                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++)
                             {
@@ -1771,19 +1778,21 @@ namespace MySystem.Areas.Admin.Controllers
                                     BeforeAmount = opUserAccount.ValidAmount - UseAmount;
                                     AfterAmount = opUserAccount.ValidAmount;
                                 }
-
-                                var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
+                                if (a > 0 && UseAmount > 0)
                                 {
-                                    AmountType = a,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                                    CreateDate = DateTime.Now,
-                                    Title = "机具换绑",
-                                    UserId = newpos.OpId, //运营中心Id
-                                    // CreateMan = SysUserName + "-" + SysRealName,
-                                    BeforeAmount = BeforeAmount,//使用前剩余额度
-                                    AfterAmount = AfterAmount,//使用后剩余额度
-                                    ChangeAmount = UseAmount,//操作金额
-                                    OperateType = 1,//操作类别
-                                }).Entity;
+                                    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;
@@ -2004,24 +2013,68 @@ namespace MySystem.Areas.Admin.Controllers
                         if (newpos.OpId > 0)
                         {
                             var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
+
+                            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;
 
-                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            if (oldpos.OpReserve1 > 0 || oldpos.OpReserve2 > 0 || oldpos.OpReserve3 > 0)
                             {
-                                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;
+                                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)
                         {
@@ -2266,24 +2319,68 @@ namespace MySystem.Areas.Admin.Controllers
                         if (newpos.OpId > 0)
                         {
                             var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
+
+                            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;
 
-                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            if (oldpos.OpReserve1 > 0 || oldpos.OpReserve2 > 0 || oldpos.OpReserve3 > 0)
                             {
-                                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;
+                                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)
                         {
@@ -2517,24 +2614,68 @@ namespace MySystem.Areas.Admin.Controllers
                     if (newpos.OpId > 0)
                     {
                         var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
+
+                        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;
 
-                        var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                        if (oldpos.OpReserve1 > 0 || oldpos.OpReserve2 > 0 || oldpos.OpReserve3 > 0)
                         {
-                            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;
+                            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

@@ -442,7 +442,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 CreateDate = DateTime.Now,
                                 Title = "机具申请驳回",
                                 UserId = query.UserId, //运营中心Id
-                                                       // CreateMan = SysUserName + "-" + SysRealName,
+                                Operater = SysUserName + "-" + SysRealName,
                                 BeforeAmount = BeforeAmount,//使用前剩余额度
                                 AfterAmount = AfterAmount,//使用后剩余额度
                                 ChangeAmount = UseAmount,//操作金额

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -595,6 +595,7 @@ namespace MySystem.Areas.Admin.Controllers
             decimal BeforeAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更前总金额
 
             int OperateType = 0;
+            var bAmount = account.ValidForGetAmount;
             var description = "";
             if (Kind == 1)
             {
@@ -612,39 +613,41 @@ namespace MySystem.Areas.Admin.Controllers
             }
             decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额
 
-            AmountRecord amountRecord = opdb.AmountRecord.Add(new AmountRecord()
+            if (OperateType > 0 && decimal.Parse(OperationAmount) > 0)
             {
-                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 = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                CreateDate = DateTime.Now,
-                Title = description,
-                Remark = Note,
-                UserId = sysAdmin.UserId, //运营中心Id
-                // CreateMan = SysUserName + "-" + SysRealName,
-                BeforeAmount = BeforeAmount,//使用前剩余额度
-                AfterAmount = AfterAmount,//使用后剩余额度
-                ChangeAmount = decimal.Parse(OperationAmount),//操作金额
-                OperateType = OperateType,//操作类别
-            }).Entity;
-            opdb.SaveChanges();
-            AddSysLog(data.Id.ToString(), "SysAdmin", "EditAmt");
-            opdb.SaveChanges();
+                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";
         }
 
@@ -677,6 +680,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             decimal BeforeAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更前总金额
             int OperateType = 0;
+            var bAmount = account.ValidForGetAmount;
             var description = "";
             if (Kind == 1 && decimal.Parse(OperationAmount) <= account.ValidForGetAmount)
             {
@@ -695,39 +699,41 @@ namespace MySystem.Areas.Admin.Controllers
                 description = "系统增加";
             }
             decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额
-            AmountRecord amountRecord = opdb.AmountRecord.Add(new AmountRecord()
+            if (OperateType > 0 && decimal.Parse(OperationAmount) > 0)
             {
-                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;
-            opdb.SaveChanges();
-
-            AmountChangeRecord amountChangeRecord = opdb.AmountChangeRecord.Add(new AmountChangeRecord()
-            {
-                AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
-                CreateDate = DateTime.Now,
-                Title = description,
-                Remark = Note,
-                UserId = sysAdmin.UserId, //运营中心Id
-                // CreateMan = SysUserName + "-" + SysRealName,
-                BeforeAmount = BeforeAmount,//使用前剩余额度
-                AfterAmount = AfterAmount,//使用后剩余额度
-                ChangeAmount = decimal.Parse(OperationAmount),//操作金额
-                OperateType = OperateType,//操作类别
-            }).Entity;
-            AddSysLog(data.Id.ToString(), "SysAdmin", "EditBalance");
-            opdb.SaveChanges();
+                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();
+            }
             return "success";
         }
 

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -558,7 +558,7 @@ namespace MySystem.Areas.Admin.Controllers
                         CreateDate = DateTime.Now,
                         Title = "机具申请驳回",
                         UserId = edit.UserId, //运营中心Id
-                        // CreateMan = SysUserName + "-" + SysRealName,
+                        Operater = SysUserName + "-" + SysRealName,
                         BeforeAmount = account.ValidForGetAmount - TradeAmount,//使用前剩余额度
                         AfterAmount = account.ValidForGetAmount,//使用后剩余额度
                         ChangeAmount = TradeAmount,//操作金额

Areas/Admin/Controllers/OperateServer/UserCashRecordOperatesController.cs

@@ -615,7 +615,7 @@ namespace MySystem.Areas.Admin.Controllers
                         CreateDate = DateTime.Now,
                         Title = "机具申请驳回",
                         UserId = edit.UserId, //运营中心Id
-                        // CreateMan = SysUserName + "-" + SysRealName,
+                        Operater = SysUserName + "-" + SysRealName,
                         BeforeAmount = account.ValidForGetAmount - TradeAmount,//使用前剩余额度
                         AfterAmount = account.ValidForGetAmount,//使用后剩余额度
                         ChangeAmount = TradeAmount,//操作金额

OpModels/AmountChangeRecord.cs

@@ -19,5 +19,6 @@ namespace MySystem.OpModels
         public decimal BeforeAmount { get; set; }
         public int AmountType { get; set; }
         public int UserId { get; set; }
+        public string Operater { get; set; }
     }
 }

OpModels/WebCMSEntities.cs

@@ -274,6 +274,12 @@ namespace MySystem.OpModels
                     .HasColumnType("int(11)")
                     .HasComment("变动类型");
 
+                entity.Property(e => e.Operater)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("操作人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Remark)
                     .HasColumnType("varchar(100)")
                     .HasComment("备注")