调整机具退款功能

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -305,14 +305,19 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 JsonData dr = list[i];
                 string PosSn = dr[0].ToString(); // 机具Sn
-                var toChargeBackRecord = db.ToChargeBackRecord.FirstOrDefault(m => m.Status == 1 && m.Remark == PosSn) ?? new ToChargeBackRecord();
+                var toChargeBackRecord = db.ToChargeBackRecord.FirstOrDefault(m => m.Status < 2 && m.Remark == PosSn) ?? new ToChargeBackRecord();
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toChargeBackRecord.UserId) ?? new UserAccount();
                 if (toChargeBackRecord.Id == 0)
                 {
                     error += "以下操作失败" + PosSn + ',' + "不符合退还条件" + '\n';
                 }
-                else
+                if (toChargeBackRecord.Id > 0 && toChargeBackRecord.Status == 0)//待扣款
+                {
+                    userAccount.ToChargeAmount -= toChargeBackRecord.ChargeAmount;
+                    toChargeBackRecord.Status = 2;
+                }
+                if (toChargeBackRecord.Id > 0 && toChargeBackRecord.Id == 1)//已扣款
                 {
-                    var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toChargeBackRecord.UserId) ?? new UserAccount();
                     var userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord
                     {
                         CreateDate = DateTime.Now,

Startup.cs

@@ -142,8 +142,8 @@ namespace MySystem
             OpExcelHelper.Instance.Start();
             TestHelper.Instance.Start();
             
-            TimeOutPosSendMessageService.Instance.Start();//过期机具循环截止时间超过10天预扣费消息推送
-            TimeOutPosChargeService.Instance.Start();//过期机具循环截止时间超过15天执行扣费
+            // TimeOutPosSendMessageService.Instance.Start();//过期机具循环截止时间超过10天预扣费消息推送
+            // TimeOutPosChargeService.Instance.Start();//过期机具循环截止时间超过15天执行扣费
             // TimeOutPosChargeReturnService.Instance.Start();//过期购买机具循环截止时间超过15天激活扣费退还
         }