更改调低额度返回余额逻辑

AppStart/Timer/StoreApplyHelper.cs

@@ -134,45 +134,41 @@ public class StoreApplyHelper
                     }
                     else if(jsonObj["Kind"].ToString() == "3") // 调低额度返回余额
                     {
-                        int ApplyId = int.Parse(jsonObj["Data"]["ApplyId"].ToString());
-                        StoreHouseAmountRecord record = db.StoreHouseAmountRecord.FirstOrDefault(m => m.Id == ApplyId);
-                        if(record != null)
+                        int UserId = int.Parse(jsonObj["Data"]["UserId"].ToString());
+                        decimal Amount = decimal.Parse(jsonObj["Data"]["Amount"].ToString());
+                        AddAmount2(db, UserId, Amount, 0);
+                        decimal BalanceAmount = Amount / 2;
+                        UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == UserId);
+                        if (account == null)
                         {
-                            int GetUserId = record.UserId;
-                            decimal Amount = record.UseAmount / 2;
-                            UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == GetUserId);
-                            if (account == null)
-                            {
-                                account = db.UserAccount.Add(new UserAccount()
-                                {
-                                    Id = GetUserId,
-                                    UserId = GetUserId,
-                                }).Entity;
-                                db.SaveChanges();
-                            }
-                            decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                            decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                            decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                            account.BalanceAmount += Amount;
-                            account.TotalAmount += Amount;
-                            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                            UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
+                            account = db.UserAccount.Add(new UserAccount()
                             {
-                                CreateDate = DateTime.Now,
-                                UpdateDate = DateTime.Now,
-                                UserId = GetUserId, //创客
-                                ChangeType = 119, //变动类型
-                                ChangeAmount = Amount, //变更金额
-                                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                Id = UserId,
+                                UserId = UserId,
                             }).Entity;
+                            db.SaveChanges();
                         }
+                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                        account.BalanceAmount += BalanceAmount;
+                        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 = UserId, //创客
+                            ChangeType = 119, //变动类型
+                            ChangeAmount = BalanceAmount, //变更金额
+                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                        }).Entity;
                     }
                     else if(jsonObj["Kind"].ToString() == "4") // 仓库发货，预发机申请
                     {