合并

Areas/Admin/Controllers/MainServer/PosCouponsController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具券列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosCoupons data, string CreateDateData, string UseDateData, string UserIdMakerCode, string LeaderIdMakerCode, string ExchangeCode, string IsUseSelect, string IsLockSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosCoupons data, string UseDateData, string UserIdMakerCode, string LeaderIdMakerCode, string ExchangeCode, string IsUseSelect, string IsLockSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -85,13 +85,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and IsLock=" + IsLockSelect;
             }
-            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'";
-            }
 
             if (!string.IsNullOrEmpty(UseDateData))
             {
@@ -122,13 +115,13 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //是否使用
                 int IsUse = int.Parse(dic["IsUse"].ToString());
-                if (IsUse == 0) dic["IsUse"] = "否";
-                if (IsUse == 1) dic["IsUse"] = "是";
+                if (IsUse == 0) dic["IsUseName"] = "否";
+                if (IsUse == 1) dic["IsUseName"] = "是";
 
                 //是否锁定
                 int IsLock = int.Parse(dic["IsLock"].ToString());
-                if (IsLock == 0) dic["IsLock"] = "否";
-                if (IsLock == 1) dic["IsLock"] = "是";
+                if (IsLock == 0) dic["IsLockName"] = "否";
+                if (IsLock == 1) dic["IsLockName"] = "是";
 
             }
             return Json(obj);

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -162,7 +162,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (LeaderUserId != 0)
                 {
                     Users users = db.Users.FirstOrDefault(m => m.Id == LeaderUserId) ?? new Users();
-                    dic["UserInfo"] = users.MakerCode + "<br />" + users.RealName;
+                    dic["UserInfo"] = users.MakerCode + "_" + users.RealName;
                 }
 
                 //是否为第一台机具
@@ -476,7 +476,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesTwo", Fields, "Id desc", "0", 1, 20000, condition, "BindingState,ActivationState,UserId,StoreId,PosSn,BrandId,ActivityList,BindMerchantId,PosSnType,DeviceType", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesTwo", Fields, "Id desc", "0", 1, 20000, condition, "BindingState,ActivationState,UserId,StoreId,PosSn,BrandId,ActivityList,BindMerchantId,PosSnType,DeviceType,BindingTime,ActivationTime,TransferTime", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -484,10 +484,17 @@ namespace MySystem.Areas.Admin.Controllers
                 int BindingState = int.Parse(dic["BindingState"].ToString());
                 if (BindingState == 0) dic["BindingState"] = "未绑定";
                 if (BindingState == 1) dic["BindingState"] = "已绑定";
+                //绑定时间
+                DateTime BindingTime = Convert.ToDateTime(dic["BindingTime"].ToString());
                 //激活状态
                 int ActivationState = int.Parse(dic["ActivationState"].ToString());
                 if (ActivationState == 0) dic["ActivationState"] = "未激活";
                 if (ActivationState == 1) dic["ActivationState"] = "已激活";
+                //激活时间
+                DateTime ActivationTime = Convert.ToDateTime(dic["ActivationTime"].ToString());
+
+                //划拨时间
+                DateTime TransferTime = Convert.ToDateTime(dic["TransferTime"].ToString());
                 //所属创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -539,7 +546,10 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("BindMerchantIdMerchantName", "绑定商户姓名");
             ReturnFields.Add("DeviceType", "设备类型");
             ReturnFields.Add("BindingState", "绑定状态");
+            ReturnFields.Add("BindingTime", "绑定时间");
             ReturnFields.Add("ActivationState", "激活状态");
+            ReturnFields.Add("ActivationTime", "激活时间");
+            ReturnFields.Add("TransferTime", "划拨时间");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "PosMachinesTwo", "ExportExcel");

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
             //身份证号
             if (!string.IsNullOrEmpty(MerIdcardNo))
             {
-                condition += " and MerchantName like '%" + MerIdcardNo + "%'";
+                condition += " and MerIdcardNo like '%" + MerIdcardNo + "%'";
             }
             //商户姓名
             if (!string.IsNullOrEmpty(MerchantName))

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -240,15 +240,15 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         if (IsSend == 1)
                         {
-                            // RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
-                            // {
-                            //     UserId = pos.UserId, //接收创客
-                            //     MsgType = 2,
-                            //     Title = "补录成功通知", //标题
-                            //     Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已经成功补录，请查收。",
-                            //     CreateDate = DateTime.Now,
-
-                            // }));
+                            RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                            {
+                                UserId = pos.BuyUserId, //接收创客
+                                MsgType = 2,
+                                Title = "补录成功通知", //标题
+                                Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已经成功补录，请查收。",
+                                CreateDate = DateTime.Now,
+
+                            }));
                         }
                         return "激活奖励已补录";
                     }
@@ -808,15 +808,14 @@ namespace MySystem.Areas.Admin.Controllers
                 pos.BindMerchantId = merchant.Id;
                 if (IsSend == 1)
                 {
-                    // RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
-                    // {
-                    //     UserId = pos.UserId, //接收创客
-                    //     MsgType = 2,
-                    //     Title = "商户型代理设置成功", //标题
-                    //     Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已经成功给下级代理" + user.RealName + "" + MakerCode + "，设置为商户型代理，设置成功后的新增交易的分润归商户型代理所有",
-                    //     CreateDate = DateTime.Now,
-
-                    // }));
+                    RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                    {
+                        UserId = pos.BuyUserId, //接收创客
+                        MsgType = 2,
+                        Title = "商户型代理设置成功", //标题
+                        Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已经成功给下级代理" + user.RealName + "" + MakerCode + "，设置为商户型代理，设置成功后的新增交易的分润归商户型代理所有",
+                        CreateDate = DateTime.Now,
+                    }));
                 }
             }
             user.MerchantType = 1;
@@ -1354,15 +1353,15 @@ namespace MySystem.Areas.Admin.Controllers
             db.Dispose();
             if (IsSend == 1)
             {
-                // RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
-                // {
-                //     UserId = pos.UserId, //接收创客
-                //     MsgType = 2,
-                //     Title = "换绑成功通知", //标题
-                //     Summary = "您的 " + oldPosBrand.Name + " SN:" + OldSn + "已经成功为客户换绑为" + newPosBrand.Name + "SN:" + NewSn + "请告知客户进行绑定。",
-                //     CreateDate = DateTime.Now,
+                RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                {
+                    UserId = pos.BuyUserId, //接收创客
+                    MsgType = 2,
+                    Title = "换绑成功通知", //标题
+                    Summary = "您的 " + oldPosBrand.Name + " SN:" + OldSn + "已经成功为客户换绑为" + newPosBrand.Name + "SN:" + NewSn + "请告知客户进行绑定。",
+                    CreateDate = DateTime.Now,
 
-                // }));
+                }));
             }
             return "success";
         }
@@ -1460,15 +1459,14 @@ namespace MySystem.Areas.Admin.Controllers
             PublicFunction.SycnMachineCount(pos.BuyUserId, pos.BrandId);
             if (IsSend == 1)
             {
-                // RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
-                // {
-                //     UserId = pos.UserId, //接收创客
-                //     MsgType = 2,
-                //     Title = "解绑成功通知", //标题
-                //     Summary = "" + PosSn + "机具已成功解绑，当前机具如需绑定同一客户请再2个工作日后再进行绑定，直接绑定会导致数控异常，相关损失由您本人承担。",
-                //     CreateDate = DateTime.Now,
-
-                // }));
+                RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                {
+                    UserId = pos.BuyUserId, //接收创客
+                    MsgType = 2,
+                    Title = "解绑成功通知", //标题
+                    Summary = "" + PosSn + "机具已成功解绑，当前机具如需绑定同一客户请再2个工作日后再进行绑定，直接绑定会导致数控异常，相关损失由您本人承担。",
+                    CreateDate = DateTime.Now,
+                }));
             }
             return "success";
         }

Areas/Admin/Controllers/MainServer/UserAccountController.cs

@@ -271,6 +271,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("UserId", data.UserId); //创客
             Fields.Add("AccountStatus", 1); //账户状态
+            Fields.Add("UpdateMan", SysUserName + '-' + SysRealName + "操作冻结该账户"); //操作人信息
             Fields.Add("SeoDescription", data.SeoDescription); //冻结备注
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccount", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "UserAccount", "CloseRemark");

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -127,14 +127,15 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             
-            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount31 = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=31, ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
+            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount5 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount31 = "0.00";
+            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=31, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
             DataTable dts = OtherMySqlConn.dtable("select SUM(FluxProfitAmt) from FluxProfitDetail where ");
             if(dt.Rows.Count > 0)
             {
                 ChangeTypeAmount0 = dt.Rows[0][0].ToString();
                 ChangeTypeAmount1 = dt.Rows[0][1].ToString();
                 ChangeTypeAmount2 = dt.Rows[0][2].ToString();
+                ChangeTypeAmount5 = dt.Rows[0][13].ToString();
                 ChangeTypeAmount6 = dt.Rows[0][3].ToString();
                 ChangeTypeAmount61 = dt.Rows[0][4].ToString();
                 ChangeTypeAmount62 = dt.Rows[0][5].ToString();
@@ -149,6 +150,7 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("ChangeTypeAmount0", ChangeTypeAmount0); //激活奖励
             other.Add("ChangeTypeAmount1", ChangeTypeAmount1); //交易分润
             other.Add("ChangeTypeAmount2", ChangeTypeAmount2); //提现申请
+            other.Add("ChangeTypeAmount5", ChangeTypeAmount5); //提现税点扣除
             other.Add("ChangeTypeAmount6", ChangeTypeAmount6); //提现失败，解冻
             other.Add("ChangeTypeAmount61", ChangeTypeAmount61); //人工冻结
             other.Add("ChangeTypeAmount62", ChangeTypeAmount62); //人工解冻

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

@@ -44,13 +44,6 @@
         <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">
-                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
-                            autocomplete="off">
-                        </div>
-                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">使用时间</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/MainServer/StoreHouseAmountPromiss/Add.cshtml

@@ -57,7 +57,7 @@
                                 <div class="layui-input-block">
                                     <textarea class="layui-textarea" id="SeoDescription" name="SeoDescription"
                                         maxlength="128" lay-verify=""
-                                        placeholder="请输入账户冻结备注"></textarea>
+                                        placeholder="请输入担保备注"></textarea>
                                 </div>
                             </div>
 

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

@@ -1,77 +1,114 @@
 @using MySystem.Models;
-@{StoreHouseAmountPromiss editData = ViewBag.data as StoreHouseAmountPromiss;}
+@{
+    StoreHouseAmountPromiss editData = ViewBag.data as StoreHouseAmountPromiss;
+}
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>分仓额度担保记录(修改)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
         <input type="hidden" name="Id" value="@editData.Id" />
-        
+
         <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本信息</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-@{Dictionary<string, string> UsersDic = new MySystem.DictionaryClass().getUsersDic();}
-<div class="layui-form-item">
-<label class="layui-form-label">担保人</label>
-<div class="layui-input-inline">
-<select id="FromUserId" name="FromUserId" lay-search="">
-<option value="">请选择</option>
-@foreach (string key in UsersDic.Keys)
-{
-<option value="@key">@UsersDic[key]</option>
-}
-</select>
-<script>$("#FromUserId").val("@editData.FromUserId");</script>
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">担保对象</label>
-<div class="layui-input-inline">
-<select id="ToUserId" name="ToUserId" lay-search="">
-<option value="">请选择</option>
-@foreach (string key in UsersDic.Keys)
-{
-<option value="@key">@UsersDic[key]</option>
-}
-</select>
-<script>$("#ToUserId").val("@editData.ToUserId");</script>
-</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="PromissAmount" name="PromissAmount" value="@editData.PromissAmount" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入担保金额">
-</div>
-</div>
-
-</div>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <ul class="layui-tab-title">
+                        <li class="layui-this" lay-id="1">基本信息</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="FromUserId" name="FromUserId" value="@editData.FromUserId"
+                                        maxlength="30" l 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="ToUserId" name="ToUserId" maxlength="30" value="@editData.ToUserId"
+                                         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="PromissAmount" name="PromissAmount" value="@editData.PromissAmount"
+                                        maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入担保金额">
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">备注</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="SeoDescription" name="SeoDescription"
+                                        maxlength="128" lay-verify=""
+                                        placeholder="请输入担保备注"></textarea>
+                                </div>
+                            </div>
+                            @* <div class="layui-form-item">
+                                <label class="layui-form-label">担保人</label>
+                                <div class="layui-input-inline">
+                                    <select id="FromUserId" name="FromUserId" lay-search="">
+                                        <option value="">请选择</option>
+                                        @foreach (string key in UsersDic.Keys)
+                                        {
+                                            <option value="@key">@UsersDic[key]</option>
+                                        }
+                                    </select>
+                                    <script>$("#FromUserId").val("@editData.FromUserId");</script>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">担保对象</label>
+                                <div class="layui-input-inline">
+                                    <select id="ToUserId" name="ToUserId" lay-search="">
+                                        <option value="">请选择</option>
+                                        @foreach (string key in UsersDic.Keys)
+                                        {
+                                            <option value="@key">@UsersDic[key]</option>
+                                        }
+                                    </select>
+                                    <script>$("#ToUserId").val("@editData.ToUserId");</script>
+                                </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="PromissAmount" name="PromissAmount"
+                                        value="@editData.PromissAmount" maxlength="20" lay-verify="" autocomplete="off"
+                                        placeholder="请输入担保金额">
+                                </div>
+                            </div> *@
+
+                        </div>
 
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
                 </div>
             </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
         </div>
     </div>
 
@@ -80,11 +117,11 @@
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
-        
-        
+
+
         //编辑器
         KindEditor.ready(function (K) {
-            
+
         });
 
         var ids = "";
@@ -209,30 +246,31 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
             element.on('tab(test)', function (elem) {
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
-    
+
             //日期
-            
+
 
             //上传文件
-            
+
 
             //穿梭框
-            
+
 
             //TreeView，比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

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

@@ -143,7 +143,7 @@
                 <blockquote class="layui-elem-quote layui-text">
                     激活奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount0">0.00</span>　|　交易分润(元)：<span style="color: #f00;" id="ChangeTypeAmount1">0.00</span>　|　创客开机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount50">0.00</span>　|　分润补贴(元)：<span style="color: #f00;" id="ChangeTypeAmount111">0.00</span>　| 直推奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount112">0.00</span>　|　流量卡分佣(元)：<span style="color: #f00;" id="ChangeTypeAmount60">0.00</span>　|　红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31">0.00</span>
                     <br />
-                    提现申请(元)：<span style="color: #f00;" id="ChangeTypeAmount2">0.00</span>　|　提现失败，解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount6">0.00</span>　|　人工冻结(元)：<span style="color: #f00;" id="ChangeTypeAmount61">0.00</span>　| 人工解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount62">0.00</span>　| 人工扣减(元)：<span style="color: #f00;" id="ChangeTypeAmount63">0.00</span>　|　人工增加(元)：<span style="color: #f00;" id="ChangeTypeAmount64">0.00</span>
+                    提现申请(元)：<span style="color: #f00;" id="ChangeTypeAmount2">0.00</span>　|　提现失败，解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount6">0.00</span>　|　人工冻结(元)：<span style="color: #f00;" id="ChangeTypeAmount61">0.00</span>　| 人工解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount62">0.00</span>　| 人工扣减(元)：<span style="color: #f00;" id="ChangeTypeAmount63">0.00</span>　|　人工增加(元)：<span style="color: #f00;" id="ChangeTypeAmount64">0.00</span>　|　提现税点扣除(元)：<span style="color: #f00;" id="ChangeTypeAmount5">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">

wwwroot/layuiadmin/modules_main/PosCoupons_Admin.js

@@ -123,7 +123,6 @@ layui.config({
             , { field: 'UserIdRealName', width: 200, title: '创客真实姓名', sort: true }
             , { field: 'LeaderUserIdMakerCode', width: 200, title: '盟主编号', sort: true }
             , { field: 'LeaderUserIdRealName', width: 200, title: '盟主真实姓名', sort: true }
-            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'ExchangeCode', width: 200, title: '兑换码', sort: true }
             , { field: 'IsUseName', width: 200, title: '是否使用', sort: true }
             , { field: 'IsLockName', width: 200, title: '是否锁定', sort: true }

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -135,6 +135,7 @@ layui.config({
             ,{ field: 'ActivationState', width: 200, title: '激活状态', sort: true }
             ,{ field: 'ActivationTime', width: 200, title: '激活时间', sort: true }
             ,{ field: 'BindingTime', width: 200, title: '绑定时间', sort: true }
+            ,{ field: 'TransferTime', width: 200, title: '划拨时间', sort: true }
             ,{ field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
             ,{ field: 'IsFirst', width: 200, title: '是否第一台机具', sort: true }
             ,{ field: 'SeoKeyword', width: 200, title: '押金金额', sort: true }

wwwroot/layuiadmin/modules_main/UserAccountRecord_Admin.js

@@ -119,6 +119,7 @@ $('#CreateDate').val(value);
             $("#ChangeTypeAmount0").text(res.other.ChangeTypeAmount0);
             $("#ChangeTypeAmount1").text(res.other.ChangeTypeAmount1);
             $("#ChangeTypeAmount2").text(res.other.ChangeTypeAmount2);
+            $("#ChangeTypeAmount5").text(res.other.ChangeTypeAmount5);
             $("#ChangeTypeAmount6").text(res.other.ChangeTypeAmount6);
             $("#ChangeTypeAmount61").text(res.other.ChangeTypeAmount61);
             $("#ChangeTypeAmount62").text(res.other.ChangeTypeAmount62);

wwwroot/layuiadmin/modules_main/UserAccount_Admin.js

@@ -110,6 +110,7 @@ layui.config({
                 { field: 'SeoDescription', width: 100, title: '备注' ,sort: true},
                 // { field: 'CreateDate', width: 200, title: '创建时间' ,sort: true},
                 { field: 'UpdateDate', width: 160, title: '冻结/解冻时间' ,sort: true},
+                { field: 'UpdateMan', width: 160, title: '操作信息' ,sort: true},
                 {
                     title: '操作',
                     width: 400,