Browse Source

临时额度调低,支付宝的不返回到余额

lichunlei 2 năm trước cách đây
mục cha
commit
6ff4d7858e
1 tập tin đã thay đổi với 31 bổ sung28 xóa
  1. 31 28
      AppStart/Timer/StoreApplyHelper.cs

+ 31 - 28
AppStart/Timer/StoreApplyHelper.cs

@@ -212,38 +212,41 @@ public class StoreApplyHelper
                         decimal Amount = decimal.Parse(jsonObj["Data"]["Amount"].ToString());
                         int PayMode = int.Parse(jsonObj["Data"]["PayMode"].ToString());
                         AddAmount2(db, 3, UserId, Amount, PayMode, 0);
-                        decimal BalanceAmount = Amount / 2;
-                        UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == UserId);
-                        if (account == null)
+                        if(PayMode != 1)
                         {
-                            account = db.UserAccount.Add(new UserAccount()
+                            decimal BalanceAmount = Amount / 2;
+                            UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == UserId);
+                            if (account == null)
                             {
-                                Id = UserId,
-                                UserId = UserId,
+                                account = db.UserAccount.Add(new UserAccount()
+                                {
+                                    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;
-                            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") // 仓库发货,预发机申请
                     {