sp数据功能初始

Areas/Admin/Controllers/SpServer/ActivateRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 激活记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ActivateRecord data, string ActivateStatusSelect, string ProductTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ActivateRecord data, string ActivateStatusSelect, string ProductTypeSelect, string ActivateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -75,18 +75,41 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ProductType=" + ProductTypeSelect;
             }
+            //创建时间
+            if (!string.IsNullOrEmpty(ActivateDateData))
+            {
+                string[] datelist = ActivateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and ActivateDate>='" + start + " 00:00:00' and ActivateDate<='" + end + " 23:59:59'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.SpTables).IndexData("ActivateRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                //状态
+                string Status = dic["Status"].ToString();
+                if (Status == "1") dic["Status"] = "待同步";
+                if (Status == "2") dic["Status"] = "已同步";
+                if (Status == "") dic["Status"] = "";
                 //激活状态
                 string ActivateStatus = dic["ActivateStatus"].ToString();
                 if (ActivateStatus == "0") dic["ActivateStatus"] = "未激活";
                 if (ActivateStatus == "1") dic["ActivateStatus"] = "激活";
                 //产品类型
-                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString()); 
+                //押金
+                string SeoTitle = dic["SeoTitle"].ToString();
+                if (SeoTitle.Length <= 3)
+                {
+                    dic["SeoTitle"] = SeoTitle;
+                }
+                if (SeoTitle.Length > 3)
+                {
+                    dic["SeoTitle"] = SeoTitle.Substring(3);
+                }
                 // //产品类型
                 // string ProductType = dic["ProductType"].ToString();
                 // if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";

Areas/Admin/Controllers/SpServer/BindRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 绑定记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(BindRecord data, string MerOperateTypeSelect, string MerStatusSelect, string ProductTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(BindRecord data, string MerOperateTypeSelect, string MerStatusSelect, string ProductTypeSelect, string CreateTimeData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -81,12 +81,25 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ProductType=" + ProductTypeSelect;
             }
+            //绑定时间
+            if (!string.IsNullOrEmpty(CreateTimeData))
+            {
+                string[] datelist = CreateTimeData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateTime>='" + start + " 00:00:00' and CreateTime<='" + end + " 23:59:59'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.SpTables).IndexData("BindRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                 //状态
+                string Status = dic["Status"].ToString();
+                if (Status == "1") dic["Status"] = "待同步";
+                if (Status == "2") dic["Status"] = "已同步";
+                if (Status == "") dic["Status"] = "";
                 //产品类型
                 dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
             }

Areas/Admin/Controllers/SpServer/ChangeBindRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 换绑记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ChangeBindRecord data, string ProductTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ChangeBindRecord data, string ProductTypeSelect, string ReBindTimeData, string ConfirmTimeData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -71,12 +71,33 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ProductType=" + ProductTypeSelect;
             }
+            //绑定时间
+            if (!string.IsNullOrEmpty(ReBindTimeData))
+            {
+                string[] datelist = ReBindTimeData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and ReBindTime>='" + start + " 00:00:00' and ReBindTime<='" + end + " 23:59:59'";
+            }
+            //提交时间
+            if (!string.IsNullOrEmpty(ConfirmTimeData))
+            {
+                string[] datelist = ConfirmTimeData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and ConfirmTime>='" + start + " 00:00:00' and ConfirmTime<='" + end + " 23:59:59'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.SpTables).IndexData("ChangeBindRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                //状态
+                string Status = dic["Status"].ToString();
+                if (Status == "1") dic["Status"] = "待同步";
+                if (Status == "2") dic["Status"] = "已同步";
+                if (Status == "") dic["Status"] = "";
                 //产品类型
                 dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
             }

Areas/Admin/Controllers/SpServer/TradeRecordController.cs → Areas/Admin/Controllers/SpServer/SpTradeRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 交易记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(TradeRecord data, string TradeStatusSelect, string ProductTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(TradeRecord data, string TradeStatusSelect, string ProductTypeSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -71,12 +71,26 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ProductType=" + ProductTypeSelect;
             }
+            
+            //创建时间
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.SpTables).IndexData("TradeRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                //状态
+                string Status = dic["Status"].ToString();
+                if (Status == "1") dic["Status"] = "待同步";
+                if (Status == "2") dic["Status"] = "已同步";
+                if (Status == "") dic["Status"] = "";
                 //交易状态
                 string TradeStatus = dic["TradeStatus"].ToString();
                 if (TradeStatus == "1") dic["TradeStatus"] = "成功";
@@ -89,13 +103,6 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BankCardType == "") dic["BankCardType"] = "";
                 //产品类型
                 dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
-                // //产品类型
-                // string ProductType = dic["ProductType"].ToString();
-                // if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
-                // if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
-                // if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
-                // if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
-                // if (ProductType == "") dic["ProductType"] = "";
 
             }
             return Json(obj);

Areas/Admin/Controllers/SpServer/TradeFluxRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 流量卡分佣交易列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(TradeFluxRecord data, string TradeStatusSelect, string ProductTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(TradeFluxRecord data, string TradeStatusSelect, string ProductTypeSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -71,12 +71,25 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ProductType=" + ProductTypeSelect;
             }
+            //创建时间
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.SpTables).IndexData("TradeFluxRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                //状态
+                string Status = dic["Status"].ToString();
+                if (Status == "1") dic["Status"] = "待同步";
+                if (Status == "2") dic["Status"] = "已同步";
+                if (Status == "") dic["Status"] = "";
                 //交易状态
                 string TradeStatus = dic["TradeStatus"].ToString();
                 if (TradeStatus == "1") dic["TradeStatus"] = "成功";

Areas/Admin/Controllers/SpServer/UnBindRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 解绑记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UnBindRecord data, string ProductTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(UnBindRecord data, string ProductTypeSelect, string UnBindTimeData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -70,12 +70,25 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ProductType=" + ProductTypeSelect;
             }
+            //解绑时间
+            if (!string.IsNullOrEmpty(UnBindTimeData))
+            {
+                string[] datelist = UnBindTimeData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and UnBindTime>='" + start + " 00:00:00' and UnBindTime<='" + end + " 23:59:59'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.SpTables).IndexData("UnBindRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                //状态
+                string Status = dic["Status"].ToString();
+                if (Status == "1") dic["Status"] = "待同步";
+                if (Status == "2") dic["Status"] = "已同步";
+                if (Status == "") dic["Status"] = "";
                 //产品类型
                 dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
             }

Areas/Admin/Views/SpServer/ActivateRecord/Index.cshtml

@@ -44,6 +44,16 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">待同步</option>
+                                <option value="2">已同步</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">商户编号</label>
                         <div class="layui-input-inline">
@@ -56,6 +66,13 @@
                             <input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">激活时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="ActivateDateData" id="ActivateDate"
+                                placeholder="激活时间" autocomplete="off">
+                        </div>
+                    </div>
                     @* <div class="layui-inline">
                         <label class="layui-form-label">商户手机号</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/SpServer/BindRecord/Index.cshtml

@@ -44,6 +44,16 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">待同步</option>
+                                <option value="2">已同步</option>
+                            </select>
+                        </div>
+                    </div>
                     @* <div class="layui-inline">
                         <label class="layui-form-label">机构名称</label>
                         <div class="layui-input-inline">
@@ -62,13 +72,13 @@
                             <input class="layui-input" type="text" name="MerName" placeholder="" autocomplete="off">
                         </div>
                     </div>
-                    @* <div class="layui-inline">
+                    <div class="layui-inline">
                         <label class="layui-form-label">终端机身号</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="MerSnNo" placeholder="" autocomplete="off">
                         </div>
                     </div>
-                    <div class="layui-inline">
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">操作类型</label>
                         <div class="layui-input-inline">
                             <select id="MerOperateTypeSelect" name="MerOperateTypeSelect" lay-search="">
@@ -120,10 +130,10 @@
                         </div>
                     </div> *@
                     <div class="layui-inline">
-                        <label class="layui-form-label">创建时间</label>
+                        <label class="layui-form-label">绑定时间</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" readonly name="CreateTimeData" id="CreateTime"
-                                placeholder="" autocomplete="off">
+                                placeholder="绑定时间" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">

Areas/Admin/Views/SpServer/ChangeBindRecord/Index.cshtml

@@ -44,6 +44,16 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">待同步</option>
+                                <option value="2">已同步</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">机构名称</label>
                         <div class="layui-input-inline">
@@ -98,6 +108,13 @@
                             <input class="layui-input" type="text" name="MerNewSnNo" placeholder="" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">换绑时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="ReBindTimeData" id="ReBindTime"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">提交时间</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/SpServer/SpTradeRecord/Index.cshtml

@@ -44,6 +44,16 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">待同步</option>
+                                <option value="2">已同步</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">商户编号</label>
                         <div class="layui-input-inline">
@@ -73,18 +83,13 @@
                             </select>
                         </div>
                     </div>
-                    @* <div class="layui-inline">
-                        <label class="layui-form-label">产品类型</label>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
-                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-                                <option value="">全部...</option>
-                                <option value="KYSPOS">快益刷</option>
-                                <option value="KPOS">快联盟大POS</option>
-                                <option value="SIGNPOS">快联盟电签POS</option>
-                                <option value="SUPPOS">超级Mpos</option>
-                            </select>
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="创建时间" autocomplete="off">
                         </div>
-                    </div> *@
+                    </div>
                     @* <div class="layui-inline">
                         <label class="layui-form-label">渠道流水号</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/SpServer/TradeFluxRecord/Index.cshtml

@@ -44,13 +44,23 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">待同步</option>
+                                <option value="2">已同步</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">商户编号</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
                         </div>
                     </div>
-                    <div class="layui-inline">
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">交易状态</label>
                         <div class="layui-input-inline">
                             <select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
@@ -59,7 +69,7 @@
                                 <option value="2">失败</option>
                             </select>
                         </div>
-                    </div>
+                    </div> *@
                     <div class="layui-inline">
                         <label class="layui-form-label">快钱交易流水号</label>
                         <div class="layui-input-inline">
@@ -79,6 +89,13 @@
                             </select>
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创建时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="创建时间" autocomplete="off">
+                        </div>
+                    </div>
                     @* <div class="layui-inline">
                         <label class="layui-form-label">产品类型</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/SpServer/UnBindRecord/Index.cshtml

@@ -44,6 +44,16 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">待同步</option>
+                                <option value="2">已同步</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">机构名称</label>
                         <div class="layui-input-inline">

wwwroot/layuiadmin/modules_sp/ActivateRecord_Admin.js

@@ -64,11 +64,14 @@ layui.config({
         , url: '/Admin/ActivateRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            // , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'Status', width: 200, title: '状态', sort: true }
+            , { field: 'SeoTitle', width: 200, title: '押金', sort: true }
             , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
             , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
             // , { field: 'MerMobile', width: 200, title: '商户手机号', sort: true }
-            // , { field: 'SnNo', width: 200, title: '终端机身号', sort: true }
+            , { field: 'SnNo', width: 200, title: '终端机身号', sort: true }
             // , { field: 'MerRegDate', width: 200, title: '注册日期', sort: true }
             // , { field: 'AssessMonth', width: 200, title: '考核月', sort: true }
             // , { field: 'AssessMonthCount', width: 200, title: '考核第几月', sort: true }
@@ -77,12 +80,13 @@ layui.config({
             // , { field: 'MerRealName', width: 200, title: '商户真实姓名', sort: true }
             // , { field: 'MerIdcardNo', width: 200, title: '商户身份证号', sort: true }
             // , { field: 'Remark', width: 200, title: '备注', sort: true }
-            // , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
-            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
             , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+            , { field: 'BizEnterName', width: 200, title: '业务企业名称', sort: true }
+            , { field: 'BizEnterNo', width: 200, title: '业务企业编号', sort: true }
 
             // , { 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: {
 

wwwroot/layuiadmin/modules_sp/BindRecord_Admin.js

@@ -91,22 +91,26 @@ layui.config({
         , url: '/Admin/BindRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
-            // , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
+            // , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'Status', width: 200, title: '状态', sort: true }
+            , { field: 'CreateTime', width: 200, title: '创建时间', sort: true }
+            , { field: 'SeoTitle', width: 200, title: '名称', sort: true }
+            , { field: 'SeoKeyword', width: 200, title: '交易卡号', sort: true }
+            , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+            , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
             , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
             , { field: 'MerName', width: 200, title: '商户名称', sort: true }
-            // , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
+            , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
             , { field: 'MerOperateDate', width: 200, title: '操作时间', sort: true }
             // , { 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: 'CreateTime', width: 200, title: '创建时间', sort: true }
-            , { field: 'UpdateTime', width: 200, title: '更新时间', sort: true }
+            , { field: 'MerNewSnNo', width: 200, title: '新终端机身号', sort: true }
+            // , { field: 'UpdateTime', width: 200, title: '更新时间', sort: true }
             , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
 
             // , { 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: {
 

wwwroot/layuiadmin/modules_sp/ChangeBindRecord_Admin.js

@@ -91,20 +91,22 @@ layui.config({
         , url: '/Admin/ChangeBindRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
-            // , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
+            // , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'Status', width: 200, title: '状态', sort: true }
+            , { field: 'CreateTime', width: 200, title: '创建时间', sort: true }
+            , { field: 'AgentNo', width: 200, title: '机构号', sort: true }
+            , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
             , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
             , { field: 'MerName', width: 200, title: '商户名称', sort: true }
-            // , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
+            , { field: 'MerSnNo', 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: 'ConfirmTime', width: 200, title: '提交时间', sort: true }
             , { field: 'ReBindTime', width: 200, title: '重新绑定时间', sort: true }
-            , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
-            // , { field: 'AgentNo', width: 200, title: '机构号', sort: true }
+            // , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
 
             // , { 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: {
 

wwwroot/layuiadmin/modules_sp/TradeFluxRecord_Admin.js

@@ -64,10 +64,16 @@ layui.config({
         , url: '/Admin/TradeFluxRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            // , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'Status', width: 200, title: '状态', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
             , { field: 'TradeSerialNo', width: 200, title: '交易单号', sort: true }
-            // , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
-            // , { field: 'TradeAmount', width: 200, title: '交易金额', sort: true }
+            , { field: 'TradeSnNo', width: 200, title: '机具号', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            , { field: 'TradeAmount', width: 200, title: '交易金额', sort: true }
+            , { field: 'TradeSerialNo', width: 200, title: '贸易序列号', sort: true }
             // , { field: 'TradeStatus', width: 200, title: '交易状态', sort: true }
             // , { field: 'TradeDate', width: 200, title: '交易日期', sort: true }
             // , { field: 'TradeTime', width: 200, title: '交易时间', sort: true }
@@ -75,12 +81,12 @@ layui.config({
             // , { field: 'DigAmt', width: 200, title: '挖款金额', sort: true }
             // , { field: 'BankCardNo', width: 200, title: '交易卡号', sort: true }
             , { field: 'FeeAmount', width: 200, title: '手续费', sort: true }
-            // , { field: 'KqTradeSeq', width: 200, title: '快钱交易流水号', sort: true }
+            , { field: 'KqTradeSeq', width: 200, title: '快钱交易流水号', sort: true }
             , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
-            // , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
+            , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
 
             // , { 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: {
 

wwwroot/layuiadmin/modules_sp/TradeRecord_Admin.js

@@ -2,7 +2,7 @@ var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
-        url: "/Admin/TradeRecord/Import?r=" + Math.random(1),
+        url: "/Admin/SpTradeRecord/Import?r=" + Math.random(1),
         data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
         dataType: "text",
         success: function (data) {
@@ -49,7 +49,7 @@ layui.config({
         if (field == "Sort") {
             $.ajax({
                 type: "POST",
-                url: "/Admin/TradeRecord/Sort?r=" + Math.random(1),
+                url: "/Admin/SpTradeRecord/Sort?r=" + Math.random(1),
                 data: "Id=" + data.Id + "&Sort=" + value,
                 dataType: "text",
                 success: function (data) {
@@ -61,26 +61,33 @@ layui.config({
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
-        , url: '/Admin/TradeRecord/IndexData' //模拟接口
+        , url: '/Admin/SpTradeRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            // , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'Status', width: 200, title: '状态', sort: true }
             , { field: 'TradeSerialNo', width: 200, title: '交易单号', sort: true }
             , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
             , { field: 'TradeAmount', width: 200, title: '交易金额', sort: true }
-            // , { field: 'TradeStatus', width: 200, title: '交易状态', sort: true }
+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'AgentNo', width: 200, title: '代理编号', sort: true }
+            , { field: 'BankCardNo', width: 200, title: '交易卡号', sort: true }
+            , { field: 'TradeSnNo', width: 200, title: '机具号', sort: true }
+            , { field: 'TradeType', width: 200, title: '交易类型', sort: true }
+            , { field: 'TradeStatus', width: 200, title: '交易状态', sort: true }
             // , { field: 'TradeDate', width: 200, title: '交易日期', sort: true }
-            // , { field: 'TradeTime', width: 200, title: '交易时间', sort: true }
+            , { field: 'TradeTime', width: 200, title: '交易时间', sort: true }
             , { field: 'BankCardType', width: 200, title: '银行卡类型', sort: true }
-            // , { field: 'BankCardNo', width: 200, title: '交易卡号', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
             // , { field: 'SettleFee', width: 200, title: '出款手续费', sort: true }
             // , { field: 'Remark', width: 200, title: '备注', sort: true }
-            // , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
             // , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
-            // , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+            , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+            , { field: 'TradeSerialNo', width: 200, title: '贸易序列号', sort: true }
 
             // , { 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: {
 
@@ -101,7 +108,7 @@ layui.config({
             var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
                 $.ajax({
                     type: "POST",
-                    url: "/Admin/TradeRecord/Delete?r=" + Math.random(1),
+                    url: "/Admin/SpTradeRecord/Delete?r=" + Math.random(1),
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
@@ -155,7 +162,7 @@ layui.config({
 
                         $.ajax({
                             type: "POST",
-                            url: "/Admin/TradeRecord/Edit?r=" + Math.random(1),
+                            url: "/Admin/SpTradeRecord/Edit?r=" + Math.random(1),
                             data: userdata,
                             dataType: "text",
                             success: function (data) {
@@ -217,7 +224,7 @@ layui.config({
                 var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/TradeRecord/Delete?r=" + Math.random(1),
+                        url: "/Admin/SpTradeRecord/Delete?r=" + Math.random(1),
                         data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {
@@ -272,7 +279,7 @@ layui.config({
 
                         $.ajax({
                             type: "POST",
-                            url: "/Admin/TradeRecord/Add?r=" + Math.random(1),
+                            url: "/Admin/SpTradeRecord/Add?r=" + Math.random(1),
                             data: userdata,
                             dataType: "text",
                             success: function (data) {
@@ -314,7 +321,7 @@ layui.config({
             });
             $.ajax({
                 type: "GET",
-                url: "/Admin/TradeRecord/ExportExcel?r=" + Math.random(1),
+                url: "/Admin/SpTradeRecord/ExportExcel?r=" + Math.random(1),
                 data: userdata,
                 dataType: "json",
                 success: function (data) {
@@ -337,7 +344,7 @@ layui.config({
                 var index = layer.confirm('确定要开启吗？', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/TradeRecord/Open?r=" + Math.random(1),
+                        url: "/Admin/SpTradeRecord/Open?r=" + Math.random(1),
                         data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {
@@ -366,7 +373,7 @@ layui.config({
                 var index = layer.confirm('确定要关闭吗？', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/TradeRecord/Close?r=" + Math.random(1),
+                        url: "/Admin/SpTradeRecord/Close?r=" + Math.random(1),
                         data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {

wwwroot/layuiadmin/modules_sp/UnBindRecord_Admin.js

@@ -91,18 +91,20 @@ layui.config({
         , url: '/Admin/UnBindRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            // , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'Status', width: 200, title: '状态', sort: true }
+            , { field: 'CreateTime', width: 200, title: '创建时间', sort: true }
             , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
             , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
             , { field: 'MerName', width: 200, title: '商户名称', sort: true }
             , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
             , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
-            , { field: 'UnBindTime', width: 200, title: '解绑时间', sort: true }
+            // , { field: 'UnBindTime', width: 200, title: '解绑时间', sort: true }
             // , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
             , { field: 'AgentNo', width: 200, title: '机构号', sort: true }
 
             // , { 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: {