Merge branch 'feature-dgy-广电卡入库添加信息' into feature-dgy-后台测试

AppStart/ExcelHelper.cs

@@ -77,6 +77,8 @@ namespace MySystem
                                         KqProducts kqProduct = db.KqProducts.FirstOrDefault(m => m.Id == BrandId) ?? new KqProducts();
                                         if (kqProduct.Id > 0)
                                         {
+                                            var Areas = dr[9].ToString(); // 广电卡所属地区
+                                            if (kqProduct.Id != 14) Areas = null;
                                             StoreForCode storefor = db.StoreForCode.FirstOrDefault(m => m.Code == StoreNo) ?? new StoreForCode();
                                             StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == storefor.StoreId) ?? new StoreHouse();
                                             PosMachinesTwo pos = db.PosMachinesTwo.Add(new PosMachinesTwo()
@@ -91,6 +93,7 @@ namespace MySystem
                                                 DeviceKind = DeviceKind,
                                                 SourceStoreId = storefor.StoreId, //源仓库
                                                 CardType = CardType,
+                                                OutBatchNo = Areas,
                                             }).Entity;
                                             store.ProductName = kqProduct.Name;
                                             store.BrandId = BrandId.ToString();

AppStart/Helper/GetRadioCardInfoService.cs

@@ -0,0 +1,123 @@
+using System.Collections.Generic;
+using LitJson;
+using Library;
+using MySystem.Models;
+using System;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Linq;
+/// <summary>
+/// 获取行销宝信息
+/// </summary>
+
+public class GetRadioCardInfoService
+{
+    public readonly static GetRadioCardInfoService Instance = new GetRadioCardInfoService();
+    private GetRadioCardInfoService()
+    {
+    }
+
+    // //测试
+    // string pubKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCGvhfAXw0yoPgMwBfX6jgDT6XBjWqOFcGmsm/pfnGlqGSsMYZNjMLzwOMWfhB8IO7dyh4nu3caXjZTbBUJLQtIKcOoM/ZFZZiOXBW2xDg5WPSswmtCvaSmct9rrd0OGvZtNvgimcNjnHbiE1/1LPxwKHWyzdxzRul5NJdg0Vdw1QIDAQAB";
+    // string priKey = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJVLd0ePGZ6fKK1TwcGIxvknF7liDhGyedk3IRxEwTP6P+YS7Y9WaKxDTxIc77ECFSWlvZIPKOXXufMTzwkEGvuAKO+kD9C5R2D+4U3IhztrzcHif8Pn5+I2fVUGuXisUJ+bPxEKSjw7sn5S94uCIsy7o79rHAovAwn+2veLw8xDAgMBAAECgYAqZ8gWnE/jnUOZj9vOFAKoTHFRp8dlQXOYvi76b5ENKXyy5hdyClIq8+dmtq9icLv++IfTD9lHB7J6l9rLrc3XyNmdRSzxSxOT/kPYv1qZoNCqAlTFjWwLNw8tkarcc9NbNXg9UOS/UE97Hs1vlEThOB12cz+5wEF62l+LvZCxeQJBAMrgiujwoKddhCNGuVr3Gac98j4PBqvgtakvYUzvF78gJ0ffngb0J6s1rmGgmaohJc5YE8RwHa4AbIAUjhsdTx0CQQC8YyPgtD44i6+IQMba5zZH1nISSI5yQlPv8dgLXRLDMTnWXx9F7JxXLzAmeJdpkZrdvv1tLzClqDStRClr28rfAkEArFuD6E62TjpWzpmBU9TmiH1KVorxggiQjUHhijj+lbO9a4SBfyrioMQkeHC23CD5O4r8kEEoFfHqPA46hLKryQJAcCHOvDRtCLlUbRSpiKixLYdedLWNXENQtPTN9M2cmmSVmZ0a/0L8OATVc0C6V1MczDqfnDrHiQMa/7sfsJyuHwJBAMLGVR4buHGR/zrnO7FJa4zPw0KK+xUSttDQ9T2+JzV+RcaffmwSm511q+lAZW8e+SrT08WBKhEY8bYUEV95VAM=";
+    // string orgNo = "YCJG10010003";
+    // string apiKey = "12345678";
+    // string host = "https://bmp-test.cbnyunchang.com";
+
+    //生产
+    string pubKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZ+zsPxpoM85OFlHOqN3aauub5PqC8lmfFQKgWz7XITCPsWdYrBY/Niu29tSNchYZq+wrboyhrhCx9PacWeF5hQ0qkOIw/vcLQJe4RWXj3eBMfbqj7a2dJlcFI12TP0m1lCaI5z9lZ1FHtZDzU0lBBiRUCRNsJa/ktrt1MjU7nAQIDAQAB";
+    string priKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJBIQq3hyV0EseFd6X+nzRc++bZoljQqqou2NPUW5RD+wLBTk08LGwhGq7hR9WlG95aQ3NHbqNT/Tt8eiH9a8k7FzXHDzGAnGpYTh1fCzSx+lzmRA0E8WUH2CdjSLiNxb4Dxvqcrht5TpgFp2NRaGIIAvB+h8QZ1Uhjux5LGiJaJAgMBAAECgYBl65WmrSOIYOOi9qsWMRvwetz9HL5WFXmp/clFBKpFqh/FrxQVNxweaYWuS78XYjlNlAFZAVkvNTaq6C+1/zHAl3YmRowVz2ut1WoTT5MjZBJsR1d7SnSKp/ZuquKGGPG9l1jbUgY6CfekUhvKzUdk3/k7r3zUzUzEWq4dDdM/XQJBAP2SwEDg78nJxKMBmjKYwEpYYYL6DxTYje9J07/Ms7L8W7OtIj+Xm6I0siBWLe4Y5tVtBzaohxnbzoKfNODaNFMCQQCRqb+5fD02I+Sa62gTQepb1u1HgguS1KfFB0inmwMs+VEFYs73N8LC3PSzONhOLlIV/bzs4CvpnMHyF16qie4zAkEA9GBR2DTv41EIqPAKY2jDKOM0Vr4XeseZQlusLtRg+sYqumbI8vBxlUmjwXZMnYJyNI32vb59NXaY91nn5Ctm8QJAYSwkwtCm5R88ujygyXgHqAzRbgrLPcCvyzj4txcqHy6TZkxsVW/VdbmBZK5fXoh4KkODbWJ+6PGyUJZWiN5LEQJAelIs1KLSVQ+GAzDslXIyxYhTP9yLcxAMbCuQ3tY0jbsyYyB/WuxTvIdwGfGp/GLht36/6RqsRc9JtAyMeXkE1g==";
+    string orgNo = "YCJG10010003";
+    string apiKey = "n^ZbEjK%";
+    string host = "https://bmp.cbnyunchang.com";
+
+    public void Start()
+    {
+        Thread th = new Thread(StartEverTimeDo);
+        th.IsBackground = true;
+        th.Start();
+    }
+
+    private void StartEverTimeDo()
+    {
+        while (true)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            try
+            {
+                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 timestamp = function.getTimeStamp(); //时间戳，精确到秒。签名用参数
+                SortedList<string, string> req = new SortedList<string, string>();
+                req.Add("queryBeginTime", queryBeginTime);
+                req.Add("queryEndTime", queryEndTime);
+                req.Add("brhNo", orgNo);
+                req.Add("pageNo", pageNo);
+                req.Add("pageSize", pageSize);
+                req.Add("timestamp", timestamp);
+                string signstr = function.BuildQueryString(req);
+                function.WriteLog(DateTime.Now.ToString(), "广电卡查询开通工号数据");
+                function.WriteLog("代签名串\n" + signstr, "广电卡查询开通工号数据");
+                req.Add("sign", Sign(signstr));
+                string reqstr = Newtonsoft.Json.JsonConvert.SerializeObject(req);
+                function.WriteLog("请求参数\n" + reqstr, "广电卡查询开通工号数据");
+                string reqUrl = host + "/ycsim-business/openapi/query_marketers_info";
+                function.WriteLog("请求地址\n" + reqUrl, "广电卡查询开通工号数据");
+                string result = function.PostWebRequest(reqUrl, reqstr, "application/json");
+                function.WriteLog("响应数据\n" + result, "广电卡查询开通工号数据");
+
+                JsonData jsonObj = JsonMapper.ToObject(result);
+                if (jsonObj["resultCode"].ToString() == "1")
+                {
+                    var data = jsonObj["data"]["records"];
+                    for (int i = 0; i < data.Count; i++)
+                    {
+                        var IdNo = data["idNo"].ToString();
+                        var radioCardInfo = db.RadioCardInfo.FirstOrDefault(m => m.IdNo == IdNo) ?? new RadioCardInfo();
+                        if (string.IsNullOrEmpty(radioCardInfo.JobId))
+                        {
+                            radioCardInfo.JobId = data["jobId"].ToString(); //行销宝工号
+                            radioCardInfo.JobStatus = data["status"].ToString(); //工号状态
+                            radioCardInfo.OprName = data["oprName"].ToString(); //人员姓名
+                            radioCardInfo.Mobile = data["mobile"].ToString(); //广电手机号
+                            radioCardInfo.IdNo = data["idNo"].ToString(); //身份证号
+                            radioCardInfo.Gender = data["gender"].ToString(); //性别
+                            radioCardInfo.Role = data["role"].ToString(); //角色
+                            radioCardInfo.ChannelCode = data["channelCode"].ToString(); //归属社招渠道编码
+                            radioCardInfo.ChannelName = data["channelName"].ToString(); //归属社招渠道名称
+                            radioCardInfo.ProvincialCompany = data["provincialCompany"].ToString(); //归属省公司
+                            radioCardInfo.OprInviteCode = data["oprInviteCode"].ToString(); //邀请码
+                            radioCardInfo.OpenTime = data["openTime"].ToString(); //开通时间
+                            radioCardInfo.BrhName = data["brhName"].ToString(); //机构名称
+                            radioCardInfo.BrhUserId = data["brhUserId"].ToString(); //机构用户编码
+                            radioCardInfo.UpdateDate = DateTime.Now; //更新时间
+                        }
+                    }
+                    db.SaveChanges();
+                }
+                else
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + result, "请求行销宝信息接口异常");
+                    Thread.Sleep(1800000);
+                }
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "获取行销宝信息线程异常");
+            }
+            db.Dispose();
+        }
+    }
+
+    private string Sign(string message)
+    {
+        byte[] keyData = Convert.FromBase64String(priKey);
+        byte[] data = System.Text.Encoding.UTF8.GetBytes(message);
+        var rsa = System.Security.Cryptography.RSA.Create();
+        rsa.ImportPkcs8PrivateKey(keyData, out _);
+        return Convert.ToBase64String(rsa.SignData(data, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1));
+    }
+
+}

AppStart/Helper/SIMPosMerchantTradeService.cs

@@ -143,7 +143,7 @@ namespace MySystem
                                         SuccessCount += 1;
                                     }
                                     DoCount += Size;
-                                    db.SaveChanges();
+                                    spdb.SaveChanges();
                                     tran.Commit();
                                     if (DoCount >= list.Rows.Count)
                                     {

Areas/Admin/Controllers/MainServer/CustomQueryDoController.cs

@@ -115,6 +115,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         sqlstr = sqlstr.Replace(m.Value, dicVals[fieldName]);
                     }
+                    else
+                    {
+                        sqlstr = sqlstr.Replace(m.Value, "");
+                    }
                 }
 
                 DataTable dtsub = CustomerSqlConn.dtable(sqlstr, MysqlConn.ReadSqlConnStr);
@@ -149,6 +153,19 @@ namespace MySystem.Areas.Admin.Controllers
                 string fieldName = fieldData[0];
                 sql = sql.Replace(m.Value, Request.Query[fieldName].ToString());
             }
+            mc = Regex.Matches(sql, @"\#\{.*?\}\#");
+            foreach(Match m in mc)
+            {
+                string fieldName = m.Value.Replace("#{", "").Replace("}#", "");
+                if(dicVals.ContainsKey(fieldName))
+                {
+                    sql = sql.Replace(m.Value, dicVals[fieldName]);
+                }
+                else
+                {
+                    sql = sql.Replace(m.Value, "");
+                }
+            }
             mc = Regex.Matches(sql, @"\$\replace{.*?\}\$");
             foreach(Match m in mc)
             {

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1383,7 +1383,7 @@ namespace MySystem.Areas.Admin.Controllers
                 Users user = db.Users.FirstOrDefault(m => m.Id == yyzx5.UserId) ?? new Users();
                 YYZX5 = "金额：" + yyzx5.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发奖时间：" + yyzx5.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             }
-            MachineApply apply = db.MachineApply.FirstOrDefault(m => m.SwapSnExpand.Contains(pos.PosSn)) ?? new MachineApply();
+            MachineApply apply = db.MachineApply.FirstOrDefault(m => m.SwapSnExpand.Contains(pos.PosSn) && m.Status > 0) ?? new MachineApply();
             Orders applyorder = db.Orders.FirstOrDefault(m => m.Id == apply.QueryCount) ?? new Orders();
             MachineChangeDetail change = db.MachineChangeDetail.FirstOrDefault(m => m.OutSnNo == pos.PosSn) ?? new MachineChangeDetail();
 

Areas/Admin/Controllers/OperateServer/AmountRecordOperateController.cs

@@ -60,7 +60,8 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(MakerCode))
             {
-                condition += " and UserId in (select UserId from SysAdmin where MakerCode='" + MakerCode + "')";
+                var user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new Models.Users();
+                condition += " and UserId=" + user.Id;
             }
             //运营中心编号
             if (!string.IsNullOrEmpty(OpCode))

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -61,12 +61,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 运营中心列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(SysAdmin data, string OpCode, string RealName, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(SysAdmin data, string OpCode, string MakerCode, string MakerName, string UserType, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("RealName", "2"); //名称
+            Fields.Add("RealName", "1"); //名称
 
             string condition = " and Status>-1 and Sort>0 and QueryCount>0 and AdminName!='admin'";
             //运营中心编号
@@ -74,6 +74,37 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Id in (select OpId from OperateForCode where OpCode='" + OpCode + "')";
             }
+            //创客编号
+            if (!string.IsNullOrEmpty(MakerCode))
+            {
+                var user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new Models.Users();
+                condition += " and UserId=" + user.Id;
+            }
+            //创客姓名
+            if (!string.IsNullOrEmpty(MakerName))
+            {
+                var user = db.Users.Where(m => m.RealName == MakerName).ToList();
+                var userIds = "";
+                foreach (var item in user)
+                {
+                    userIds += item.Id + ",";
+                };
+                userIds = userIds.TrimEnd(',');
+                condition += " and UserId in (" + userIds + ")";
+            }
+            //合伙人类型
+            if (!string.IsNullOrEmpty(UserType))
+            {
+                var type = int.Parse(UserType);
+                var user = db.Users.Where(m => m.UserType == type).ToList();
+                var userIds = "";
+                foreach (var item in user)
+                {
+                    userIds += item.Id + ",";
+                };
+                userIds = userIds.TrimEnd(',');
+                condition += " and UserId in (" + userIds + ")";
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -96,8 +127,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (userInfo.UserType == 2) dic["Kind"] = "黄金合伙人";
                 if (userInfo.UserType == 3) dic["Kind"] = "钻石合伙人";
                 if (userInfo.UserType == 4) dic["Kind"] = "战略合伙人";
-                dic["MakerCode"] = userInfo.MakerCode;
-                dic["RealName"] = userInfo.RealName;
+                dic["MakerForCode"] = userInfo.MakerCode;
+                dic["MakerForName"] = userInfo.RealName;
 
                 //登陆地址
                 dic["LoginUrl"] = OpHost + "Admin/" + dbconn.Encrypt3DES(sysAdmin.Sort.ToString(), "kxs12345").Replace("/", "%2F") + "/Login";

Areas/Admin/Views/OperateServer/SysAdminOperate/Index.cshtml

@@ -51,10 +51,33 @@
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">名称</label>
+                        <label class="layui-form-label">运营中心名称</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="RealName" 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="MakerCode" 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="MakerName" placeholder="" autocomplete="off">
+                        </div>
+                    </div><div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">合伙人类型</label>
+                            <div class="layui-input-inline">
+                                <select id="UserType" name="UserType">
+                                    <option value="">请选择</option>
+                                    <option value="1">运营中心</option>
+                                    <option value="2">黄金合伙人</option>
+                                    <option value="3">钻石合伙人</option>
+                                    <option value="4">战略合伙人</option>
+                                </select>
+                            </div>
+                        </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">创建时间</label>

Models/PosMachinesTwo.cs

@@ -61,9 +61,9 @@ namespace MySystem.Models
         public int RecycStatus { get; set; }
         public string OutBatchNo { get; set; }
         public int WithholdFlag { get; set; }
+        public int LastMerchantId { get; set; }
         public int IsSupplement { get; set; }
         public int IsOpAct { get; set; }
-        public int LastMerchantId { get; set; }
         public int CardType { get; set; }
         public decimal DownFee { get; set; }
         public int FirstFlag { get; set; }

Models/RadioCardInfo.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class RadioCardInfo
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public int UserId { get; set; }
+        public string BrhUserId { get; set; }
+        public string BrhName { get; set; }
+        public string OpenTime { get; set; }
+        public string OprInviteCode { get; set; }
+        public string ProvincialCompany { get; set; }
+        public string ChannelName { get; set; }
+        public string ChannelCode { get; set; }
+        public string Role { get; set; }
+        public string Gender { get; set; }
+        public string IdNo { get; set; }
+        public string Mobile { get; set; }
+        public string OprName { get; set; }
+        public string JobStatus { get; set; }
+        public string JobId { get; set; }
+    }
+}

Models/WebCMSEntities.cs

@@ -184,6 +184,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<RadioCardInfo> RadioCardInfo { get; set; }
         public virtual DbSet<RecommendDirectUser> RecommendDirectUser { get; set; }
         public virtual DbSet<RecommendOrderCheck> RecommendOrderCheck { get; set; }
         public virtual DbSet<RecommendTradeSummary> RecommendTradeSummary { get; set; }
@@ -10125,6 +10126,7 @@ namespace MySystem.Models
 
                 entity.Property(e => e.CardType)
                     .HasColumnType("int(11)")
+                    .HasDefaultValueSql("'2'")
                     .HasComment("卡类型");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -10194,7 +10196,7 @@ namespace MySystem.Models
 
                 entity.Property(e => e.LastMerchantId)
                     .HasColumnType("int(11)")
-                    .HasComment("最后一次绑定商户Id");
+                    .HasComment("最后一次绑定商户号");
 
                 entity.Property(e => e.LeaderUserId).HasColumnType("int(11)");
 
@@ -13273,6 +13275,122 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<RadioCardInfo>(entity =>
+            {
+                entity.HasComment("行销宝工号信息");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrhName)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("机构名称")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BrhUserId)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("机构用户编码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ChannelCode)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("归属社招渠道编码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ChannelName)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("归属社招渠道名称")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.Gender)
+                    .HasColumnType("varchar(10)")
+                    .HasComment("性别")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.IdNo)
+                    .HasColumnType("varchar(18)")
+                    .HasComment("身份证号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.JobId)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("行销宝工号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.JobStatus)
+                    .HasColumnType("varchar(10)")
+                    .HasComment("工号状态")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Mobile)
+                    .HasColumnType("varchar(11)")
+                    .HasComment("广电手机号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OpenTime)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("开通时间")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OprInviteCode)
+                    .HasColumnName("oprInviteCode")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("邀请码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OprName)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("人员姓名")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ProvincialCompany)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("归属省公司")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Role)
+                    .HasColumnType("varchar(10)")
+                    .HasComment("角色")
+                    .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.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客Id");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<RecommendDirectUser>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -14437,6 +14555,7 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Type)
                     .HasColumnType("int(11)")
+                    .HasDefaultValueSql("'3'")
                     .HasComment("兑换类型");
 
                 entity.Property(e => e.UpdateDate)

Startup.cs

@@ -142,6 +142,7 @@ namespace MySystem
             if (Env == "Develop")
             {
                 SIMPosMerchantTradeService.Instance.Start(); //导入广电卡数据
+                GetRadioCardInfoService.Instance.Start(); //获取行销宝信息
             }
             if (Env == "Production")
             {
@@ -152,6 +153,7 @@ namespace MySystem
                 ExcelHelper.Instance.Start();
                 OpExcelHelper.Instance.Start();
                 SIMPosMerchantTradeService.Instance.Start(); //导入广电卡数据
+                GetRadioCardInfoService.Instance.Start(); //获取行销宝信息
                 SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
 
                 TestHelper.Instance.Start(); //生成兑换券

wwwroot/layuiadmin/modules_operate/SysAdminOperate_Admin.js

@@ -120,11 +120,11 @@ layui.config({
                 title: '名称',
                 sort: true
             }, {
-                field: 'MakerCode',
+                field: 'MakerForCode',
                 title: '所属创客编号',
                 sort: true
             }, {
-                field: 'MakerName',
+                field: 'MakerForName',
                 title: '所属真实姓名',
                 sort: true
             }, {