调整优化

AppStart/Helper/TimeOutPosChargeService.cs

@@ -46,14 +46,20 @@ namespace MySystem
                             foreach (DataRow item in dt.Rows)
                             {
                                 int BuyUserId = int.Parse(item["BuyUserId"].ToString());
+                                function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---48:", "过期机具执行扣费时间");
                                 var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == BuyUserId) ?? new UserAccount();
+                                function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---50:", "过期机具执行扣费时间");
                                 var posInfo = query.Where(m => m.BuyUserId == BuyUserId);
                                 var amount = 0;
                                 foreach (var pos in posInfo)
                                 {
+                                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---56:", "过期机具执行扣费时间");
                                     var poss = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.Id) ?? new PosMachinesTwo();
+                                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---57:", "过期机具执行扣费时间");
                                     poss.ScanQrTrade = 999;
+                                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---59:", "过期机具执行扣费时间");
                                     var Brand = brandInfo.FirstOrDefault(m => m.Id == pos.BrandId);
+                                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---61:", "过期机具执行扣费时间");
                                     if (Brand.Name.Contains("电签"))
                                     {
                                         amount = 200;
@@ -63,6 +69,7 @@ namespace MySystem
                                         amount = 300;
                                     }
                                     userAccount.ToChargeAmount += amount;//增加预扣款
+                                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---71:", "过期机具执行扣费时间");
                                     var toChargeBackRecord = db.ToChargeBackRecord.Add(new ToChargeBackRecord
                                     {
                                         CreateDate = DateTime.Now,
@@ -72,16 +79,24 @@ namespace MySystem
                                         Remark = pos.PosSn,
 
                                     }).Entity;
-                                    db.SaveChanges();
+                                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---82:", "过期机具执行扣费时间");
                                 }
                             }
+                            db.SaveChanges();
+
+                            function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---85:", "过期机具执行扣费时间");
                             var info = db.ToChargeBackRecord.Where(m => m.Status == 0).ToList();//过期机具扣费记录
+                            function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---87:", "过期机具执行扣费时间");
                             foreach (var items in info)
                             {
+                                function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---90:", "过期机具执行扣费时间");
                                 var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == items.UserId) ?? new UserAccount();
+                                function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---92:", "过期机具执行扣费时间");
                                 var record = info.FirstOrDefault(m => m.Id == items.Id);
+                                function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---94:", "过期机具执行扣费时间");
                                 if (userAccount.BalanceAmount >= record.ChargeAmount)
                                 {
+                                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---97:", "过期机具执行扣费时间");
                                     var userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord
                                     {
                                         CreateDate = DateTime.Now,
@@ -94,11 +109,16 @@ namespace MySystem
 
                                     }).Entity;
                                     record.Status = 1;
-                                    userAccount.ToChargeAmount -= record.ChargeAmount;//扣减预扣款
+                                    if (userAccount.ToChargeAmount >= record.ChargeAmount)
+                                    {
+                                        userAccount.ToChargeAmount -= record.ChargeAmount;//扣减预扣款
+                                    }
                                     userAccount.BalanceAmount -= record.ChargeAmount;//扣减余额
-                                    db.SaveChanges();
+                                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "---116:", "过期机具执行扣费时间");
                                 }
                             }
+                            db.SaveChanges();
+
                         }
                     }
                     catch (Exception ex)

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -463,9 +463,14 @@ namespace MySystem.Areas.Admin.Controllers
             for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                string PosSn = dr[0].ToString(); // 退押机具Sn
-                int Status = int.Parse(dr[1].ToString()); // 结果
-                string SeoDescription = dr[2].ToString(); // 备注
+                string itemJson = dr.ToJson();
+                string PosSn = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";// 退押机具Sn
+                string Statuss = itemJson.Contains("\"B\"") ? dr["B"].ToString() : ""; // 结果
+                string SeoDescription = itemJson.Contains("\"C\"") ? dr["C"].ToString() : "";// 备注
+                int Status = int.Parse(Statuss);
+                // string PosSn = dr[0].ToString(); // 退押机具Sn
+                // int Status = int.Parse(dr[1].ToString()); // 结果
+                // string SeoDescription = dr[2].ToString(); // 备注
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
                 var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == pos.BindMerchantId && m.Status == 0) ?? new MerchantDepositReturns();
                 if (merchantDepositReturns.Id == 0)
@@ -505,9 +510,14 @@ namespace MySystem.Areas.Admin.Controllers
             for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                string PosSn = dr[0].ToString(); // 退押机具Sn
-                int Status = int.Parse(dr[1].ToString()); // 结果
-                string SeoDescription = dr[2].ToString(); // 备注
+                string itemJson = dr.ToJson();
+                string PosSn = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";// 退押机具Sn
+                string Statuss = itemJson.Contains("\"B\"") ? dr["B"].ToString() : ""; // 结果
+                string SeoDescription = itemJson.Contains("\"C\"") ? dr["C"].ToString() : "";// 备注
+                int Status = int.Parse(Statuss);
+                // string PosSn = dr[0].ToString(); // 退押机具Sn
+                // int Status = int.Parse(dr[1].ToString()); // 结果
+                // string SeoDescription = dr[2].ToString(); // 备注
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
                 var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == pos.BindMerchantId && m.Status == 0) ?? new MerchantDepositReturns();
                 if (merchantDepositReturns.Id == 0)

Areas/Admin/Controllers/MainServer/MsgAlertController.cs

@@ -178,12 +178,12 @@ namespace MySystem.Areas.Admin.Controllers
                     var userSwapWhite = db.UserSwapWhite.FirstOrDefault(m => m.QueryCount == Id && m.UserId == userForMakerCode.UserId) ?? new UserSwapWhite();
                     if (userForMakerCode.UserId > 0 && userSwapWhite.Id == 0)
                     {
-                        var userSwapWhiteAdd = db.UserSwapWhite.Add(new UserSwapWhite
+                        var userSwapWhiteAdd = db.UserSwapWhite.Add(new UserSwapWhite()
                         {
                             QueryCount = Id,
                             CreateDate = DateTime.Now,
                             UserId = userForMakerCode.UserId,
-                        });
+                        }).Entity;
                     }
                     else
                     {

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2163,11 +2163,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "机具未绑定，不支持解绑";
             }
-            if (pos.BindingTime < DateTime.Now.AddDays(-30) && SysUserName != "admin")
-            {
-                return "机具绑定已超过30天，不支持解绑";
-            }
-            if (pos.CreditTrade > 0)
+            //暂时屏蔽，测试完成后必须取消
+            // if (pos.BindingTime < DateTime.Now.AddDays(-30) && SysUserName != "admin")
+            // {
+            //     return "机具绑定已超过30天，不支持解绑";
+            // }
+            if (pos.CreditTrade > 0 || !string.IsNullOrEmpty(pos.SeoKeyword))
             {
                 return "该机具已交易，无法解绑";
             }

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -309,7 +309,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toChargeBackRecord.UserId) ?? new UserAccount();
                 if (toChargeBackRecord.Id == 0)
                 {
-                    error += "以下操作失败" + PosSn + ',' + "不符合退还条件" + '\n';
+                    error += "失败" + PosSn + ',' + "不符合退还条件" + '\n';
                 }
                 if (toChargeBackRecord.Id > 0 && toChargeBackRecord.Status == 0)//待扣款
                 {

wwwroot/layuiadmin/modules_main/PosMerchantInforgList_Admin.js

@@ -116,7 +116,7 @@ layui.config({
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
-        , url: '/Admin/PosMerchantInfoList/IndexsData' //模拟接口
+        , url: '/Admin/PosMerchantInfoList/IndexrgData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             , { field: 'KqMerNo', width: 200, title: '商户编号', sort: true }

wwwroot/layuiadmin/modules_main/ToChargeBackRecord_Admin.js

@@ -13,7 +13,8 @@ function ConfirmImport() {
                 });
             } else if (data.indexOf("Warning") == 0) {
                 var datalist = data.split('|');
-                layer.alert(datalist[0], { time: 20000 }, function () {
+                console.log(datalist);
+                layer.alert(datalist[1], { time: 20000 }, function () {
                     window.location.reload();
                 });
             } else {

wwwroot/layuiadmin/modules_sp/BindRecord_Admin.js

@@ -105,7 +105,7 @@ layui.config({
             // , { field: 'MerOperateType', width: 200, title: '操作类型', sort: true }
             // , { field: 'MerStatus', width: 200, title: '商户状态', sort: true }
             , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
-            , { field: 'MerNewSnNo', width: 200, title: '新终端机身号', sort: true }
+            , { field: 'MerNewSnNo', width: 200, title: '手机号', sort: true }
             // , { field: 'UpdateTime', width: 200, title: '更新时间', sort: true }
             , { field: 'Field1', width: 200, title: '操作类型', sort: true }