调整列表显示

AppStart/SetDesposit.cs

@@ -41,7 +41,7 @@ namespace MySystem
                             bool op = true;
                             while (op)
                             {
-                                var smallPos = db.PreSendStockDetail.Where(m => m.Status == 1 && m.CreateDate <= date && m.ApplyFlag == 0).ToList();
+                                var smallPos = db.PreSendStockDetail.Where(m => m.Status == 1 && m.Sort == 0 && m.CreateDate <= date && m.ApplyFlag == 0).ToList();
                                 foreach (var item in smallPos)
                                 {
                                     var tuserAccount = db.UserAccount.FirstOrDefault(m => m.Id == item.ToUserId) ?? new UserAccount();
@@ -51,7 +51,7 @@ namespace MySystem
                                     {
                                         amount = 200;
                                     }
-                                    if (brandInfo.Name.Contains("电签"))
+                                    if (brandInfo.Name.Contains("大POS"))
                                     {
                                         amount = 300;
                                     }
@@ -60,7 +60,8 @@ namespace MySystem
                                         tuserAccount.SmallStoreDeposit += amount;//添加小分仓押金
                                         var add = db.UserAccountRecord.Add(new UserAccountRecord()
                                         {
-                                            Remark = "小分仓押金冻结",
+                                            CreateDate = DateTime.Now,
+                                            Remark = "小分仓押金暂扣",
                                             ChangeType = 63,
                                             BeforeBalanceAmount = tuserAccount.SmallStoreDeposit - amount, //变更前余额
                                             AfterBalanceAmount = tuserAccount.SmallStoreDeposit, //变更后余额
@@ -70,6 +71,8 @@ namespace MySystem
                                         }).Entity;
                                         db.SaveChanges();
                                     }
+                                    item.Sort = 1;
+                                    db.SaveChanges();
                                 }
                             }
                             db.Dispose();
@@ -80,7 +83,7 @@ namespace MySystem
                         function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "设置预发机超过30天预发押金自动扣减异常");
                     }
                 }
-                Thread.Sleep(800000);
+                Thread.Sleep(5000);
             }
         }
     }

Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -490,6 +490,11 @@ namespace MySystem.Areas.Admin.Controllers
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["CertId"] = userid_Users.CertId;
+                dic["SettleBankCardNo"] = userid_Users.SettleBankCardNo;
+                dic["SettleBankName"] = userid_Users.SettleBankName;
+                dic["Mobile"] = userid_Users.Mobile;
+                dic["Type"] = "临额提现";
                 dic.Remove("UserId");
                 //申请单
                 dic["ApplyId"] = RelationClass.GetStoreMachineApplyInfo(int.Parse(dic["ApplyId"].ToString()));
@@ -562,6 +567,12 @@ namespace MySystem.Areas.Admin.Controllers
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["CertId"] = userid_Users.CertId;
+                dic["SettleBankCardNo"] = userid_Users.SettleBankCardNo;
+                dic["SettleBankName"] = userid_Users.SettleBankName;
+                dic["Mobile"] = userid_Users.Mobile;
+                dic["Type"] = "临额提现";
+                dic["IsOk"] = "否";
                 dic.Remove("UserId");
 
                 //记录Id
@@ -579,6 +590,12 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UseAmount", "申请提现临额");
+            ReturnFields.Add("CertId", "身份证号");
+            ReturnFields.Add("SettleBankCardNo", "银行卡号");
+            ReturnFields.Add("SettleBankName", "银行名称");
+            ReturnFields.Add("Mobile", "手机号");
+            ReturnFields.Add("Type", "交易类型");
+            ReturnFields.Add("IsOk", "是否完成");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "StoreHouseAmountRecord", "ExportExcel");
@@ -628,10 +645,15 @@ namespace MySystem.Areas.Admin.Controllers
                 JsonData dr = list[i];
                 string itemJson = dr.ToJson();
                 string Id = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
+                string IsOk = itemJson.Contains("\"I\"") ? dr["I"].ToString() : "";
                 if (IdList.Contains(Convert.ToInt32(Id)))
                 {
                     error += "以下操作失败" + Id + ',' + "该记录重复" + '\n';
                 }
+                else if (IsOk == "否")
+                {
+                    error += "以下操作失败" + Id + ',' + "该记录未处理" + '\n';
+                }
                 else
                 {
                     IdList.Add(Convert.ToInt32(Id));

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -359,30 +359,35 @@ namespace MySystem.Areas.Admin.Controllers
             var prePos = db.PreSendStockDetail.FirstOrDefault(m => m.ToUserId == makerCode.UserId && m.SnId == pos.Id && m.CreateDate < DateTime.Now.AddDays(-30) && m.AuthFlag == 1 && m.ApplyFlag == 0) ?? new PreSendStockDetail();
             if (makerCode.UserId > 0 && prePos.Id > 0)
             {
-                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == prePos.BrandId);
-                var amount = 0;
-                if (brandInfo.Name.Contains("电签"))
+                if (prePos.CreateDate <= DateTime.Now.AddDays(-30))
                 {
-                    amount = 200;
-                }
-                if (brandInfo.Name.Contains("大POS"))
-                {
-                    amount = 300;
-                }
-                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == makerCode.UserId) ?? new UserAccount();
-                if (userAccount.Id > 0)
-                {
-                    userAccount.SmallStoreDeposit -= amount;
-                    var add = db.UserAccountRecord.Add(new UserAccountRecord()
+                    var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == prePos.BrandId);
+                    var amount = 0;
+                    if (brandInfo.Name.Contains("电签"))
                     {
-                        Remark = "小分仓押金解冻",
-                        ChangeType = 62,
-                        BeforeBalanceAmount = userAccount.SmallStoreDeposit - amount, //变更前小分仓押金
-                        AfterBalanceAmount = userAccount.SmallStoreDeposit, //变更后小分仓押金
-                        UserId = userAccount.Id,
+                        amount = 200;
+                    }
+                    if (brandInfo.Name.Contains("大POS"))
+                    {
+                        amount = 300;
+                    }
+                    var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == makerCode.UserId) ?? new UserAccount();
+                    if (userAccount.Id > 0)
+                    {
+                        userAccount.SmallStoreDeposit -= amount;
+                        var add = db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            Remark = "小分仓押金退还",
+                            ChangeType = 65,
+                            BeforeBalanceAmount = userAccount.SmallStoreDeposit + amount, //变更前小分仓押金
+                            AfterBalanceAmount = userAccount.SmallStoreDeposit, //变更后小分仓押金
+                            ChangeAmount = amount,//变动金额
+                            UserId = userAccount.Id,
 
-                    }).Entity;
-                    db.SaveChanges();
+                        }).Entity;
+                        db.SaveChanges();
+                    }
                 }
             }
             db.SaveChanges();

wwwroot/layuiadmin/modules_main/StoreHouseCardAmountRecord_Admin.js

@@ -101,6 +101,11 @@ layui.config({
             , { field: 'UserIdMakerCode', width: 200, title: '创客创客编号', sort: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'UseAmount', width: 200, title: '申请提现临额', sort: true }
+            , { field: 'CertId', width: 200, title: '身份证号', sort: true }
+            , { field: 'SettleBankCardNo', width: 200, title: '银行卡号', sort: true }
+            , { field: 'SettleBankName', width: 200, title: '银行名称', sort: true }
+            , { field: 'Mobile', width: 200, title: '手机号', sort: true }
+            , { field: 'Type', width: 200, title: '交易类型', sort: true }
 
             // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             // , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }