Merge branch 'feature-dgy-创客分期扣款和预扣款' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -368,22 +368,36 @@ namespace MySystem.Areas.Admin.Controllers
                 string Amount = itemJson.Contains("\"C\"") ? dr["C"].ToString() : "";
                 string Remark = itemJson.Contains("\"D\"") ? dr["D"].ToString() : "";
                 var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
-                var users = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId && m.RealName == Name);
+                var users = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId && m.RealName == Name) ?? new Users();
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == users.Id);
                 if (users.Id == 0)
                 {
-                    error += "失败：" + MakerCode + "_" + Name  + "创客不存在或创客编号和姓名不匹配" + '\n';
+                    error += "失败：" + MakerCode + "_" + Name + "创客不存在或创客编号和姓名不匹配" + '\n';
                 }
-                var ToChargeBackRecord = db.ToChargeBackRecord.Add(new ToChargeBackRecord
+                else
                 {
-                    CreateDate = DateTime.Now,
-                    SeoTitle = SysUserName + "_" + SysRealName,
-                    SeoDescription = Remark,
-                    Remark = Remark,
-                    ChargeType = 1,
-                    ChargeAmount = decimal.Parse(Amount),
-                    UserId =users.Id,
-                }).Entity;
-                info += "创客编号："+MakerCode + "；创客姓名：" + Name + "；金额：" + Amount + "；备注：" + Remark + "<br/>";
+                    if (userAccount == null)
+                    {
+                        userAccount = db.UserAccount.Add(new UserAccount()
+                        {
+                            Id = users.Id,
+                            UserId = users.Id,
+                        }).Entity;
+                        db.SaveChanges();
+                    }
+                    userAccount.ToChargeAmount += decimal.Parse(Amount);
+                    var ToChargeBackRecord = db.ToChargeBackRecord.Add(new ToChargeBackRecord
+                    {
+                        CreateDate = DateTime.Now,
+                        SeoTitle = SysUserName + "_" + SysRealName,
+                        SeoDescription = Remark,
+                        Remark = Remark,
+                        ChargeType = 1,
+                        ChargeAmount = decimal.Parse(Amount),
+                        UserId = users.Id,
+                    }).Entity;
+                    info += "创客编号：" + MakerCode + "；创客姓名：" + Name + "；金额：" + Amount + "；备注：" + Remark + "<br/>";
+                }
             }
             if (!string.IsNullOrEmpty(error))
             {

Startup.cs

@@ -143,8 +143,8 @@ namespace MySystem
             SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
 
 
-            InstallmentDeductionService.Instance.Start();//每月20号执行分期扣费
-            TimeOutPosChargeService.Instance.StartDoChargeAmount();//每天执行预扣款
+            // InstallmentDeductionService.Instance.Start();//每月20号执行分期扣费
+            // TimeOutPosChargeService.Instance.StartDoChargeAmount();//每天执行预扣款
         }