调整商家管理版块

Areas/Admin/Controllers/MainServer/MerchantInfoController.cs

@@ -57,11 +57,23 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Name", "1"); //名称
             Fields.Add("CreateDate", "3"); //时间
             Fields.Add("Mobile", "1"); //手机号
-            Fields.Add("IsAuth", "1"); //是否认证
-
+            Fields.Add("AlipayPid", "1");
 
             string condition = " and Status>0";
-
+            if(data.Status > 0)
+            {
+                int Status = data.Status;
+                if(Status == 3) Status = 0;
+                if(Status == 4) Status = -1;
+                condition += " and Status=" + Status;
+            }
+            if(data.QueryCount > 0)
+            {
+                int QueryCount = data.QueryCount;
+                if(QueryCount == 3) QueryCount = 0;
+                if(QueryCount == 4) QueryCount = -1;
+                condition += " and QueryCount=" + QueryCount;
+            }
 
             Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantInfo", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -69,6 +81,17 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 dic["IsAuthName"] = dic["IsAuth"].ToString() == "1" ? "是" : "否";
 
+                string Status = dic["Status"].ToString();
+                if(Status == "-1") dic["Status"] = "审核失败";
+                if(Status == "0") dic["Status"] = "待审核";
+                if(Status == "1") dic["Status"] = "待签约";
+                if(Status == "2") dic["Status"] = "已签约";
+                
+                string QueryCount = dic["QueryCount"].ToString();
+                if(QueryCount == "-1") dic["QueryCount"] = "审核失败";
+                if(QueryCount == "0") dic["QueryCount"] = "待审核";
+                if(QueryCount == "1") dic["QueryCount"] = "待签约";
+                if(QueryCount == "2") dic["QueryCount"] = "已签约";
             }
             return Json(obj);
         }
@@ -140,9 +163,11 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
 
-
             MerchantInfo editData = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
             ViewBag.data = editData;
+
+            MerchantAddInfo addData = db.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
+            ViewBag.adddata = addData;
             return View();
         }
 
@@ -155,7 +180,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public string Edit(MerchantInfo data)
+        public string Edit(MerchantInfo data, string AlipayAuthToken)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
 
@@ -172,11 +197,20 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 Fields.Add("LoginPwd", function.MD532(data.LoginPwd)); //登录密码
             }
+            Fields.Add("QueryCount", data.QueryCount);
+            Fields.Add("Status", data.Status);
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
             new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).Edit("MerchantInfo", Fields, data.Id);
+            
+            Dictionary<string, object> addFields = new Dictionary<string, object>();
+            addFields.Add("AlipayAuthToken", AlipayAuthToken);
+            addFields.Add("QueryCount", data.QueryCount);
+            addFields.Add("Status", data.Status);
+            new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).Edit("MerchantAddInfo", addFields, data.Id);
+
             AddSysLog(data.Id.ToString(), "MerchantInfo", "update");
             db.SaveChanges();
 

Areas/Admin/Views/MainServer/MerchantInfo/Edit.cshtml

@@ -1,6 +1,8 @@
 @using MySystem.Models;
-@{MerchantInfo editData = ViewBag.data as MerchantInfo;}
 @{
+    MerchantInfo editData = ViewBag.data as MerchantInfo;
+    MerchantAddInfo addData = ViewBag.adddata as MerchantAddInfo;
+
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     
@@ -27,85 +29,138 @@
             <div class="layui-tab" lay-filter="mytabbar">
                 <ul class="layui-tab-title">
                     <li class="layui-this" lay-id="1">基本信息</li>
+                    <li lay-id="2">支付宝</li>
+                    <li lay-id="3">微信</li>
                 </ul>
                 <div class="layui-tab-content mt20">
                     <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入名称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">手机号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Mobile" name="Mobile" value="@editData.Mobile" maxlength="11" lay-verify="required|" autocomplete="off" placeholder="请输入手机号">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">所在地区</label>
-<input type="hidden" id="Areas" name="Areas" value="@editData.Areas" />
-<div class="layui-input-inline">
-<select id="AreasProvince" lay-search="" lay-filter="AreasProvince">
-<option value="">省</option>
-</select>
-</div>
-<div class="layui-input-inline">
-<select id="AreasCity" lay-search="" lay-filter="AreasCity">
-<option value="">市</option>
-</select>
-</div>
-<div class="layui-input-inline">
-<select id="AreasArea" lay-search="" lay-filter="AreasArea">
-<option value="">县/区</option>
-</select>
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">详细地址</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Address" name="Address" value="@editData.Address" maxlength="100" lay-verify="" autocomplete="off" placeholder="请输入详细地址">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">是否认证</label>
-<div class="layui-input-inline">
-<input type="checkbox" id="IsAuth" name="IsAuth" value="1" @(editData.IsAuth == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">平台总收益</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="TotalAmount" name="TotalAmount" value="@editData.TotalAmount" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入平台总收益">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">累计订单</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="TotalOrder" name="TotalOrder" value="@editData.TotalOrder" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入累计订单">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">累计客户</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="TotalCustomer" name="TotalCustomer" value="@editData.TotalCustomer" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入累计客户">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">会员数</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="TotalUser" name="TotalUser" value="@editData.TotalUser" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入会员数">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">登录密码</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="password" id="LoginPwd" name="LoginPwd" lay-verify="" autocomplete="off" placeholder="请输入登录密码">
-</div>
-</div>
-
-</div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">名称</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name"
+                                    maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入名称">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">手机号</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="Mobile" name="Mobile"
+                                    value="@editData.Mobile" maxlength="11" lay-verify="required|"
+                                    autocomplete="off" placeholder="请输入手机号">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">所在地区</label>
+                            <input type="hidden" id="Areas" name="Areas" value="@editData.Areas" />
+                            <div class="layui-input-inline">
+                                <select id="AreasProvince" lay-search="" lay-filter="AreasProvince">
+                                    <option value="">省</option>
+                                </select>
+                            </div>
+                            <div class="layui-input-inline">
+                                <select id="AreasCity" lay-search="" lay-filter="AreasCity">
+                                    <option value="">市</option>
+                                </select>
+                            </div>
+                            <div class="layui-input-inline">
+                                <select id="AreasArea" lay-search="" lay-filter="AreasArea">
+                                    <option value="">县/区</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">详细地址</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="Address" name="Address"
+                                    value="@editData.Address" maxlength="100" lay-verify="" autocomplete="off"
+                                    placeholder="请输入详细地址">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">是否认证</label>
+                            <div class="layui-input-inline">
+                                <input type="checkbox" id="IsAuth" name="IsAuth" value="1" @(editData.IsAuth == 1 ?
+                                    "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">平台总收益</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="TotalAmount" name="TotalAmount"
+                                    value="@editData.TotalAmount" maxlength="20" lay-verify="" autocomplete="off"
+                                    placeholder="请输入平台总收益">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">累计订单</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="TotalOrder" name="TotalOrder"
+                                    value="@editData.TotalOrder" maxlength="20" lay-verify="" autocomplete="off"
+                                    placeholder="请输入累计订单">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">累计客户</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="TotalCustomer" name="TotalCustomer"
+                                    value="@editData.TotalCustomer" maxlength="20" lay-verify="" autocomplete="off"
+                                    placeholder="请输入累计客户">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">会员数</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="TotalUser" name="TotalUser"
+                                    value="@editData.TotalUser" maxlength="20" lay-verify="" autocomplete="off"
+                                    placeholder="请输入会员数">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">登录密码</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="password" id="LoginPwd" name="LoginPwd"
+                                    lay-verify="" autocomplete="off" placeholder="请输入登录密码">
+                            </div>
+                        </div>
 
+                    </div>
+                    <div class="layui-tab-item layui-show">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">授权Token</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="AlipayAuthToken" name="AlipayAuthToken" value="@addData.AlipayAuthToken"
+                                    maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入授权Token">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-inline">
+                                <select id="QueryCount" name="QueryCount" lay-search="">
+                                    <option value="">请选择</option>
+                                    <option value="-1">审核失败</option>
+                                    <option value="0">待审核</option>
+                                    <option value="1">待签约</option>
+                                    <option value="2">已签约</option>
+                                </select>
+                                <script>$("#QueryCount").val("@editData.QueryCount");</script>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab-item layui-show">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-inline">
+                                <select id="Status" name="Status" lay-search="">
+                                    <option value="">请选择</option>
+                                    <option value="-1">审核失败</option>
+                                    <option value="0">待审核</option>
+                                    <option value="1">待签约</option>
+                                    <option value="2">已签约</option>
+                                </select>
+                                <script>$("#Status").val("@editData.Status");</script>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="layui-form-item layui-hide">

Areas/Admin/Views/MainServer/MerchantInfo/Index.cshtml

@@ -38,30 +38,54 @@
             <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">
-<input class="layui-input" type="text" name="Name" 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="CreateDateData" id="CreateDate" 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" name="Mobile" placeholder="" autocomplete="off">
-</div>
-</div><div class="layui-inline">
-<label class="layui-form-label">是否认证</label>
-<div class="layui-input-inline">
-<select id="IsAuth" name="IsAuth" lay-search="">
-<option value="">全部...</option>
-<option value="1">是</option>
-<option value="0">否</option>
-</select>
-</div>
-</div>
+                        <label class="layui-form-label">名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="Name" 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="CreateDateData" id="CreateDate"
+                                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" name="Mobile" placeholder="" autocomplete="off">
+                        </div>
+                    </div>                    
+                    <div class="layui-inline">
+                        <label class="layui-form-label">支付宝Pid</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="AlipayPid" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">支付宝状态</label>
+                        <div class="layui-input-inline">
+                            <select id="QueryCount" name="QueryCount" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="4">审核失败</option>
+                                <option value="3">待审核</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">
+                            <select id="Status" name="Status" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="4">审核失败</option>
+                                <option value="3">待审核</option>
+                                <option value="1">待签约</option>
+                                <option value="2">已签约</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询

Models/ConsumerOrders.cs

@@ -27,5 +27,7 @@ namespace MySystem.Models
         public int ConsumerId { get; set; }
         public int MerchantId { get; set; }
         public ulong IsAct { get; set; }
+        public int UserId { get; set; }
+        public decimal MerchantActualAmount { get; set; }
     }
 }

Models/MerchantAddInfo.cs

@@ -96,5 +96,12 @@ namespace MySystem.Models
         public string ContactIdNumber { get; set; }
         public string ContactName { get; set; }
         public string BusinessCode { get; set; }
+        public string IdCardAddress { get; set; }
+        public string WeChatRemark { get; set; }
+        public string AlipayRemark { get; set; }
+        public string WeChatSignUrl { get; set; }
+        public string AlipaySignUrl { get; set; }
+        public string AlipayAuthToken { get; set; }
+        public string AlipayPid { get; set; }
     }
 }

Models/MerchantAmountSummay.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class MerchantAmountSummay
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int PayMode { get; set; }
+        public decimal TotalActual { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public int MerchantId { get; set; }
+        public int TradeCount { get; set; }
+        public int IsAct { get; set; }
+    }
+}

Models/MerchantInfo.cs

@@ -38,5 +38,8 @@ namespace MySystem.Models
         public int BindStatus { get; set; }
         public DateTime? ActivationDate { get; set; }
         public int ActivationStatus { get; set; }
+        public decimal TotalActActual { get; set; }
+        public decimal TotalActAmount { get; set; }
+        public int ActStat { get; set; }
     }
 }

Models/PosMerchantInfoBak.cs

@@ -43,5 +43,7 @@ namespace MySystem.Models
         public string MerchantMobile { get; set; }
         public string MerchantName { get; set; }
         public string MerchantNo { get; set; }
+        public int StandardMonths { get; set; }
+        public int StandardStatus { get; set; }
     }
 }

Models/QrCodeAmountSummay.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class QrCodeAmountSummay
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int IsAct { get; set; }
+        public int TradeCount { get; set; }
+        public int PayMode { get; set; }
+        public decimal TotalActual { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public string SnNo { get; set; }
+    }
+}

Models/TradeRecord.cs

@@ -40,5 +40,6 @@ namespace MySystem.Models
         public string ParentNav { get; set; }
         public int PayType { get; set; }
         public int VipFlag { get; set; }
+        public int ActStatus { get; set; }
     }
 }

Models/TradeRecordTest.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class TradeRecordTest
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int MerUserId { get; set; }
+        public int TopUserId { get; set; }
+        public string Remark { get; set; }
+        public int BrandId { get; set; }
+        public ulong DirectFlag { get; set; }
+        public int CapFlag { get; set; }
+        public int QrPayFlag { get; set; }
+        public int BankCardType { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeSerialNo { get; set; }
+        public DateTime? ClearDate { get; set; }
+        public DateTime? TradeDate { get; set; }
+        public string SnNo { get; set; }
+        public int MerBuddyType { get; set; }
+        public int HelpMonthCount { get; set; }
+        public ulong MerHelpFlag { get; set; }
+        public string MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+        public string RecordNo { get; set; }
+    }
+}

Models/UserAmountSummary.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class UserAmountSummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int PayMode { get; set; }
+        public decimal TotalAmount { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        public int UserId { get; set; }
+        public int TradeCount { get; set; }
+        public int IsAct { get; set; }
+    }
+}

Models/WebCMSEntities.cs

@@ -83,6 +83,7 @@ namespace MySystem.Models
         public virtual DbSet<MenuRight> MenuRight { get; set; }
         public virtual DbSet<MerchantAddInfo> MerchantAddInfo { get; set; }
         public virtual DbSet<MerchantAdmin> MerchantAdmin { get; set; }
+        public virtual DbSet<MerchantAmountSummay> MerchantAmountSummay { get; set; }
         public virtual DbSet<MerchantAuth> MerchantAuth { get; set; }
         public virtual DbSet<MerchantClass> MerchantClass { get; set; }
         public virtual DbSet<MerchantCol> MerchantCol { get; set; }
@@ -166,6 +167,7 @@ namespace MySystem.Models
         public virtual DbSet<PullNewAct> PullNewAct { get; set; }
         public virtual DbSet<PullNewDetail> PullNewDetail { get; set; }
         public virtual DbSet<PullnewSummary> PullnewSummary { get; set; }
+        public virtual DbSet<QrCodeAmountSummay> QrCodeAmountSummay { get; set; }
         public virtual DbSet<RecommendDirectUser> RecommendDirectUser { get; set; }
         public virtual DbSet<RecommendTradeSummary> RecommendTradeSummary { get; set; }
         public virtual DbSet<RecycMachineOrder> RecycMachineOrder { get; set; }
@@ -216,10 +218,12 @@ namespace MySystem.Models
         public virtual DbSet<ToChargeBackRecord> ToChargeBackRecord { get; set; }
         public virtual DbSet<TradeDaySummary> TradeDaySummary { get; set; }
         public virtual DbSet<TradeRecord> TradeRecord { get; set; }
+        public virtual DbSet<TradeRecordTest> TradeRecordTest { get; set; }
         public virtual DbSet<UploadParams> UploadParams { get; set; }
         public virtual DbSet<UserAccount> UserAccount { get; set; }
         public virtual DbSet<UserAccountRecord> UserAccountRecord { get; set; }
         public virtual DbSet<UserAddress> UserAddress { get; set; }
+        public virtual DbSet<UserAmountSummary> UserAmountSummary { get; set; }
         public virtual DbSet<UserAuthRecord> UserAuthRecord { get; set; }
         public virtual DbSet<UserBack> UserBack { get; set; }
         public virtual DbSet<UserBackKind> UserBackKind { get; set; }
@@ -2094,6 +2098,9 @@ namespace MySystem.Models
 
             modelBuilder.Entity<ConsumerOrders>(entity =>
             {
+                entity.HasIndex(e => new { e.OrderNo, e.SnNo, e.MerchantId, e.PayMode, e.CreateDate })
+                    .HasName("ConsumerOrdersIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ConsumerId).HasColumnType("int(11)");
@@ -2113,6 +2120,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.MaxDivi).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.MerchantActualAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("商家实收");
+
                 entity.Property(e => e.MerchantId).HasColumnType("int(11)");
 
                 entity.Property(e => e.OrderNo)
@@ -2159,6 +2170,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
@@ -4926,6 +4939,26 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.AlipayAuthToken)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AlipayPid)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AlipayRemark)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AlipaySignUrl)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.AppAppid)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -5062,6 +5095,11 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.IdCardAddress)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IdCardCopy)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -5175,7 +5213,7 @@ namespace MySystem.Models
                 entity.Property(e => e.PeriodEnd).HasColumnType("datetime");
 
                 entity.Property(e => e.QualificationType)
-                    .HasColumnType("varchar(30)")
+                    .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -5288,6 +5326,16 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
 
+                entity.Property(e => e.WeChatRemark)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.WeChatSignUrl)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.WebAppId)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -5396,6 +5444,62 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MerchantAmountSummay>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.IsAct)
+                    .HasColumnType("int(11)")
+                    .HasComment("是否活动");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.PayMode).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TotalActual).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("交易笔数");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<MerchantAuth>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -5820,6 +5924,10 @@ namespace MySystem.Models
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.ActStat)
+                    .HasColumnType("int(11)")
+                    .HasComment("激活统计标记");
+
                 entity.Property(e => e.ActivationDate).HasColumnType("datetime");
 
                 entity.Property(e => e.ActivationStatus).HasColumnType("int(11)");
@@ -5899,6 +6007,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
+                entity.Property(e => e.TotalActActual).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TotalActAmount).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.TotalActual).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");
@@ -8858,6 +8970,9 @@ namespace MySystem.Models
 
             modelBuilder.Entity<PosMerchantInfoBak>(entity =>
             {
+                entity.HasIndex(e => new { e.KqSnNo, e.KqMerNo })
+                    .HasName("PosMerchantInfoBakIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActType).HasColumnType("int(11)");
@@ -8974,6 +9089,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
+                entity.Property(e => e.StandardMonths).HasColumnType("int(11)");
+
+                entity.Property(e => e.StandardStatus).HasColumnType("int(11)");
+
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
                 entity.Property(e => e.TopUserId).HasColumnType("int(11)");
@@ -10011,9 +10130,9 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.DebitAddProfitVal).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.DebitAddProfitVal).HasColumnType("decimal(18,6)");
 
-                entity.Property(e => e.DebitPercents).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.DebitPercents).HasColumnType("decimal(18,6)");
 
                 entity.Property(e => e.KindId).HasColumnType("int(11)");
 
@@ -11544,6 +11663,102 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<QrCodeAmountSummay>(entity =>
+            {
+                entity.HasComment("码牌交易统计");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.IsAct)
+                    .HasColumnType("int(11)")
+                    .HasComment("是否活动");
+
+                entity.Property(e => e.PayMode)
+                    .HasColumnType("int(11)")
+                    .HasComment("支付方式");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(30)")
+                    .HasComment("码牌SN")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TotalActual)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("实际返现金额");
+
+                entity.Property(e => e.TradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("订单金额");
+
+                entity.Property(e => e.TradeCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("交易笔数");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(8)")
+                    .HasComment("日期")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasComment("月份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<RecommendDirectUser>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -14516,6 +14731,8 @@ namespace MySystem.Models
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.ActStatus).HasColumnType("int(11)");
+
                 entity.Property(e => e.BankCardType).HasColumnType("int(11)");
 
                 entity.Property(e => e.BrandId).HasColumnType("int(11)");
@@ -14622,6 +14839,107 @@ namespace MySystem.Models
                 entity.Property(e => e.VipFlag).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<TradeRecordTest>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BankCardType).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CapFlag).HasColumnType("int(11)");
+
+                entity.Property(e => e.ClearDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.DirectFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.HelpMonthCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.MerBuddyType).HasColumnType("int(11)");
+
+                entity.Property(e => e.MerHelpFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QrPayFlag).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.RecordNo)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TopUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeDate).HasColumnType("datetime");
+
+                entity.Property(e => e.TradeSerialNo)
+                    .HasColumnType("varchar(48)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<UploadParams>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -14937,6 +15255,60 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<UserAmountSummary>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.IsAct)
+                    .HasColumnType("int(11)")
+                    .HasComment("是否活动");
+
+                entity.Property(e => e.PayMode).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("交易笔数");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<UserAuthRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");

wwwroot/layuiadmin/modules_main/MerchantInfo_Admin.js

@@ -97,6 +97,11 @@ $('#CreateDate').val(value);
             ,{field:'Mobile', width: 200, title:'手机号', sort: true}
             ,{field:'Areas', width: 200, title:'所在地区', sort: true}
             ,{field:'Address', width: 200, title:'详细地址', sort: true}
+            ,{field:'Status', width: 200, title:'微信状态', sort: true}
+            ,{field:'SubMchid', width: 200, title:'微信商户号', sort: true}
+            ,{field:'QueryCount', width: 200, title:'支付宝状态', sort: true}
+            ,{field:'AlipayPid', width: 200, title:'支付宝Pid', sort: true}
+            ,{field:'AlipayAuthToken', width: 200, title:'支付宝授权Token', sort: true}
             ,{field:'IsAuthName', width: 200, title:'是否认证', sort: true}
             ,{field:'TotalAmount', width: 200, title:'平台总收益', sort: true}
             ,{field:'TotalOrder', width: 200, title:'累计订单', sort: true}