DuGuYang 3 лет назад
Родитель
Сommit
f00b0fc9f6

+ 6 - 5
Areas/Admin/Controllers/MainServer/PreAmountRecordController.cs

@@ -99,6 +99,11 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
                 dic.Remove("UserId");
                 dic.Remove("UserId");
 
 
+                //变动类别
+                int ChangeType = int.Parse(dic["Sort"].ToString());
+                if (ChangeType == 1) dic["ChangeType"] = "购买临额";
+                if (ChangeType == 3) dic["ChangeType"] = "调低临额";
+
                 //操作类别
                 //操作类别
                 int OperateType = int.Parse(dic["OperateType"].ToString());
                 int OperateType = int.Parse(dic["OperateType"].ToString());
                 if (OperateType == 0) dic["OperateType"] = "减少";
                 if (OperateType == 0) dic["OperateType"] = "减少";
@@ -214,8 +219,6 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 2) dic["Status"] = "处理中";
                 if (Status == 2) dic["Status"] = "处理中";
                 if (Status == 1) dic["Status"] = "成功";
                 if (Status == 1) dic["Status"] = "成功";
                 if (Status == -1) dic["Status"] = "失败";
                 if (Status == -1) dic["Status"] = "失败";
-                decimal UseAmount = Convert.ToDecimal(dic["UseAmount"].ToString());
-                dic["UseAmount"] = UseAmount / 2;
             }
             }
             return Json(obj);
             return Json(obj);
         }
         }
@@ -269,8 +272,6 @@ namespace MySystem.Areas.Admin.Controllers
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
-                decimal UseAmount = Convert.ToDecimal(dic["UseAmount"].ToString());
-                dic["UseAmount"] = UseAmount / 2;
                 dic["CertId"] = userid_Users.CertId;
                 dic["CertId"] = userid_Users.CertId;
                 dic["SettleBankCardNo"] = userid_Users.SettleBankCardNo;
                 dic["SettleBankCardNo"] = userid_Users.SettleBankCardNo;
                 dic["SettleBankName"] = userid_Users.SettleBankName;
                 dic["SettleBankName"] = userid_Users.SettleBankName;
@@ -336,7 +337,7 @@ namespace MySystem.Areas.Admin.Controllers
                 JsonData dr = list[i];
                 JsonData dr = list[i];
                 string itemJson = dr.ToJson();
                 string itemJson = dr.ToJson();
                 string Id = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
                 string Id = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
-                string IsOk = itemJson.Contains("\"J\"") ? dr["J"].ToString() : "";
+                string IsOk = itemJson.Contains("\"L\"") ? dr["L"].ToString() : "";
                 if (IdList.Contains(Convert.ToInt32(Id)))
                 if (IdList.Contains(Convert.ToInt32(Id)))
                 {
                 {
                     error += "以下操作失败" + Id + ',' + "该记录重复" + '\n';
                     error += "以下操作失败" + Id + ',' + "该记录重复" + '\n';

+ 1 - 1
Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -674,7 +674,7 @@ namespace MySystem.Areas.Admin.Controllers
                 JsonData dr = list[i];
                 JsonData dr = list[i];
                 string itemJson = dr.ToJson();
                 string itemJson = dr.ToJson();
                 string Id = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
                 string Id = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
-                string IsOk = itemJson.Contains("\"J\"") ? dr["J"].ToString() : "";
+                string IsOk = itemJson.Contains("\"L\"") ? dr["L"].ToString() : "";
                 if (IdList.Contains(Convert.ToInt32(Id)))
                 if (IdList.Contains(Convert.ToInt32(Id)))
                 {
                 {
                     error += "以下操作失败" + Id + ',' + "该记录重复" + '\n';
                     error += "以下操作失败" + Id + ',' + "该记录重复" + '\n';

+ 1 - 1
Areas/Admin/Views/MainServer/PreAmountRecord/Index.cshtml

@@ -159,7 +159,7 @@
 
 
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/layui/layui.js"></script>
     <script
     <script
-        src="/layuiadmin/modules_main/StoreHouseAmountRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+        src="/layuiadmin/modules_main/PreAmountRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
     <script>
 
 
     </script>
     </script>

+ 1 - 1
Areas/Admin/Views/MainServer/PreAmountRecord/Indexs.cshtml

@@ -147,7 +147,7 @@
 
 
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/layui/layui.js"></script>
     <script
     <script
-        src="/layuiadmin/modules_main/StoreHouseCardAmountRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+        src="/layuiadmin/modules_main/PreCardAmountRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
     <script>
 
 
     </script>
     </script>

+ 1 - 1
Startup.cs

@@ -145,7 +145,7 @@ namespace MySystem
 
 
             // InstallmentDeductionService.Instance.Start();//每月20号执行分期扣费
             // InstallmentDeductionService.Instance.Start();//每月20号执行分期扣费
             // TimeOutPosChargeService.Instance.StartDoChargeAmount();//每天执行预扣款
             // TimeOutPosChargeService.Instance.StartDoChargeAmount();//每天执行预扣款
-            PreStoreApplyHelper.Instance.StartEverTime();//临时额度充值调低
+            // PreStoreApplyHelper.Instance.StartEverTime();//临时额度充值调低
         }
         }
 
 
 
 

+ 1 - 1
wwwroot/layuiadmin/modules_main/PreAmountRecord_Admin.js

@@ -103,7 +103,7 @@ layui.config({
             , { field: 'PayMode', width: 200, title: '额度类别', sort: true }
             , { field: 'PayMode', width: 200, title: '额度类别', sort: true }
 
 
             // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            // , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         ]]
         , where: {
         , where: {