合并代码

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -365,18 +365,30 @@ namespace MySystem.Areas.Admin.Controllers
                 account.FreezeAmount += data.CashFreezeAmt;
                 ChangeType = 61;
             }
+            else if (Kind == 1 && data.CashFreezeAmt > account.BalanceAmount)
+            {
+                return "冻结金额大于余额";
+            }
             else if (Kind == 2 && data.CashFreezeAmt <= account.FreezeAmount)
             {
                 account.BalanceAmount += data.CashFreezeAmt;
                 account.FreezeAmount -= data.CashFreezeAmt;
                 ChangeType = 62;
             }
+            else if (Kind == 2 && data.CashFreezeAmt > account.FreezeAmount)
+            {
+                return "解冻金额大于冻结金额";
+            }
             else if (Kind == 3 && data.CashFreezeAmt <= account.BalanceAmount)
             {
                 account.TotalAmount -= data.CashFreezeAmt;
                 account.BalanceAmount -= data.CashFreezeAmt;
                 ChangeType = 63;
             }
+            else if (Kind == 3 && data.CashFreezeAmt > account.BalanceAmount)
+            {
+                return "扣减金额大于余额";
+            }
             else if (Kind == 4)
             {
                 account.TotalAmount += data.CashFreezeAmt;
@@ -739,62 +751,69 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         if (User != null)
                         {
-                            if ((OperationType == "1" || OperationType == "3") && Convert.ToDecimal(OperationAmt) > account.BalanceAmount)
+
+                            decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                            decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                            decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                            int ChangeType = 0;
+                            if (OperationType == "1" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
+                            {
+                                account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                account.FreezeAmount += Convert.ToDecimal(OperationAmt);
+                                ChangeType = 61;
+                            }
+                            else if (OperationType == "1" && Convert.ToDecimal(OperationAmt) > account.BalanceAmount)
+                            {
+                                error += "以下操作失败" + User.MakerCode + ',' + User.RealName + "冻结金额大于余额" + '|' + '\n';
+                            }
+                            else if (OperationType == "2" && Convert.ToDecimal(OperationAmt) <= account.FreezeAmount)
                             {
-                                error += "以下操作失败" + User.MakerCode + ',' + User.RealName + '|' + '\n';
+                                account.BalanceAmount += Convert.ToDecimal(OperationAmt);
+                                account.FreezeAmount -= Convert.ToDecimal(OperationAmt);
+                                ChangeType = 62;
                             }
-                            else
+                            else if (OperationType == "2" && Convert.ToDecimal(OperationAmt) > account.FreezeAmount)
                             {
-                                decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                                decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                                decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                                int ChangeType = 0;
-                                if (OperationType == "1" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
-                                {
-                                    account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
-                                    account.FreezeAmount += Convert.ToDecimal(OperationAmt);
-                                    ChangeType = 61;
-                                }
-                                else if (OperationType == "2" && Convert.ToDecimal(OperationAmt) <= account.FreezeAmount)
-                                {
-                                    account.BalanceAmount += Convert.ToDecimal(OperationAmt);
-                                    account.FreezeAmount -= Convert.ToDecimal(OperationAmt);
-                                    ChangeType = 62;
-                                }
-                                else if (OperationType == "3" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
-                                {
-                                    account.TotalAmount -= Convert.ToDecimal(OperationAmt);
-                                    account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
-                                    ChangeType = 63;
-                                }
-                                else if (OperationType == "4")
-                                {
-                                    account.TotalAmount += Convert.ToDecimal(OperationAmt);
-                                    account.BalanceAmount += Convert.ToDecimal(OperationAmt);
-                                    ChangeType = 64;
-                                }
-                                decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                                decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                                decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                                UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
-                                {
-                                    CreateDate = DateTime.Now,
-                                    UpdateDate = DateTime.Now,
-                                    UserId = User.Id, //创客
-                                    ChangeType = ChangeType, //变动类型
-                                    ChangeAmount = Convert.ToDecimal(OperationAmt), //变更金额
-                                    BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                    AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                    BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                    AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                    BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                    AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                    Remark = dr[4].ToString(),
-                                }).Entity;
-                                db.SaveChanges();
-                                AddSysLog(User.Id.ToString(), "Users", "ChangeCashFreezeAmts");
-                                db.SaveChanges();
+                                error += "以下操作失败" + User.MakerCode + ',' + User.RealName + "解冻金额大于冻结金额" + '|' + '\n';
                             }
+                            else if (OperationType == "3" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
+                            {
+                                account.TotalAmount -= Convert.ToDecimal(OperationAmt);
+                                account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                ChangeType = 63;
+                            }
+                            else if (OperationType == "3" && Convert.ToDecimal(OperationAmt) > account.BalanceAmount)
+                            {
+                                error += "以下操作失败" + User.MakerCode + ',' + User.RealName + "扣减金额大于余额" + '|' + '\n';
+                            }
+                            else if (OperationType == "4")
+                            {
+                                account.TotalAmount += Convert.ToDecimal(OperationAmt);
+                                account.BalanceAmount += Convert.ToDecimal(OperationAmt);
+                                ChangeType = 64;
+                            }
+                            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                            UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
+                            {
+                                CreateDate = DateTime.Now,
+                                UpdateDate = DateTime.Now,
+                                UserId = User.Id, //创客
+                                ChangeType = ChangeType, //变动类型
+                                ChangeAmount = Convert.ToDecimal(OperationAmt), //变更金额
+                                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                Remark = dr[4].ToString(),
+                            }).Entity;
+                            db.SaveChanges();
+                            AddSysLog(User.Id.ToString(), "Users", "ChangeCashFreezeAmts");
+                            db.SaveChanges();
+
                         }
                     }
                 }