合并

AppStart/ExcelHelper.cs

@@ -1088,8 +1088,30 @@ namespace MySystem
                                                             BeforeBalanceAmount = account.HelpProfitBalanceAmount + TradeAmount, //变更前余额
                                                             AfterBalanceAmount = account.HelpProfitBalanceAmount, //变更后余额
                                                         });
+                                                        db.HelpProfitAccountRecord.Add(new HelpProfitAccountRecord()
+                                                        {
+                                                            CreateDate = DateTime.Now,
+                                                            UpdateDate = DateTime.Now,
+                                                            UserId = edit.UserId, //创客
+                                                            ChangeType = 4, //变动类型
+                                                            ProductType = 99, //产品类型
+                                                            ChangeAmount = edit.TradeFee, //变更金额
+                                                            BeforeBalanceAmount = account.HelpProfitBalanceAmount + TradeAmount, //变更前余额
+                                                            AfterBalanceAmount = account.HelpProfitBalanceAmount, //变更后余额
+                                                        });
+                                                        db.HelpProfitAccountRecord.Add(new HelpProfitAccountRecord()
+                                                        {
+                                                            CreateDate = DateTime.Now,
+                                                            UpdateDate = DateTime.Now,
+                                                            UserId = edit.UserId, //创客
+                                                            ChangeType = 5, //变动类型
+                                                            ProductType = 99, //产品类型
+                                                            ChangeAmount = edit.ManageFee, //变更金额
+                                                            BeforeBalanceAmount = account.HelpProfitBalanceAmount + TradeAmount, //变更前余额
+                                                            AfterBalanceAmount = account.HelpProfitBalanceAmount, //变更后余额
+                                                        });
                                                         db.SaveChanges();
-                                                        RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                                                        RedisDbconn.Instance.Set("HelpProfitAccount:" + edit.UserId, account);
                                                     }
                                                 }
                                                 else if (Status == 2)
@@ -1098,16 +1120,28 @@ namespace MySystem
                                                     if (account != null)
                                                     {
                                                         decimal TradeAmount = edit.TradeAmount;
-                                                        account.HelpProfitBalanceAmount += TradeAmount;
-                                                        db.HelpProfitAccountRecord.Add(new HelpProfitAccountRecord()
+                                                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                                                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                                                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                                                        account.BalanceAmount += TradeAmount;
+                                                        account.FreezeAmount -= TradeAmount;
+                                                        decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                                                        decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                                                        decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                                                        db.UserAccountRecord.Add(new UserAccountRecord()
                                                         {
                                                             CreateDate = DateTime.Now,
+                                                            UpdateDate = DateTime.Now,
                                                             UserId = edit.UserId, //创客
                                                             ChangeType = 6, //变动类型
                                                             ProductType = 99, //产品类型
                                                             ChangeAmount = TradeAmount, //变更金额
-                                                            BeforeBalanceAmount = account.HelpProfitBalanceAmount - TradeAmount, //变更前余额
-                                                            AfterBalanceAmount = account.HelpProfitBalanceAmount, //变更后余额
+                                                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
                                                         });
                                                         db.SaveChanges();
                                                         RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);