Merge branch 'feature-dgy-功能修复和辅助工具' into DuGuYang

Areas/Admin/Controllers/HomeController.cs

@@ -149,60 +149,60 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string Login(string UserName, string Pwd, string CheckCode)
         {
-            string result = "";
-            if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
-            {
-                result = "验证码错误!!";
-            }
-            else
-            {
-                Pwd = function.MD5_32(Pwd);
-                var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-                if (user != null)
-                {
-                    user.LastLoginDate = DateTime.Now;
-                    db.SaveChanges();
-                    function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-                    int RoleId = int.Parse(function.CheckInt(user.Role));
-                    BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-                    string RightInfo = function.CheckNull(Role.RightInfo);
-                    function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-                    string UserId = user.Id.ToString();
-                    function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-                    function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-                    result = "success";
-                }
-                else
-                {
-                    result = "用户名或密码错误";
-                }
-            }
-
             // string result = "";
-            // Pwd = function.MD5_32(Pwd);
-            // var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-            // if (user != null)
+            // if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
             // {
-            //     user.LastLoginDate = DateTime.Now;
-            //     db.SaveChanges();
-            //     function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-            //     int RoleId = int.Parse(function.CheckInt(user.Role));
-            //     BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-            //     string RightInfo = function.CheckNull(Role.RightInfo);
-            //     function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-            //     string UserId = user.Id.ToString();
-            //     function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-            //     function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-            //     result = "success";
+            //     result = "验证码错误!!";
             // }
             // else
             // {
-            //     result = "用户名或密码错误";
+            //     Pwd = function.MD5_32(Pwd);
+            //     var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            //     if (user != null)
+            //     {
+            //         user.LastLoginDate = DateTime.Now;
+            //         db.SaveChanges();
+            //         function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+            //         int RoleId = int.Parse(function.CheckInt(user.Role));
+            //         BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+            //         string RightInfo = function.CheckNull(Role.RightInfo);
+            //         function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+            //         string UserId = user.Id.ToString();
+            //         function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+            //         function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+            //         result = "success";
+            //     }
+            //     else
+            //     {
+            //         result = "用户名或密码错误";
+            //     }
             // }
+
+            string result = "";
+            Pwd = function.MD5_32(Pwd);
+            var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            if (user != null)
+            {
+                user.LastLoginDate = DateTime.Now;
+                db.SaveChanges();
+                function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+                int RoleId = int.Parse(function.CheckInt(user.Role));
+                BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+                string RightInfo = function.CheckNull(Role.RightInfo);
+                function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+                string UserId = user.Id.ToString();
+                function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+                function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+                result = "success";
+            }
+            else
+            {
+                result = "用户名或密码错误";
+            }
             return result;
         }
         #endregion

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1008,7 +1008,8 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     Users user = db.Users.FirstOrDefault(m => m.Id == rewards.UserId) ?? new Users();
                     DepositGets = "已领取";
-                    DepositUsers = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+                    DepositUsers = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                    // DepositUsers = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
                 }
                 string ActiveTimes = rewards.CreateDate == null ? "" : rewards.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == pos.StoreId) ?? new StoreHouse();
@@ -1104,7 +1105,8 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == reward.UserId) ?? new Users();
                 DepositGet = "已领取";
-                DepositUser = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+                DepositUser = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                // DepositUser = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
                 var fAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 0);
                 if (fAmount != null)
                 {
@@ -1123,7 +1125,8 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == lisreward.UserId) ?? new Users();
                 DepositGet6 = "已领取";
-                DepositUser6 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+                DepositUser6 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                // DepositUser6 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             string FluxGet6 = "未领取";
             string FluxUser6 = "";
@@ -1132,24 +1135,44 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == flux.UserId) ?? new Users();
                 FluxGet6 = "已领取（领取时间：" + flux.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "）";
-                FluxUser6 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+                FluxUser6 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                // FluxUser6 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             Users touser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
-            DepositToUser = "创客编号：" + touser.MakerCode + "，姓名：" + touser.RealName + "，手机号：" + touser.Mobile;
+            DepositToUser = "创客编号：" + touser.MakerCode + "，姓名：" + touser.RealName;
+            // DepositToUser = "创客编号：" + touser.MakerCode + "，姓名：" + touser.RealName + "，手机号：" + touser.Mobile;
             string OpenUser10 = "未领取";
             string OpenUser20 = "未领取";
+            string Leader10 = "未领取";
+            string YYZX5 = "未领取";
             var OpenRewardDetail = db.OpenRewardDetail.Where(m => m.SnNo == pos.PosSn).ToList();
             OpenRewardDetail openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 20) ?? new OpenRewardDetail();
             if (openreward.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
-                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                // OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 10) ?? new OpenRewardDetail();
             if (openreward.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
-                OpenUser10 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+                OpenUser10 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                // OpenUser10 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+            }
+            var leader10 = db.UserAccountRecord.FirstOrDefault(m => m.QueryCount == pos.Id && m.ChangeType == 116) ?? new UserAccountRecord();
+            if (leader10.Id > 0)
+            {
+                Users user = db.Users.FirstOrDefault(m => m.Id == leader10.UserId) ?? new Users();
+                Leader10 = "金额：" + leader10.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                // Leader10 = "金额：" + leader10.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+            }
+            var yyzx5 = db.UserAccountRecord.FirstOrDefault(m => m.QueryCount == pos.Id && m.ChangeType == 121) ?? new UserAccountRecord();
+            if (yyzx5.Id > 0)
+            {
+                Users user = db.Users.FirstOrDefault(m => m.Id == yyzx5.UserId) ?? new Users();
+                YYZX5 = "金额：" + yyzx5.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                // YYZX5 = "金额：" + yyzx5.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             MachineApply apply = db.MachineApply.FirstOrDefault(m => m.SwapSnExpand.Contains(pos.PosSn)) ?? new MachineApply();
             Orders applyorder = db.Orders.FirstOrDefault(m => m.Id == apply.QueryCount) ?? new Orders();
@@ -1169,12 +1192,14 @@ namespace MySystem.Areas.Admin.Controllers
             result += "\n";
             result += "机具SN：" + pos.PosSn + "\n";
             result += "商户编号：" + merInfo + "，商户姓名：" + merName + "\n";
-            result += "商户型机器/直拓机器：创客编号：" + posSubUser.MakerCode + "，姓名：" + posSubUser.RealName + "，手机号：" + posSubUser.Mobile + "\n";
+            result += "商户型机器/直拓机器：创客编号：" + posSubUser.MakerCode + "，姓名：" + posSubUser.RealName + "\n";
+            // result += "商户型机器/直拓机器：创客编号：" + posSubUser.MakerCode + "，姓名：" + posSubUser.RealName + "，手机号：" + posSubUser.Mobile + "\n";
             if (change.Id > 0)
             {
                 result += "换机来源机具SN：" + change.BackSnNo + "\n";
             }
-            result += "机具所属人：创客编号：" + posUser.MakerCode + "，姓名：" + posUser.RealName + "，手机号：" + posUser.Mobile + "\n";
+            result += "机具所属人：创客编号：" + posUser.MakerCode + "，姓名：" + posUser.RealName + "\n";
+            // result += "机具所属人：创客编号：" + posUser.MakerCode + "，姓名：" + posUser.RealName + "，手机号：" + posUser.Mobile + "\n";
             // result += "机器持有人顶级：创客编号：" + posTopUser.MakerCode + "，姓名：" + posTopUser.RealName + "，手机号：" + posTopUser.Mobile + "\n";
             result += "机器所属仓库：仓库编号：" + store.StoreNo + "，仓库名称：" + store.StoreName + "\n";
             if (pos.PreUserId > 0)
@@ -1182,7 +1207,8 @@ namespace MySystem.Areas.Admin.Controllers
                 Users smallStoreUser = db.Users.FirstOrDefault(m => m.Id == pos.PreUserId) ?? new Users();
                 PreSendStockDetail preSend = db.PreSendStockDetail.FirstOrDefault(m => m.SnId == pos.Id && m.ToUserId == pos.PreUserId && m.Status == 1) ?? new PreSendStockDetail();
                 string preSendDate = preSend.CreateDate == null ? "" : preSend.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
-                result += "机具所属小分仓：创客编号：" + smallStoreUser.MakerCode + "，姓名：" + smallStoreUser.RealName + "，手机号：" + smallStoreUser.Mobile + "，预发时间：" + preSendDate + "\n";
+                result += "机具所属小分仓：创客编号：" + smallStoreUser.MakerCode + "，姓名：" + smallStoreUser.RealName + "，预发时间：" + preSendDate + "\n";
+                // result += "机具所属小分仓：创客编号：" + smallStoreUser.MakerCode + "，姓名：" + smallStoreUser.RealName + "，手机号：" + smallStoreUser.Mobile + "，预发时间：" + preSendDate + "\n";
             }
             else
             {
@@ -1199,7 +1225,7 @@ namespace MySystem.Areas.Admin.Controllers
             result += "是否发货：" + SendStatus + "，发货时间：" + SendDate + "\n";
             result += "押金：" + Deposit + "\n";
             result += "是否返现：" + DepositGet + "，领取时间：" + ActiveTime + "\n";
-            result += "返现金额：" + headAmount + " " + " " + footAmount + "\n";//TODO: 添加返现金额和额外奖励
+            result += "返现金额：" + headAmount + " " + " " + footAmount + "\n";
             result += "押金返现应返现对象：" + DepositToUser + "\n";
             result += "押金返现实际返现对象：" + DepositUser + "\n";
             if (pos.BrandId == 6)
@@ -1210,7 +1236,9 @@ namespace MySystem.Areas.Admin.Controllers
             result += "流量费：" + FluxGet6 + "\n";
             result += "流量费发放对象：" + FluxUser6 + "\n";
             result += "开机奖20：" + OpenUser20 + "\n";
-            result += "开机奖10：" + OpenUser10 + "\n";
+            // result += "开机奖10：" + OpenUser10 + "\n";
+            result += "盟主奖" + Leader10 + "\n";
+            result += "运营中心奖" + YYZX5 + "\n";
             return result;
         }
         //解析金控日志
@@ -1684,9 +1712,47 @@ namespace MySystem.Areas.Admin.Controllers
                     newpos.PreUserId = oldpos.PreUserId;
 
                     oldpos.StoreId = storeBack.Id;
+                    oldpos.QueryCount = 0;
+                    oldpos.UpdateDate = null;
+                    oldpos.ActivityList = null;
+                    oldpos.SeoKeyword = null;
+                    oldpos.SeoDescription = null;
+                    oldpos.OrderId = 0;
+                    oldpos.RecycEndDate = null;
+                    oldpos.RecycBackCount = 0;
+                    oldpos.PrizeParams = null;
+                    oldpos.ScanQrTrade = 0;
+                    oldpos.BindMerchantId = 0;
+                    oldpos.CreditTrade = 0;
+                    oldpos.DebitCardTrade = 0;
+                    oldpos.IsVip = 0;
+                    oldpos.UserNav = null;
+                    oldpos.TransferTime = null;
+                    oldpos.IsPurchase = 0;
+                    oldpos.Detail = null;
+                    oldpos.BindingTime = null;
+                    oldpos.BindingState = 0;
+                    oldpos.ActivationTime = null;
+                    oldpos.ActivationState = 0;
+                    oldpos.LeaderUserId = 0;
+                    oldpos.PreUserId = 0;
+                    oldpos.IsFirst = 0;
+                    oldpos.DownFeeMan = null;
+                    oldpos.DownFeeFlag = 0;
+                    oldpos.DownFeeDate = null;
+                    oldpos.UpFeeMan = null;
+                    oldpos.UpFeeFlag = 0;
+                    oldpos.UpFeeDate = null;
+                    oldpos.OpReserve1 = 0;
+                    oldpos.OpReserve2 = 0;
+                    oldpos.OpReserve3 = 0;
+                    oldpos.OpId = 0;
+                    oldpos.RecycStartDate = null;
+                    oldpos.SourcePosSn = null;
                     oldpos.BuyUserId = 0;
                     oldpos.UserId = 0;
                     oldpos.Status = -1;
+                    db.SaveChanges();
 
                     PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == newpos.BindMerchantId);
                     if (merchant != null)
@@ -1834,6 +1900,43 @@ namespace MySystem.Areas.Admin.Controllers
                     newpos.TransferTime = oldpos.TransferTime;
 
                     oldpos.StoreId = storeBack.Id;
+                    oldpos.QueryCount = 0;
+                    oldpos.UpdateDate = null;
+                    oldpos.ActivityList = null;
+                    oldpos.SeoKeyword = null;
+                    oldpos.SeoDescription = null;
+                    oldpos.OrderId = 0;
+                    oldpos.RecycEndDate = null;
+                    oldpos.RecycBackCount = 0;
+                    oldpos.PrizeParams = null;
+                    oldpos.ScanQrTrade = 0;
+                    oldpos.BindMerchantId = 0;
+                    oldpos.CreditTrade = 0;
+                    oldpos.DebitCardTrade = 0;
+                    oldpos.IsVip = 0;
+                    oldpos.UserNav = null;
+                    oldpos.TransferTime = null;
+                    oldpos.IsPurchase = 0;
+                    oldpos.Detail = null;
+                    oldpos.BindingTime = null;
+                    oldpos.BindingState = 0;
+                    oldpos.ActivationTime = null;
+                    oldpos.ActivationState = 0;
+                    oldpos.LeaderUserId = 0;
+                    oldpos.PreUserId = 0;
+                    oldpos.IsFirst = 0;
+                    oldpos.DownFeeMan = null;
+                    oldpos.DownFeeFlag = 0;
+                    oldpos.DownFeeDate = null;
+                    oldpos.UpFeeMan = null;
+                    oldpos.UpFeeFlag = 0;
+                    oldpos.UpFeeDate = null;
+                    oldpos.OpReserve1 = 0;
+                    oldpos.OpReserve2 = 0;
+                    oldpos.OpReserve3 = 0;
+                    oldpos.OpId = 0;
+                    oldpos.RecycStartDate = null;
+                    oldpos.SourcePosSn = null;
                     oldpos.BuyUserId = 0;
                     oldpos.UserId = 0;
                     oldpos.Status = -1;
@@ -2580,7 +2683,7 @@ namespace MySystem.Areas.Admin.Controllers
                 OpenUser10 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             result += "开机奖20：" + OpenUser20 + "\n";
-            result += "开机奖10：" + OpenUser10 + "\n";
+            // result += "开机奖10：" + OpenUser10 + "\n";
             dic.Add("id", pos.Id.ToString());
             dic.Add("code", "0");
             dic.Add("result", result);
@@ -2593,10 +2696,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "机具未激活";
             }
-            if (pos.BindingTime < DateTime.Now.AddDays(-30))
-            {
-                return "绑定已超过30天";
-            }
+            // if (pos.BindingTime < DateTime.Now.AddDays(-30))
+            // {
+            //     return "绑定已超过30天";
+            // }
             decimal ActPrize = decimal.Parse(function.CheckNum(pos.SeoKeyword));
             if (ActPrize == 0)
             {
@@ -2753,7 +2856,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 RedisDbconn.Instance.AddList("UserAccountRecord:" + puser.Id + ":1:" + monthString, userAccountRecord);
                                 RedisDbconn.Instance.AddNumber("UserAccount:" + puser.Id + ":1:" + monthString, Prize);
 
-                                Prize -= 10;
+                                Prize = 0;
                                 PrizeFlag.Add(Prize.ToString("f0"));
                             }
                         }
@@ -2763,10 +2866,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         result += "20元奖励未发，请检查上级是否满足条件\n";
                     }
-                    if (!PrizeFlag.Contains("10"))
-                    {
-                        result += "10元奖励未发，请检查上级是否满足条件\n";
-                    }
+                    // if (!PrizeFlag.Contains("10"))
+                    // {
+                    //     result += "10元奖励未发，请检查上级是否满足条件\n";
+                    // }
                     if (string.IsNullOrEmpty(result))
                     {
                         return "发放成功";
@@ -2835,7 +2938,7 @@ namespace MySystem.Areas.Admin.Controllers
             if (flux.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == flux.UserId) ?? new Users();
-                FluxGet6 = "已领取（领取时间：" + flux.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "）";
+                FluxGet6 = "已领取（金额：" + flux.FluxFeeAmt + "，领取时间：" + flux.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "）";
                 FluxUser6 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             result += "流量费：" + FluxGet6 + "\n";
@@ -2852,10 +2955,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "机具未激活";
             }
-            if (pos.BindingTime < DateTime.Now.AddDays(-30))
-            {
-                return "绑定已超过30天";
-            }
+            // if (pos.BindingTime < DateTime.Now.AddDays(-30))
+            // {
+            //     return "绑定已超过30天";
+            // }
             decimal ActPrize = decimal.Parse(function.CheckNum(pos.SeoKeyword));
             if (ActPrize == 0)
             {
@@ -3748,7 +3851,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入提现订单编号";
             }
-            string[] OrderNoList = OrderNo.Replace("\r","").Split('\n');
+            string[] OrderNoList = OrderNo.Replace("\r", "").Split('\n');
             var error = "";
             foreach (var item in OrderNoList)
             {
@@ -3773,5 +3876,115 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
+        #region 查询创客循环资格
+
+        public IActionResult SeeUserLoop(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string SeeUserLoopDo(string MakerCode)
+        {
+            var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
+            var user = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
+            var pos = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId == user.Id).ToList();
+            var brandList = db.KqProducts.ToList();
+            var info = "";
+            foreach (var item in brandList)
+            {
+                var brand = item.Name;
+                //已过期
+                var overdue = pos.Count(m => m.RecycEndDate < DateTime.Now && m.BrandId == item.Id);
+                //可申请
+                var use = pos.Count(m => m.IsPurchase == 0 && m.RecycEndDate > DateTime.Now && m.BrandId == item.Id);
+                //已使用
+                var used = pos.Count(m => m.IsPurchase == 1 && m.BrandId == item.Id);
+
+                info += "品牌：" + brand + "，已过期：" + overdue + "，可申请：" + use + "，已使用：" + used + "\n";
+            }
+            return info;
+        }
+        #endregion
+
+
+        #region 坏机回仓
+
+        public IActionResult BadPosToStore(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string BadPosToStoreDo(string OldSn)
+        {
+            string[] OldSnList;
+            OldSnList = OldSn.Replace("\r", "").Split('\n');
+            string error = "";
+            for (int i = 0; i < OldSnList.Length; i++)
+            {
+                string OldSnNum = OldSnList[i];
+                MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
+                PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.Status == -1) ?? new PosMachinesTwo();
+                if (oldpos.Id == 0)
+                {
+                    error += "以下操作失败" + OldSnNum + ',' + "该机具不是坏机或不存在" + '\n';
+                }
+                oldpos.QueryCount = 0;
+                oldpos.UpdateDate = null;
+                oldpos.ActivityList = null;
+                oldpos.SeoKeyword = null;
+                oldpos.SeoDescription = null;
+                oldpos.OrderId = 0;
+                oldpos.RecycEndDate = null;
+                oldpos.RecycBackCount = 0;
+                oldpos.PrizeParams = null;
+                oldpos.ScanQrTrade = 0;
+                oldpos.BindMerchantId = 0;
+                oldpos.CreditTrade = 0;
+                oldpos.DebitCardTrade = 0;
+                oldpos.IsVip = 0;
+                oldpos.UserNav = null;
+                oldpos.TransferTime = null;
+                oldpos.IsPurchase = 0;
+                oldpos.Detail = null;
+                oldpos.BindingTime = null;
+                oldpos.BindingState = 0;
+                oldpos.ActivationTime = null;
+                oldpos.ActivationState = 0;
+                oldpos.LeaderUserId = 0;
+                oldpos.PreUserId = 0;
+                oldpos.IsFirst = 0;
+                oldpos.DownFeeMan = null;
+                oldpos.DownFeeFlag = 0;
+                oldpos.DownFeeDate = null;
+                oldpos.UpFeeMan = null;
+                oldpos.UpFeeFlag = 0;
+                oldpos.UpFeeDate = null;
+                oldpos.OpReserve1 = 0;
+                oldpos.OpReserve2 = 0;
+                oldpos.OpReserve3 = 0;
+                oldpos.OpId = 0;
+                oldpos.RecycStartDate = null;
+                oldpos.SourcePosSn = null;
+                oldpos.BuyUserId = 0;
+                oldpos.UserId = 0;
+            }
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
+            db.SaveChanges();
+            return "success";
+        }
+        #endregion
+
+
     }
 }

Areas/Admin/Views/Home/Login.cshtml

@@ -26,11 +26,11 @@
                     <label for="password">密码 / Password</label>
                     <input class="form-input" type="password" name="Pwd" id="Pwd" onKeyUp="if(event.keyCode==13){$('#CheckCode').focus();}" placeholder="请填写密码">
                 </div>
-                <div class="form-group pb10">
+                @* <div class="form-group pb10">
                     <label for="password">验证码 / Verification</label>
                     <input class="form-input" type="text" name="CheckCode" id="CheckCode" onkeyup="if(event.keyCode==13){syslogin();}" placeholder="请填写验证码" style="width: 70%; display: inline-block; margin-right: 2%">
                     <img src="/Api/PublicMethod/CheckCode" onclick="$(this).attr('src','/Api/PublicMethod/CheckCode?r='+Math.random())" style="width: 26%; height:38px;" />
-                </div>
+                </div> *@
                 @*<div class="form-group pb10 cf">
                         <label class="remembermetext fl" for="rememberme">
                             <input type="checkbox" checked name="rememberme">&nbsp;记住我的登录

Areas/Admin/Views/MainServer/SysTools/BadPosToStore.cshtml

@@ -0,0 +1,258 @@
+@{
+    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">
+    <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">
+        <form class="layui-form" id="confirmFrm">
+            <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">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">坏机SN</label>
+                                    <div class="layui-input-block">
+                                        <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
+                                            placeholder="请输入坏机SN"></textarea>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="layui-form-item ml10">
+                        <div class="layui-input-block">
+                            <button type="button" class="layui-btn" onclick="save()">提交</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var index = layer.load(1, {
+                shade: [0.5, '#000']
+            });
+            var userdata = $("#confirmFrm").serialize();
+            $.ajax({
+                type: "POST",
+                url: "/Admin/SysTools/BadPosToStoreDo?r=" + Math.random(1),
+                data: userdata,
+                dataType: "text",
+                success: function (data) {
+                    layer.close(index); //关闭弹层
+                    if (data == "success") {
+                        layer.close(index); //关闭弹层
+                        layer.msg('成功,重置为仓库机', {
+                            time: 1500
+                        }, function () {
+                            window.location.reload();//数据刷新
+                        });
+                    }else if (data.indexOf("Warning") == 0) {
+                        var datalist = data.split('|');
+                        layer.alert(datalist[1], { time: 20000 }, function () {
+                            window.location.reload();
+                        });
+                    } else {
+                        layer.msg(data);
+                    }
+                }
+            });
+        }
+
+
+        //编辑器
+        KindEditor.ready(function (K) {
+
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        function AreasProvinceInit(tagId, areasVal, form) {
+            for (var i = 0; i < provs_data.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(provs_data[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+            }
+            form.render();
+        }
+
+        function AreasProvinceSelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "City").html('<option value="">市</option>');
+            var list = citys_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasCitySelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            var list = dists_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasAreaSelected(tagId, form) {
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+        function movePrev(obj, tagId) {
+            $(obj).parent().prev().insertAfter($(obj).parent());
+            checkPics(tagId);
+        }
+        function moveNext(obj, tagId) {
+            $(obj).parent().next().insertBefore($(obj).parent());
+            checkPics(tagId);
+        }
+        function deletePic(obj, tagId) {
+            $(obj).parent().remove();
+            checkPics(tagId);
+        }
+        function checkPics(tagId) {
+            var pics = "";
+            var texts = "";
+            $("#" + tagId + "Image div img").each(function (i) {
+                pics += $(this).attr("src").replace(osshost, '') + "|";
+            });
+            $("#" + tagId + "Image div input").each(function (i) {
+                texts += $(this).val() + "|";
+            });
+            if (pics == "") {
+                $("#" + tagId).val("");
+            } else {
+                pics = pics.substring(0, pics.length - 1);
+                texts = texts.substring(0, pics.length - 1);
+                $("#" + tagId).val(pics + "#cut#" + texts);
+            }
+        }
+        function checkBox(tagId) {
+            var text = "";
+            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
+                text += $(this).val() + ",";
+            });
+            $("#" + tagId).val(text);
+        }
+        function showBigPic(picpath) {
+            parent.layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                area: ['auto', 'auto'],
+                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
+            });
+        }
+
+
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            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');
+            });
+
+            form.on('select(ChangeType)', function (data) {
+                if(data.value == '0') {
+                    $('#MakerCodeSelect').show();
+                    $('#StoreCodeSelect').hide();
+                } else if(data.value == '1') {
+                    $('#MakerCodeSelect').hide();
+                    $('#StoreCodeSelect').show();
+                }
+                form.render();
+            });
+
+            //日期
+
+
+            //上传文件
+
+
+            //穿梭框
+
+
+            //TreeView，比如权限管理
+
+
+            //省市区
+
+        })
+
+    </script>
+</body>
+
+</html>

Areas/Admin/Views/MainServer/SysTools/FluxPrize.cshtml

@@ -60,7 +60,7 @@
             var userdata = $("#confirmFrm").serialize();
             $.ajax({
                 type: "POST",
-                url: "/Admin/SysTools/OpenPrizeDo?r=" + Math.random(1),
+                url: "/Admin/SysTools/FluxPrizeDo?r=" + Math.random(1),
                 data: userdata,
                 dataType: "json",
                 success: function (data) {
@@ -71,7 +71,7 @@
                         var index = layer.confirm(data.result.replace(/\n/g, '<br />') + '<br />是否立即补发？', { area: ['500px', '460px'] }, function (index) {
                             $.ajax({
                                 type: "POST",
-                                url: "/Admin/SysTools/AddOpenPrize?r=" + Math.random(1),
+                                url: "/Admin/SysTools/AddFluxPrize?r=" + Math.random(1),
                                 data: "Id=" + data.id,
                                 dataType: "text",
                                 success: function (data) {

Areas/Admin/Views/MainServer/SysTools/SeeUserLoop.cshtml

@@ -0,0 +1,249 @@
+@{
+    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">
+    <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">
+        <form class="layui-form" id="confirmFrm">
+            <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">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">创客编号</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="MakerCode" name="MakerCode"
+                                            maxlength="50" lay-verify="required|" autocomplete="off"
+                                            placeholder="请输入创客编号">
+                                    </div>
+                                </div>
+                                @* @{
+                                    Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();
+                                }
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">品牌</label>
+                                    <div class="layui-input-inline">
+                                        <select id="BrandId" name="BrandId" lay-search="">
+                                            <option value="">全部...</option>
+                                            @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                            {
+                                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                            }
+                                        </select>
+                                    </div>
+                                </div> *@
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="layui-form-item ml10">
+                        <div class="layui-input-block">
+                            <button type="button" class="layui-btn" onclick="save()">查询</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var index = layer.load(1, {
+                shade: [0.5, '#000']
+            });
+            var userdata = $("#confirmFrm").serialize();
+            $.ajax({
+                type: "POST",
+                url: "/Admin/SysTools/SeeUserLoopDo?r=" + Math.random(1),
+                data: userdata,
+                dataType: "text",
+                success: function (data) {
+                    layer.close(index);
+                    layer.alert(data.replace(/\n/g, '<br />'), {area:['600px','650px']});
+                }
+            });
+        }
+
+
+        //编辑器
+        KindEditor.ready(function (K) {
+
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        function AreasProvinceInit(tagId, areasVal, form) {
+            for (var i = 0; i < provs_data.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(provs_data[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+            }
+            form.render();
+        }
+
+        function AreasProvinceSelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "City").html('<option value="">市</option>');
+            var list = citys_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasCitySelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            var list = dists_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasAreaSelected(tagId, form) {
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+        function movePrev(obj, tagId) {
+            $(obj).parent().prev().insertAfter($(obj).parent());
+            checkPics(tagId);
+        }
+        function moveNext(obj, tagId) {
+            $(obj).parent().next().insertBefore($(obj).parent());
+            checkPics(tagId);
+        }
+        function deletePic(obj, tagId) {
+            $(obj).parent().remove();
+            checkPics(tagId);
+        }
+        function checkPics(tagId) {
+            var pics = "";
+            var texts = "";
+            $("#" + tagId + "Image div img").each(function (i) {
+                pics += $(this).attr("src").replace(osshost, '') + "|";
+            });
+            $("#" + tagId + "Image div input").each(function (i) {
+                texts += $(this).val() + "|";
+            });
+            if (pics == "") {
+                $("#" + tagId).val("");
+            } else {
+                pics = pics.substring(0, pics.length - 1);
+                texts = texts.substring(0, pics.length - 1);
+                $("#" + tagId).val(pics + "#cut#" + texts);
+            }
+        }
+        function checkBox(tagId) {
+            var text = "";
+            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
+                text += $(this).val() + ",";
+            });
+            $("#" + tagId).val(text);
+        }
+        function showBigPic(picpath) {
+            parent.layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                area: ['auto', 'auto'],
+                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
+            });
+        }
+
+
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            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>

Models/PosMachinesTwo.cs

@@ -56,5 +56,7 @@ namespace MySystem.Models
         public decimal OpReserve2 { get; set; }
         public decimal OpReserve1 { get; set; }
         public int OpId { get; set; }
+        public DateTime? RecycStartDate { get; set; }
+        public string SourcePosSn { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -8661,6 +8661,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.RecycEndDate).HasColumnType("datetime");
 
+                entity.Property(e => e.RecycStartDate).HasColumnType("datetime");
+
                 entity.Property(e => e.ScanQrTrade).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.SeoDescription)
@@ -8680,6 +8682,11 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
+                entity.Property(e => e.SourcePosSn)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.SourceStoreId).HasColumnType("int(11)");
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");