Merge branch 'feature-dgy-导入改为队列操作' into feature-dgy-后台测试

AppStart/Helper/ImportHelper/BatchEditUserAmountService.cs

@@ -271,63 +271,66 @@ namespace MySystem
                                                     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)
+                                                    if (OperationType == "1" && Convert.ToDecimal(OperationAmt) > account.BalanceAmount)
                                                     {
                                                         RedisDbconn.Instance.AddList("ErrList" + checkKey, "以下操作失败" + user.MakerCode + ',' + user.RealName + "冻结金额大于余额");
                                                     }
-                                                    else if (OperationType == "2" && Convert.ToDecimal(OperationAmt) <= account.FreezeAmount)
-                                                    {
-                                                        account.BalanceAmount += Convert.ToDecimal(OperationAmt);
-                                                        account.FreezeAmount -= Convert.ToDecimal(OperationAmt);
-                                                        ChangeType = 62;
-                                                    }
-                                                    else if (OperationType == "2" && Convert.ToDecimal(OperationAmt) > account.FreezeAmount)
+                                                    if (OperationType == "2" && Convert.ToDecimal(OperationAmt) > account.FreezeAmount)
                                                     {
                                                         RedisDbconn.Instance.AddList("ErrList" + checkKey, "以下操作失败" + user.MakerCode + ',' + user.RealName + "解冻金额大于冻结金额");
                                                     }
-                                                    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)
+                                                    if (OperationType == "3" && Convert.ToDecimal(OperationAmt) > account.BalanceAmount)
                                                     {
                                                         RedisDbconn.Instance.AddList("ErrList" + checkKey, "以下操作失败" + user.MakerCode + ',' + user.RealName + "扣减金额大于余额");
                                                     }
-                                                    else if (OperationType == "4")
+                                                    if ((OperationType == "1" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount) || (OperationType == "2" && Convert.ToDecimal(OperationAmt) <= account.FreezeAmount) || (OperationType == "3" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount) || (OperationType == "4"))
                                                     {
-                                                        account.TotalAmount += Convert.ToDecimal(OperationAmt);
-                                                        account.BalanceAmount += Convert.ToDecimal(OperationAmt);
-                                                        ChangeType = 64;
+                                                        if (OperationType == "1" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
+                                                        {
+                                                            account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                                            account.FreezeAmount += Convert.ToDecimal(OperationAmt);
+                                                            ChangeType = 61;
+                                                        }
+                                                        if (OperationType == "2" && Convert.ToDecimal(OperationAmt) <= account.FreezeAmount)
+                                                        {
+                                                            account.BalanceAmount += Convert.ToDecimal(OperationAmt);
+                                                            account.FreezeAmount -= Convert.ToDecimal(OperationAmt);
+                                                            ChangeType = 62;
+                                                        }
+                                                        if (OperationType == "3" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
+                                                        {
+                                                            account.TotalAmount -= Convert.ToDecimal(OperationAmt);
+                                                            account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                                            ChangeType = 63;
+                                                        }
+                                                        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();
+                                                        SuccessCount += 1;
+                                                        function.WriteLog(DateTime.Now.ToString() + "\n" + user.Id.ToString(), "批量修改账户金额");
                                                     }
-                                                    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();
-                                                    SuccessCount += 1;
-                                                    function.WriteLog(DateTime.Now.ToString() + "\n" + user.Id.ToString(), "批量修改账户金额");
                                                 }
                                             }
                                             else