Merge branch 'feature-dgy-功能优化' into feature-dgy-后台测试

# Conflicts:
#	Startup.cs

AppStart/Helper/GetRadioCardInfoService.cs

@@ -48,7 +48,7 @@ public class GetRadioCardInfoService
                 string queryBeginTime = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"); //工号开通时间，开始时间。格式：yyyy-MM-dd
                 string queryEndTime = DateTime.Now.ToString("yyyy-MM-dd"); //工号开通时间，结束时间。格式：yyyy-MM-dd
                 string pageNo = "1"; //当前页
-                string pageSize = "100"; //每页大小
+                string pageSize = "99999"; //每页大小
                 string timestamp = function.getTimeStamp(); //时间戳，精确到秒。签名用参数
                 SortedList<string, string> req = new SortedList<string, string>();
                 req.Add("queryBeginTime", queryBeginTime);
@@ -66,6 +66,7 @@ public class GetRadioCardInfoService
                 string reqUrl = host + "/ycsim-business/openapi/query_marketers_info";
                 function.WriteLog("请求地址\n" + reqUrl, "广电卡查询开通工号数据");
                 string result = function.PostWebRequest(reqUrl, reqstr, "application/json");
+                result = result.Replace("null", "\"\"");
                 function.WriteLog("响应数据\n" + result, "广电卡查询开通工号数据");
 
                 JsonData jsonObj = JsonMapper.ToObject(result);
@@ -78,20 +79,20 @@ public class GetRadioCardInfoService
                         var radioCardInfo = db.RadioCardInfo.FirstOrDefault(m => m.IdNo == IdNo) ?? new RadioCardInfo();
                         if (string.IsNullOrEmpty(radioCardInfo.JobId))
                         {
-                            radioCardInfo.JobId = function.CheckNull(data[i]["jobId"].ToString()); //行销宝工号
-                            radioCardInfo.JobStatus = function.CheckNull(data[i]["status"].ToString()); //工号状态
-                            radioCardInfo.OprName = function.CheckNull(data[i]["oprName"].ToString()); //人员姓名
-                            radioCardInfo.Mobile = function.CheckNull(data[i]["mobile"].ToString()); //广电手机号
-                            radioCardInfo.IdNo = function.CheckNull(data[i]["idNo"].ToString()); //身份证号
-                            radioCardInfo.Gender = function.CheckNull(data[i]["gender"].ToString()); //性别
-                            radioCardInfo.Role = function.CheckNull(data[i]["role"].ToString()); //角色
-                            radioCardInfo.ChannelCode = function.CheckNull(data[i]["channelCode"].ToString()); //归属社招渠道编码
-                            radioCardInfo.ChannelName = function.CheckNull(data[i]["channelName"].ToString()); //归属社招渠道名称
-                            radioCardInfo.ProvincialCompany = function.CheckNull(data[i]["provincialCompany"].ToString()); //归属省公司
-                            radioCardInfo.OprInviteCode = function.CheckNull(data[i]["oprInviteCode"].ToString()); //邀请码
-                            radioCardInfo.OpenTime = function.CheckNull(data[i]["openTime"].ToString()); //开通时间
-                            radioCardInfo.BrhName = function.CheckNull(data[i]["brhName"].ToString()); //机构名称
-                            radioCardInfo.BrhUserId = function.CheckNull(data[i]["brhUserId"].ToString()); //机构用户编码
+                            radioCardInfo.JobId = data[i]["jobId"].ToString(); //行销宝工号
+                            radioCardInfo.JobStatus = data[i]["status"].ToString(); //工号状态
+                            radioCardInfo.OprName = data[i]["oprName"].ToString(); //人员姓名
+                            radioCardInfo.Mobile = data[i]["mobile"].ToString(); //广电手机号
+                            radioCardInfo.IdNo = data[i]["idNo"].ToString(); //身份证号
+                            radioCardInfo.Gender = data[i]["gender"].ToString(); //性别
+                            radioCardInfo.Role = data[i]["role"].ToString(); //角色
+                            radioCardInfo.ChannelCode = data[i]["channelCode"].ToString(); //归属社招渠道编码
+                            radioCardInfo.ChannelName = data[i]["channelName"].ToString(); //归属社招渠道名称
+                            radioCardInfo.ProvincialCompany = data[i]["provincialCompany"].ToString(); //归属省公司
+                            radioCardInfo.OprInviteCode = data[i]["oprInviteCode"].ToString(); //邀请码
+                            radioCardInfo.OpenTime = data[i]["openTime"].ToString(); //开通时间
+                            radioCardInfo.BrhName = data[i]["brhName"].ToString(); //机构名称
+                            // radioCardInfo.BrhUserId = data[i]["brhUserId"].ToString(); //机构用户编码
                             radioCardInfo.UpdateDate = DateTime.Now; //更新时间
                         }
                     }

AppStart/Helper/SIMPosMerchantTradeService.cs

@@ -6,6 +6,7 @@ using Library;
 using MySystem.Models;
 using System.Collections.Generic;
 using LitJson;
+using Newtonsoft.Json;
 
 /// <summary>
 /// 广电卡交易数据导入
@@ -25,9 +26,9 @@ namespace MySystem
             thread.IsBackground = true;
             thread.Start();
 
-            // Thread thread1 = new Thread(SIMActDo); // 通过接口获取广电卡激活数据
-            // thread1.IsBackground = true;
-            // thread1.Start();
+            Thread thread1 = new Thread(SIMActDo); // 通过接口获取广电卡激活数据
+            thread1.IsBackground = true;
+            thread1.Start();
         }
 
         public void ImportPostDo()
@@ -164,7 +165,6 @@ namespace MySystem
                                         };
 
                                         AddSIMTradeInfo(sIMTradeInfo);
-
                                         SuccessCount += 1;
                                     }
                                     DoCount += Size;
@@ -213,21 +213,26 @@ namespace MySystem
         {
             while (true)
             {
-                if (DateTime.Now.Hour > 16 && DateTime.Now.Hour < 18)
+                string Info = RedisDbconn.Instance.RPop<string>("SIMActInfo");
+                if (!string.IsNullOrEmpty(Info))
                 {
                     try
                     {
-                        var time = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+                        var time = function.ReadInstance("/GetSIMActInfo/LastDate.txt");
+                        if(string.IsNullOrEmpty(time))
+                        {
+                            time = "2024-03-18";
+                        }
                         string check = function.ReadInstance("/GetSIMActInfo/check" + time + ".txt");
                         if (string.IsNullOrEmpty(check))
                         {
-                            // function.WritePage("/GetSIMActInfo/", "check" + time + ".txt", DateTime.Now.ToString("HH:mm:ss"));
+                            function.WritePage("/GetSIMActInfo/", "check" + time + ".txt", DateTime.Now.ToString("HH:mm:ss"));
                             var result = RadioCardHelper.Instance.QueryCardOrderInfo(time, time, "1", "99999");
+                            result = result.Replace("null", "\"\"");
                             JsonData jsonObj = JsonMapper.ToObject(result);
                             if (jsonObj["resultCode"].ToString() == "1")
                             {
                                 SpModels.WebCMSEntities spdb = new SpModels.WebCMSEntities();
-                                var tran = spdb.Database.BeginTransaction();
                                 var data = jsonObj["data"]["records"];
                                 for (int i = 0; i < data.Count; i++)
                                 {
@@ -240,61 +245,39 @@ namespace MySystem
 
                                         SIMActInfo sIMActInfo = new SIMActInfo
                                         {
-                                            OrderNo = function.CheckNull(data[i]["orderNo"].ToString()), //订单编码
-                                            CreateDate = function.CheckNull(data[i]["orderCreateTime"].ToString()), //订单创建时间
-                                            PhoneNumber = function.CheckNull(data[i]["phoneNo"].ToString()), //选择号码
-                                            HasFirstCharge = function.CheckNull(data[i]["firstCharge"].ToString()), //是否有首充
-                                            FirstChargeAmount = function.CheckNull(data[i]["initialChargeAmount"].ToString()), //首充金额（元）
-                                            Province = function.CheckNull(data[i]["province"].ToString()), //号码归属省份
-                                            City = function.CheckNull(data[i]["city"].ToString()), //号码归属地市
-                                            ProductName = function.CheckNull(data[i]["productName"].ToString()), //商品名称
-                                            ActiveName = function.CheckNull(data[i]["promotionName"].ToString()), //促销活动名称
-                                            ProductType = function.CheckNull(data[i]["productTypeName"].ToString()), //商品类型名称
-                                            ActualAmount = function.CheckNull(data[i]["paidInAmount"].ToString()), //实付金额(元)
-                                            OrderStatus = function.CheckNull(data[i]["orderStatus"].ToString()), //订单状态
-                                            ActStatus = function.CheckNull(data[i]["activationStatusName"].ToString()), //激活状态名称
-                                            ActDate = function.CheckNull(data[i]["activationTime"].ToString()), //激活时间
-                                            WorkNo = function.CheckNull(data[i]["jobId"].ToString()), //BOSS员工工号
+                                            OrderNo = data[i]["orderNo"].ToString(), //订单编码
+                                            CreateDate = data[i]["orderCreateTime"].ToString(), //订单创建时间
+                                            PhoneNumber = data[i]["phoneNo"].ToString(), //选择号码
+                                            HasFirstCharge = data[i]["firstCharge"].ToString(), //是否有首充
+                                            FirstChargeAmount = data[i]["initialChargeAmount"].ToString(), //首充金额（元）
+                                            Province = data[i]["province"].ToString(), //号码归属省份
+                                            City = data[i]["city"].ToString(), //号码归属地市
+                                            ProductName = data[i]["productName"].ToString(), //商品名称
+                                            ActiveName = data[i]["promotionName"].ToString(), //促销活动名称
+                                            ProductType = data[i]["productTypeName"].ToString(), //商品类型名称
+                                            ActualAmount = data[i]["paidInAmount"].ToString(), //实付金额(元)
+                                            OrderStatus = data[i]["orderStatus"].ToString(), //订单状态
+                                            ActStatus = data[i]["activationStatusName"].ToString(), //激活状态名称
+                                            ActDate = data[i]["activationTime"].ToString(), //激活时间
+                                            WorkNo = data[i]["jobId"].ToString(), //BOSS员工工号
                                             // sIMActInfo.AccountName = data[""].ToString(); //账号姓名
                                             AccountName = "", //账号姓名
                                             SimNo = iccId //SIM卡号
                                         };
 
-                                        // SIMActInfo sIMActInfo = new SIMActInfo();
-                                        // sIMActInfo.OrderNo = function.CheckNull(data[i]["orderNo"].ToString()); //订单编码
-                                        // sIMActInfo.CreateDate = function.CheckNull(data[i]["orderCreateTime"].ToString()); //订单创建时间
-                                        // sIMActInfo.PhoneNumber = function.CheckNull(data[i]["phoneNo"].ToString()); //选择号码
-                                        // sIMActInfo.HasFirstCharge = function.CheckNull(data[i]["firstCharge"].ToString()); //是否有首充
-                                        // sIMActInfo.FirstChargeAmount = function.CheckNull(data[i]["initialChargeAmount"].ToString()); //首充金额（元）
-                                        // sIMActInfo.Province = function.CheckNull(data[i]["province"].ToString()); //号码归属省份
-                                        // sIMActInfo.City = function.CheckNull(data[i]["city"].ToString()); //号码归属地市
-                                        // sIMActInfo.ProductName = function.CheckNull(data[i]["productName"].ToString()); //商品名称
-                                        // sIMActInfo.ActiveName = function.CheckNull(data[i]["promotionName"].ToString()); //促销活动名称
-
-                                        // sIMActInfo.ProductType = function.CheckNull(data[i]["productTypeName"].ToString()); //商品类型名称
-
-                                        // sIMActInfo.ActualAmount = function.CheckNull(data[i]["paidInAmount"].ToString()); //实付金额(元)
-                                        // sIMActInfo.OrderStatus = function.CheckNull(data[i]["orderStatus"].ToString()); //订单状态
-                                        // sIMActInfo.ActStatus = function.CheckNull(data[i]["activationStatusName"].ToString()); //激活状态名称
-                                        // sIMActInfo.ActDate = function.CheckNull(data[i]["activationTime"].ToString()); //激活时间
-                                        // sIMActInfo.WorkNo = function.CheckNull(data[i]["jobId"].ToString()); //BOSS员工工号
-                                        // // sIMActInfo.AccountName = data[""].ToString(); //账号姓名
-                                        // sIMActInfo.AccountName = ""; //账号姓名
-                                        // sIMActInfo.SimNo = iccId; //SIM卡号
-
                                         AddSIMActInfo(sIMActInfo);
                                     }
                                 }
-                                tran.Dispose();
                             }
                         }
+                        function.WritePage("/GetSIMActInfo/", "LastDate.txt", DateTime.Now.ToString("yyyy-MM-dd"));
                     }
                     catch (Exception ex)
                     {
                         function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "获取广电卡激活信息队列异常");
                     }
                 }
-                Thread.Sleep(600000);
+                Thread.Sleep(6000);
             }
         }
 

AppStart/Redis/CustomRedisDbconn.cs

@@ -11,9 +11,8 @@ namespace MySystem
     public class CustomRedisDbconn
     {
         public CSRedis.CSRedisClient csredis;
-        public CustomRedisDbconn(string key, int Database = 0)
+        public CustomRedisDbconn(string connstr, int Database = 0)
         {
-            string connstr = Library.ConfigurationManager.AppSettings[key].ToString();
             csredis = new CSRedis.CSRedisClient(connstr);
         }
 

Areas/Admin/Controllers/MainServer/CustomQueryController.cs

@@ -492,7 +492,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + sql + "\",\"FileName\":\"执行\",\"MaxCount\":\"50\",\"ConnectStr\":\"" + ConnectStr + "\"}";
                 RedisDbconn.Instance.AddList("ExportQueue", SendData);
             }
-            else if(item.ExcuteFlag == 2)
+            else if(item.ExcuteFlag == 3)
             {
                 string redisCommand = sql;
                 string[] redisCommandList = redisCommand.Split(' ');
@@ -507,11 +507,11 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     new CustomRedisDbconn(ConnectStr).Set(key, val);
                 }
-                else if(kind == "set")
+                else if(kind == "addint")
                 {
                     new CustomRedisDbconn(ConnectStr).AddInt(key, int.Parse(val));
                 }
-                else if(kind == "set")
+                else if(kind == "addnum")
                 {
                     new CustomRedisDbconn(ConnectStr).AddNumber(key, decimal.Parse(val));
                 }

Areas/Admin/Controllers/MainServer/CustomQueryDoController.cs

@@ -148,15 +148,15 @@ namespace MySystem.Areas.Admin.Controllers
                         if(!string.IsNullOrEmpty(sub.DataKey))
                         {
                             string[] TextFields = sub.DataText.Split(',');
-                            Dictionary<string, string> vals = new Dictionary<string, string>();
                             foreach(DataRow dr in dtsub.Rows)
                             {
-                                foreach(string key in TextFields)
+                                Dictionary<string, string> vals = new Dictionary<string, string>();
+                                foreach (string key in TextFields)
                                 {
                                     vals.Add(key, dr[key].ToString());
                                 }
+                                dicValsJson.Add(sub.Alias + "." + dr[sub.DataKey].ToString(), vals);
                             }
-                            dicValsJson.Add(sub.Alias + "." + sub.DataKey, vals);
                         }
                         else
                         {
@@ -208,13 +208,16 @@ namespace MySystem.Areas.Admin.Controllers
             foreach(Match m in mc)
             {
                 string fieldName = m.Value.Replace("#{", "").Replace("}#", "");
-                if(dicVals.ContainsKey(fieldName))
+                if(!fieldName.Contains("."))
                 {
-                    sql = sql.Replace(m.Value, dicVals[fieldName]);
-                }
-                else
-                {
-                    sql = sql.Replace(m.Value, "");
+                    if(dicVals.ContainsKey(fieldName))
+                    {
+                        sql = sql.Replace(m.Value, dicVals[fieldName]);
+                    }
+                    else
+                    {
+                        sql = sql.Replace(m.Value, "");
+                    }
                 }
             }
             mc = Regex.Matches(sql, @"\$\replace{.*?\}\$");
@@ -284,7 +287,7 @@ namespace MySystem.Areas.Admin.Controllers
                         Dictionary<string, string> row = new Dictionary<string, string>();
                         foreach(string ColumnName in dr.Keys)
                         {
-                            Match m = Regex.Match(dr[ColumnName], @"\#\{.*?\}\#");
+                            Match m = Regex.Match(function.CheckNull(dr[ColumnName]), @"\#\{.*?\}\#");
                             if(m.Success)
                             {
                                 string fieldName = m.Value.Replace("#{", "").Replace("}#", "");
@@ -328,7 +331,7 @@ namespace MySystem.Areas.Admin.Controllers
                 else if (kind == "get")
                 {
                     Dictionary<string, string> row = new Dictionary<string, string>();
-                    row.Add("值", new CustomRedisDbconn(ConnectStr).Get<string>(key));
+                    row.Add("值", function.CheckNull(new CustomRedisDbconn(ConnectStr).Get<string>(key)));
                     diclist.Add(row);
                 }
             }
@@ -443,7 +446,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 SubSqlString = ",\"SubSqlString\":" + Newtonsoft.Json.JsonConvert.SerializeObject(subJson);
             }
-            string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"" + SubSqlString + "}";
+            string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + sql + "\",\"ConnectStr\":\"" + item.DatabaseConnect + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"" + SubSqlString + "}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
             return "success";
         }

Areas/Admin/Controllers/MainServer/CustomQuerySubController.cs

@@ -111,6 +111,8 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Kind", data.Kind); //类型
             Fields.Add("Alias", data.Alias); //别名
             Fields.Add("DatabaseConnect", data.DatabaseConnect); //数据库
+            Fields.Add("DataKey", data.DataKey); //字典key
+            Fields.Add("DataText", data.DataText); //字典key
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
@@ -162,6 +164,8 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Kind", data.Kind); //类型
             Fields.Add("Alias", data.Alias); //别名
             Fields.Add("DatabaseConnect", data.DatabaseConnect); //数据库
+            Fields.Add("DataKey", data.DataKey); //字典key
+            Fields.Add("DataText", data.DataText); //字典key
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -190,6 +190,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ChargeAmount", data.ChargeAmount); //待扣金额
             Fields.Add("ChargeType", 1); //待扣类型
             Fields.Add("Kind", data.Kind); //待扣别
+            Fields.Add("Status", 3); //状态
             Fields.Add("Remark", data.Remark); //备注
             Fields.Add("Field1", data.Field1); //备用字段
 
@@ -455,6 +456,9 @@ namespace MySystem.Areas.Admin.Controllers
                 string Amount = itemJson.Contains("\"C\"") ? dr["C"].ToString() : "";
                 string Remark = itemJson.Contains("\"D\"") ? dr["D"].ToString() : "";
                 string KindName = itemJson.Contains("\"E\"") ? dr["E"].ToString() : "";
+                string StatusName = itemJson.Contains("\"F\"") ? dr["F"].ToString() : "";
+                int Status = 0;
+                if (StatusName == "是") Status=3;
                 int Kind = 0;
                 var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
                 var users = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId && m.RealName == Name) ?? new Users();
@@ -492,6 +496,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var ToChargeBackRecord = db.ToChargeBackRecord.Add(new ToChargeBackRecord
                     {
                         CreateDate = DateTime.Now,
+                        Status = Status,
                         SeoTitle = SysUserName + "_" + SysRealName,
                         SeoDescription = Remark,
                         Remark = Remark,

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -384,6 +384,31 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+
+        #region 获取激活信息
+        /// <summary>
+        /// 获取激活信息
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public string GetActInfo()
+        {
+            string check = RedisDbconn.Instance.Get<string>("CheckSIMActInfo:" + SysId);
+            if (!string.IsNullOrEmpty(check))
+            {
+                return "请勿重复操作";
+            }
+            else
+            {
+                RedisDbconn.Instance.Set("CheckSIMActInfo:" + SysId, "1");
+                RedisDbconn.Instance.SetExpire("CheckSIMActInfo:" + SysId, 10);
+                RedisDbconn.Instance.AddList("SIMActInfo", SysId);
+                return "success";
+            }
+        }
+        #endregion
+
+
         #region 导入数据
         public IActionResult Import(string right)
         {

Areas/Admin/Views/MainServer/CustomQuery/Confirm.cshtml

@@ -27,13 +27,6 @@
                 </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="Title" name="Title" maxlength="50"
-                                    lay-verify="required|" autocomplete="off" placeholder="请输入标题">
-                            </div>
-                        </div>
                         @foreach(string key in query.Keys)
                         {
                             <div class="layui-form-item">

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

@@ -60,10 +60,26 @@
                                     lay-verify="required|" placeholder="请输入sql语句"></textarea>
                             </div>
                         </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">字典key</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="DataKey" name="DataKey"
+                                    maxlength="50" lay-verify="required|" autocomplete="off"
+                                    placeholder="请输入字典key">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">字典text</label>
+                            <div class="layui-input-block">
+                                <input class="layui-input" type="text" id="DataText" name="DataText"
+                                    maxlength="50" lay-verify="required|" autocomplete="off"
+                                    placeholder="请输入字典text">
+                            </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="DatabaseConnect" name="DatabaseConnect" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入标题">
+                                <input class="layui-input" type="text" id="DatabaseConnect" name="DatabaseConnect" maxlength="50" autocomplete="off" placeholder="请输入数据库">
                             </div>
                         </div>
 

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

@@ -65,12 +65,28 @@
                                     lay-verify="required|" placeholder="请输入sql语句">@editData.SqlContent</textarea>
                             </div>
                         </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">字典key</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="DataKey" name="DataKey"
+                                    value="@editData.DataKey" maxlength="50" lay-verify="required|" autocomplete="off"
+                                    placeholder="请输入字典key">
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">字典text</label>
+                            <div class="layui-input-block">
+                                <input class="layui-input" type="text" id="DataText" name="DataText"
+                                    value="@editData.DataText" maxlength="50" lay-verify="required|" autocomplete="off"
+                                    placeholder="请输入字典text">
+                            </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="DatabaseConnect" name="DatabaseConnect"
-                                    value="@editData.DatabaseConnect" maxlength="50" lay-verify="required|" autocomplete="off"
-                                    placeholder="请输入标题">
+                                    value="@editData.DatabaseConnect" maxlength="50" autocomplete="off"
+                                    placeholder="请输入数据库">
                             </div>
                         </div>
 

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

@@ -153,7 +153,7 @@
                         <div class="layui-input-inline">
                             <select id="StoreKindSelect" name="StoreKindSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">否</option>
+                                <option value="0" selected="selected">否</option>
                                 <option value="1">是</option>
                             </select>
                         </div>

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

@@ -148,6 +148,9 @@
                             <button class="layui-btn" data-type="ImportTrade">
                                 <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导交易
                             </button>
+                            <button class="layui-btn" onclick="GetActInfo()">
+                                <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>获取激活信息
+                            </button>
                             }
                             <button class="layui-btn" data-type="ExportExcel">
                                 <i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出
@@ -198,5 +201,37 @@
     <script>
         var BrandId = '@BrandId';
     </script>
+    <script>
+        function GetActInfo() {
+            var index = layer.confirm('确定操作该功能吗？', function (index) {
+                var indexs = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
+                var userdata = $("#confirmFrm").serialize();
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/TradeRecord/GetActInfo?r=" + Math.random(1),
+                    data: userdata,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(index); //关闭弹层
+                        if (data == "success") {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg('成功', {
+                                time: 1000
+                            }, function () {
+                                window.location.reload();
+                            });
+                        } else {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg(data, { time: 1000 }, function () {
+                                window.location.reload();
+                            });
+                        }
+                    }
+                });
+            });
+        }
+    </script>
 </body>
 </html>

Startup.cs

@@ -154,8 +154,6 @@ namespace MySystem
                 OpExcelHelper.Instance.Start();
                 SIMPosMerchantTradeService.Instance.Start(); //导入广电卡数据
                 GetRadioCardInfoService.Instance.Start(); //获取行销宝信息
-                SIMPosMerchantTradeService.Instance.SIMActDo(); //通过接口获取广电卡激活数据
-                GetRadioCardInfoService.Instance.Start(); //获取行销宝信息
                 SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
 
                 TestHelper.Instance.Start(); //生成兑换券

global.json

@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "3.0.100"
+  }
+}