暂存

AppStart/Helper/ImportHelper/BatchEditUserAmountService.cs

@@ -64,6 +64,7 @@ namespace MySystem
                                     {
                                         DataRow dr = list.Rows[i];
                                         string MakerCode = dr[0].ToString(); //创客编号
+                                        string RealName = dr[1].ToString(); //创客姓名
                                         string SettleAmount = dr[2].ToString(); //提现结算金额(元)
                                         UserForMakerCode UserCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
                                         if (UserCode.UserId > 0)
@@ -71,11 +72,12 @@ namespace MySystem
                                             var user = db.Users.FirstOrDefault(m => m.Id == UserCode.UserId) ?? new Users();
                                             if (user.Id > 0)
                                             {
+                                                SuccessCount += 1;
                                                 user.SettleAmount = decimal.Parse(function.CheckInt(SettleAmount));
                                             }
                                             else
                                             {
-                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "未找到" + MakerCode + "创客信息");
+                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "未找到" + MakerCode + " " + RealName + "创客信息");
                                             }
                                         }
                                         else
@@ -122,6 +124,7 @@ namespace MySystem
                                     {
                                         DataRow dr = list.Rows[i];
                                         string MakerCode = dr[0].ToString(); //创客编号
+                                        string RealName = dr[1].ToString(); //创客姓名
                                         string CashFreezeAmt = dr[2].ToString(); //提现结算金额(元)
                                         UserForMakerCode UserCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
                                         if (UserCode.UserId > 0)
@@ -129,11 +132,12 @@ namespace MySystem
                                             var user = db.Users.FirstOrDefault(m => m.Id == UserCode.UserId) ?? new Users();
                                             if (user.Id > 0)
                                             {
+                                                SuccessCount += 1;
                                                 user.CashFreezeAmt = decimal.Parse(function.CheckInt(CashFreezeAmt));
                                             }
                                             else
                                             {
-                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "未找到" + MakerCode + "创客信息");
+                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "未找到" + MakerCode + " " + RealName + "创客信息");
                                             }
                                         }
                                         else
@@ -180,20 +184,22 @@ namespace MySystem
                                     {
                                         DataRow dr = list.Rows[i];
                                         string MakerCode = dr[0].ToString(); //创客编号
+                                        string RealName = dr[1].ToString(); //创客姓名
                                         string RiskFlag = dr[2].ToString(); //风控标记(0 否 1 是)
                                         string RiskNote = dr[3].ToString(); //风控备注
                                         UserForMakerCode UserCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
                                         if (UserCode.UserId > 0)
                                         {
-                                            var user = db.Users.FirstOrDefault(m => m.Id == UserCode.UserId) ?? new Users();
+                                            var user = db.Users.FirstOrDefault(m => m.Id == UserCode.UserId && m.RealName == RealName) ?? new Users();
                                             if (user.Id > 0)
                                             {
+                                                SuccessCount += 1;
                                                 user.RiskFlag = ulong.Parse(function.CheckInt(RiskFlag));
                                                 user.RiskRemark = RiskNote;
                                             }
                                             else
                                             {
-                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "未找到" + MakerCode + "创客信息");
+                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "未找到" + MakerCode + " " + RealName + "创客信息");
                                             }
                                         }
                                         else
@@ -250,6 +256,15 @@ namespace MySystem
                                             if (user.Id > 0)
                                             {
                                                 UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == user.Id) ?? new UserAccount();
+                                                if (account.Id == 0)
+                                                {
+                                                    account = db.UserAccount.Add(new UserAccount()
+                                                    {
+                                                        Id = user.Id,
+                                                        UserId = user.Id,
+                                                    }).Entity;
+                                                    db.SaveChanges();
+                                                }
                                                 if (account.Id > 0)
                                                 {
                                                     decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
@@ -311,21 +326,13 @@ namespace MySystem
                                                         Remark = dr[4].ToString(),
                                                     }).Entity;
                                                     db.SaveChanges();
+                                                    SuccessCount += 1;
                                                     function.WriteLog(DateTime.Now.ToString() + "\n" + user.Id.ToString(), "批量修改账户金额");
                                                 }
-                                                else
-                                                {
-                                                    account = db.UserAccount.Add(new UserAccount()
-                                                    {
-                                                        Id = user.Id,
-                                                        UserId = user.Id,
-                                                    }).Entity;
-                                                    db.SaveChanges();
-                                                }
                                             }
                                             else
                                             {
-                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "未找到" + MakerCode + "创客信息");
+                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "未找到" + MakerCode + " " + RealName + "创客信息");
                                             }
                                         }
                                         else

AppStart/Helper/ImportHelper/PreWithdrawalResultsService.cs

@@ -76,6 +76,7 @@ namespace MySystem
                                                 var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == Info.UserId) ?? new UserAccount();
                                                 if (userAccount.Id > 0)
                                                 {
+                                                    SuccessCount += 1;
                                                     userAccount.PreTempAmount += Info.UseAmount;//退还卡充值临额
                                                     userAccount.ValidPreAmount += Info.UseAmount;//退还可用额度
                                                 }

AppStart/Helper/ImportHelper/StoreHouseWithdrawalResultsService.cs

@@ -76,6 +76,7 @@ namespace MySystem
                                                 var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == Info.UserId) ?? new UserAccount();
                                                 if (userAccount.Id > 0)
                                                 {
+                                                    SuccessCount += 1;
                                                     userAccount.TempAmount += Info.UseAmount;//退还卡充值临额
                                                     userAccount.ValidAmount += Info.UseAmount;//退还可用额度
                                                 }

wwwroot/layuiadmin/modules_main/Users_Admin.js

@@ -1099,7 +1099,7 @@ layui.config({
             var perContent = layer.open({
                 type: 2,
                 title: '导入修改金额数据',
-                content: 'ImportByQueue?ExcelKind=1',
+                content: 'ImportByQueue?ExcelKind=4',
                 maxmin: true,
                 area: ['650px', '350px'],
                 btn: ['确定', '取消'],