Merge branch 'feature-dgy-功能修复和辅助工具' into feature-dgy-后台测试

AppStart/ExcelHelper.cs

@@ -1372,6 +1372,10 @@ namespace MySystem
                         db.Dispose();
                     }
                 }
+                else
+                {
+                    Thread.Sleep(5000);
+                }
                 // return "success|" + SuccessCount;
             }
         }

AppStart/Helper/SycnHelpProfitService.cs

@@ -86,6 +86,7 @@ namespace MySystem
                 decimal ProfitMoney = decimal.Parse(dr[2].ToString());
                 decimal TradeAmt = decimal.Parse(dr[3].ToString());
                 var tran = db.Database.BeginTransaction();
+                bool op = false;
                 try
                 {
                     Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -125,12 +126,17 @@ namespace MySystem
                     }).Entity;
                     db.SaveChanges();
                     tran.Commit();
+                    op = true;
                 }
                 catch (Exception ex)
                 {
                     function.WriteLog(DateTime.Now.ToString() + "\n" + UserId + "," + ProfitMoney + "\n" + ex.ToString(), "同步助利宝分润异常");
                     tran.Rollback();
                 }
+                if(op)
+                {
+                    RedisDbconn.Instance.AddList("UserMonthFeeQueue", UserId.ToString());
+                }
                 function.WriteLog(index.ToString(), "同步补贴数据");
             }
             OtherMySqlConn.dtable("update HelpProfitReward set Status=2 where Status=1 and TradeMonth='" + month + "'");

AppStart/Helper/SycnProfitServiceV2.cs

@@ -110,6 +110,7 @@ namespace MySystem
                 {
                     function.WriteLog("分润:" + BrandId + ":" + dt.Rows.Count, "同步分润数据");
                     int index = 0;
+                    List<int> UserIds = new List<int>();
                     foreach (DataRow dr in dt.Rows)
                     {
                         index += 1;
@@ -154,6 +155,10 @@ namespace MySystem
                                 Remark = DirectFlag == 1 ? "直拓商户分润" : "品牌推广服务费",
                             }).Entity;
                             db.SaveChanges();
+                            if(!UserIds.Contains(UserId))
+                            {
+                                UserIds.Add(UserId);
+                            }
                             tran.Commit();
                         }
                         catch (Exception ex)
@@ -164,6 +169,10 @@ namespace MySystem
                         startid = int.Parse(dr["Id"].ToString());
                         function.WriteLog(index.ToString(), "同步分润数据");
                     }
+                    foreach(int UserId in UserIds)
+                    {
+                        RedisDbconn.Instance.AddList("UserMonthFeeQueue", UserId.ToString());
+                    }
                 }
                 else
                 {

AppStart/OpExcelHelper.cs

@@ -242,6 +242,10 @@ namespace MySystem
                         db.Dispose();
                     }
                 }
+                else
+                {
+                    Thread.Sleep(5000);
+                }
                 // return "success|" + SuccessCount;
             }
         }

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -203,8 +203,15 @@ namespace MySystem.Areas.Admin.Controllers
                 //循环开始时间
                 if (!string.IsNullOrEmpty(dic["RecycEndDate"].ToString()))
                 {
-                    var RecycStartDate = Convert.ToDateTime(dic["RecycEndDate"].ToString()).AddDays(-360).ToString("yyyy-MM-dd HH:mm:ss");
-                    dic["RecycStartDate"] = RecycStartDate;
+                    // var RecycStartDate = Convert.ToDateTime(dic["RecycEndDate"].ToString()).AddDays(-360).ToString("yyyy-MM-dd HH:mm:ss");
+                    // dic["RecycStartDate"] = RecycStartDate;
+                    string PosSn = dic["PosSn"].ToString();
+                    bool op = db.StoreChangeHistory.Any(m => m.SnNo == PosSn && m.TransType == 2);
+                    if(op)
+                    {
+                        StoreChangeHistory item = db.StoreChangeHistory.FirstOrDefault(m => m.SnNo == PosSn && m.TransType == 2) ?? new StoreChangeHistory();
+                        dic["RecycStartDate"] = item.ToDate == null ? "" : item.ToDate.Value.ToString("yyyy-MM-dd");
+                    }
                 }
 
                 //实际押金

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1698,9 +1698,9 @@ namespace MySystem.Areas.Admin.Controllers
                                         if (userAmount.ValidAmount - amount >= 0)
                                         {
                                             userAmount.ValidAmount -= amount;
-                                            posInfo.OpReserve3 += amount;
-                                            posInfo.OpReserve1 = 0;
-                                            posInfo.OpReserve2 = 0;
+                                            posInfo.OpReserve3 += amount; //关联分仓额度
+                                            posInfo.OpReserve1 = 0; //未使用额度
+                                            posInfo.OpReserve2 = 0; //可提现额度
                                             opdb.SaveChanges();
                                         }
                                         else

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();
@@ -1165,22 +1188,27 @@ namespace MySystem.Areas.Admin.Controllers
             string ActiveTime = reward.CreateDate == null ? "" : reward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string ActiveTime6 = lisreward.CreateDate == null ? "" : lisreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string result = "";
+            result += "机器持有人顶级：创客编号：" + posTopUser.MakerCode + "，姓名：" + posTopUser.RealName + "\n";
+            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 += "机器持有人顶级：创客编号：" + posTopUser.MakerCode + "，姓名：" + posTopUser.RealName + "，手机号：" + posTopUser.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)
             {
                 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
             {
@@ -1197,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)
@@ -1208,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;
         }
         //解析金控日志
@@ -1682,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)
@@ -1832,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;
@@ -2578,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);
@@ -2591,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)
             {
@@ -2751,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"));
                             }
                         }
@@ -2761,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 "发放成功";
@@ -2833,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";
@@ -2850,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)
             {
@@ -3588,7 +3693,6 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                pos.UpdateDate = DateTime.Now;
                 pos.BindMerchantId = posMerchant.Id;
                 db.SaveChanges();
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "根据机具号、商户号、商户姓名关联");
@@ -3682,35 +3786,28 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入划拨对象创客编号";
             }
             var query = PosSn + "," + FromMakerCode + "," + ToMakerCode;
-            var user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == FromMakerCode) ?? new UserForMakerCode();
-            var tuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ToMakerCode) ?? new UserForMakerCode();
-            var fUserId = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
-            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
             var machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
-            var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BuyUserId == user.UserId) ?? new PosMachinesTwo();
+            var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId) ?? new PosMachinesTwo();
             if (posInfo.Id == 0)
             {
                 return "机具" + PosSn + "不存在";
             }
+            var user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == FromMakerCode) ?? new UserForMakerCode();
+            var tuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ToMakerCode) ?? new UserForMakerCode();
+            var fUserId = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
             if (fUserId.Id == 0)
             {
                 return "来源创客" + FromMakerCode + "不存在";
             }
+            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
             if (tUserId.Id == 0)
             {
                 return "划拨创客" + ToMakerCode + "不存在";
             }
             if (posInfo.BindingState == 0)
             {
-                if (posInfo.UserId == 0 || posInfo.BuyUserId == posInfo.UserId)
-                {
-                    posInfo.BuyUserId = tUserId.Id;
-                    posInfo.UserId = tUserId.Id;
-                }
-                else
-                {
-                    posInfo.BuyUserId = tUserId.Id;
-                }
+                posInfo.BuyUserId = tUserId.Id;
+                posInfo.UserId = tUserId.Id;
                 db.SaveChanges();
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "划拨创客机具");
             }
@@ -3766,5 +3863,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/Controllers/MainServer/UsersController.cs

@@ -1057,7 +1057,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and ParentUserId=" + ParentId;
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Users", Fields, "Id desc", "True", 1, 20000, condition, "ParentUserId,ParentNav,UserLevel,SettleAmount,CashFreezeAmt,CertId,Mobile,MerchantType,MerchantDate,AuthFlag,RiskFlag,CreateDate", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Users", Fields, "Id desc", "True", 1, 20000, condition, "MakerCode,RealName,ParentUserId,ParentNav,UserLevel,SettleAmount,CashFreezeAmt,CertId,Mobile,MerchantType,MerchantDate,AuthFlag,RiskFlag,CreateDate", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {

Areas/Admin/Controllers/OperateServer/StoreMachineApplyOperateController.cs

@@ -259,7 +259,7 @@ namespace MySystem.Areas.Admin.Controllers
             Models.WebCMSEntities db = new Models.WebCMSEntities();
             // Users users = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
             SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Status == 0 && m.UserId == editData.UserId) ?? new SysAdmin();
-            ViewBag.UserId = sysAdmin.Id;
+            ViewBag.UserId = sysAdmin.UserId;
             ViewBag.MakerCode = sysAdmin.MakerCode;
             ViewBag.MakerName = sysAdmin.MakerName;
             ViewBag.UseAmount = editData.UseAmount;
@@ -315,7 +315,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ErpCode", data.ErpCode); //快递单号
             Fields.Add("UserId", data.UserId); //创客
 
-            Fields.Add("SeoTitle", SysUserName + '-' + SysRealName);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
             new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("StoreMachineApply", Fields, data.Id);
@@ -383,7 +382,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string Close(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "StoreMachineApply", "close");
+            AddSysLog(Id, "StoreMachineApplyOperate", "close");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -99,7 +99,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerName"] = sysAdmin.MakerName;
 
                 //登陆地址
-                dic["LoginUrl"] = OpHost + "Admin/" + dbconn.Encrypt3DES(sysAdmin.Sort.ToString(), "kxs12345") + "/Login";
+                dic["LoginUrl"] = OpHost + "Admin/" + dbconn.Encrypt3DES(sysAdmin.Sort.ToString(), "kxs12345").Replace("/", "%2F") + "/Login";
 
                 //未使用用额度
                 UserAccount userAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort == Id) ?? new UserAccount();

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>

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

@@ -42,7 +42,6 @@
                                     <div class="layui-input-inline">
                                         <select id="FeeType" name="FeeType" lay-search="" lay-filter="FeeType">
                                             <option value="0" selected="selected">0.6</option>
-                                            <option value="1">0.63</option>
                                         </select>
                                     </div>
                                 </div>

Areas/Admin/Views/OperateServer/StoreMachineApplyOperate/Edit.cshtml

@@ -50,10 +50,10 @@
                                         value="@ViewBag.MakerName" maxlength="32" lay-verify="required|"
                                         autocomplete="off" placeholder="">
                                         <input class="layui-input" type="hidden" readonly id="UserId" name="UserId"
-                                        value="@ViewBag.UserId" maxlength="32" lay-verify="required|"
+                                        value="@ViewBag.UserId" maxlength="32" lay-verify=""
                                         autocomplete="off" placeholder="">
                                         <input class="layui-input" type="hidden" readonly id="UseAmount" name="UseAmount"
-                                        value="@ViewBag.UseAmount" maxlength="32" lay-verify="required|"
+                                        value="@ViewBag.UseAmount" maxlength="32" lay-verify=""
                                         autocomplete="off" placeholder="">
                                 </div>
                             </div>
@@ -77,7 +77,7 @@
                                         <div class="layui-input-inline productlist">
                                             <input type="hidden" name="BrandId" value="@item["BrandId"]">
                                             <input class="layui-input" type="text" @(editData.Status == 1 ? "readonly" : "") name="ApplyNum" placeholder=""
-                                            autocomplete="off" value="@item["Num"]">
+                                            autocomplete="off" value="@item["Num"]" readonly>
                                         </div>
                                     </div>
                                 </div>

Models/MsgAlert.cs

@@ -9,11 +9,8 @@ namespace MySystem.Models
         public int Sort { get; set; }
         public int QueryCount { get; set; }
         public int Status { get; set; }
-        public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
@@ -36,5 +33,8 @@ namespace MySystem.Models
         public string Summary { get; set; }
         public string Title { get; set; }
         public int MsgType { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public int Version { get; set; }
     }
 }

Models/PosMachinesTwo.cs

@@ -52,9 +52,11 @@ namespace MySystem.Models
         public DateTime? UpFeeDate { get; set; }
         public ulong DownFeeFlag { get; set; }
         public ulong UpFeeFlag { get; set; }
-        public int OpId { get; set; }
         public decimal OpReserve3 { get; set; }
         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/PosMerchantInfo.cs

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

Models/ProfitRecordCopy1.cs

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

Models/ProfitRewardRecordCopy1.cs

@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.Models
-{
-    public partial class ProfitRewardRecordCopy1
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public int TopUserId { get; set; }
-        public string RecordNo { get; set; }
-        public string TradeMonth { get; set; }
-        public string Remark { get; set; }
-        public int CheckStatus { get; set; }
-        public decimal QrDebitAddOrSubRate { get; set; }
-        public decimal QrDebitProfitStandardRate { get; set; }
-        public decimal QrDebitProfitRate { get; set; }
-        public decimal QrCreditAddOrSubRate { get; set; }
-        public decimal QrCreditProfitStandardRate { get; set; }
-        public decimal QrCreditProfitRate { get; set; }
-        public decimal DebitCapSingleReward { get; set; }
-        public decimal HelpDebitAddOrSubRate { get; set; }
-        public decimal HelpDebitProfitStandardRate { get; set; }
-        public decimal HelpDebitProfitRate { get; set; }
-        public decimal NotHelpDebitAddOrSubRate { get; set; }
-        public decimal NotHelpDebitProfitStandardRate { get; set; }
-        public decimal NotHelpDebitProfitRate { get; set; }
-        public decimal HelpCreditAddOrSubRate { get; set; }
-        public decimal HelpCreditProfitStandardRate { get; set; }
-        public decimal HelpCreditProfitRate { get; set; }
-        public decimal NotHelpCreditAddOrSubRate { get; set; }
-        public decimal NotHelpCreditProfitStandardRate { get; set; }
-        public decimal NotHelpCreditProfitRate { get; set; }
-        public decimal DebitTradeCapProfit { get; set; }
-        public decimal HelpDebitNonTradeCapProfit { get; set; }
-        public decimal NotHelpDebitNonTradeCapProfit { get; set; }
-        public decimal NonQrDebitNonTradeCapProfit { get; set; }
-        public decimal QrDebitNonTradeCapProfit { get; set; }
-        public decimal DebitNonTradeCapProfit { get; set; }
-        public decimal HelpCreditTradeProfit { get; set; }
-        public decimal NotHelpCreditTradeProfit { get; set; }
-        public decimal NonQrCreditTradeProfit { get; set; }
-        public decimal QrCreditTradeProfit { get; set; }
-        public decimal CreditTradeProfit { get; set; }
-        public decimal TradeProfit { get; set; }
-        public int DebitCapTradeNum { get; set; }
-        public decimal DebitCapTradeAmt { get; set; }
-        public decimal HelpDebitNonCapTradeAmt { get; set; }
-        public decimal NotHelpDebitNonCapTradeAmt { get; set; }
-        public decimal NonQrDebitNotCapTradeAmt { get; set; }
-        public decimal QrDebitNotCapTradeAmt { get; set; }
-        public decimal DebitNonCapTradeAmt { get; set; }
-        public decimal HelpCreditTradeAmt { get; set; }
-        public decimal NotHelpCreditTradeAmt { get; set; }
-        public decimal NonQrCreditTradeAmt { get; set; }
-        public decimal QrCreditTradeAmt { get; set; }
-        public decimal CreditTradeAmt { get; set; }
-        public decimal TradeAmt { get; set; }
-        public decimal OtherDebitNotCapTradeAmt { get; set; }
-        public decimal OtherCreditTradeAmt { get; set; }
-        public decimal OtherTradeAmt { get; set; }
-        public int ProfitType { get; set; }
-        public int BrandId { get; set; }
-        public int MerchantId { get; set; }
-        public int UserId { get; set; }
-    }
-}

Models/ProfitSubsidyDetail04.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.Models
-{
-    public partial class ProfitSubsidyDetail04
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string Remark { get; set; }
-        public decimal SubsidyProfit { get; set; }
-        public decimal SubsidyProfitRate { get; set; }
-        public decimal CreditProfitRate { get; set; }
-        public decimal NonQrCreditTradeAmt { get; set; }
-        public decimal QrCreditTradeAmt { get; set; }
-        public decimal CreditTradeAmt { get; set; }
-        public int SubsidyType { get; set; }
-        public int SubsidyUserId { get; set; }
-        public ulong MerHelpFlag { get; set; }
-        public int BelongUserId { get; set; }
-        public DateTime? MerStandardDate { get; set; }
-        public DateTime? MerRegTime { get; set; }
-        public string SnNo { get; set; }
-        public string MerNo { get; set; }
-        public int MerchantId { get; set; }
-        public string TradeMonth { get; set; }
-        public string ProductName { get; set; }
-        public int BrandId { get; set; }
-        public string RecordNo { get; set; }
-    }
-}

Models/ProfitSubsidyDetailCopy1.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.Models
-{
-    public partial class ProfitSubsidyDetailCopy1
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string Remark { get; set; }
-        public decimal SubsidyProfit { get; set; }
-        public decimal SubsidyProfitRate { get; set; }
-        public decimal CreditProfitRate { get; set; }
-        public decimal NonQrCreditTradeAmt { get; set; }
-        public decimal QrCreditTradeAmt { get; set; }
-        public decimal CreditTradeAmt { get; set; }
-        public int SubsidyType { get; set; }
-        public int SubsidyUserId { get; set; }
-        public ulong MerHelpFlag { get; set; }
-        public int BelongUserId { get; set; }
-        public DateTime? MerStandardDate { get; set; }
-        public DateTime? MerRegTime { get; set; }
-        public string SnNo { get; set; }
-        public string MerNo { get; set; }
-        public int MerchantId { get; set; }
-        public string TradeMonth { get; set; }
-        public string ProductName { get; set; }
-        public int BrandId { get; set; }
-        public string RecordNo { get; set; }
-    }
-}

Models/SchoolMaterials.cs

@@ -9,11 +9,8 @@ namespace MySystem.Models
         public int Sort { get; set; }
         public int QueryCount { get; set; }
         public int Status { get; set; }
-        public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }

Models/SchoolSignInData.cs

@@ -9,11 +9,8 @@ namespace MySystem.Models
         public int Sort { get; set; }
         public int QueryCount { get; set; }
         public int Status { get; set; }
-        public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }

Models/SchoolSignInRecord.cs

@@ -9,11 +9,8 @@ namespace MySystem.Models
         public int Sort { get; set; }
         public int QueryCount { get; set; }
         public int Status { get; set; }
-        public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }

Models/SchoolSignInTask.cs

@@ -9,11 +9,8 @@ namespace MySystem.Models
         public int Sort { get; set; }
         public int QueryCount { get; set; }
         public int Status { get; set; }
-        public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }

Models/SchoolSignInTaskRecord.cs

@@ -9,11 +9,8 @@ namespace MySystem.Models
         public int Sort { get; set; }
         public int QueryCount { get; set; }
         public int Status { get; set; }
-        public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }

Models/SubsidyRecordCopy1.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.Models
-{
-    public partial class SubsidyRecordCopy1
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public int TradeId { get; set; }
-        public string ParentNav { get; set; }
-        public string Remark { get; set; }
-        public int BrandId { get; set; }
-        public ulong DirectFlag { get; set; }
-        public int CapFlag { get; set; }
-        public int QrPayFlag { get; set; }
-        public decimal ProfitAmount { get; set; }
-        public DateTime? ClearDate { get; set; }
-        public DateTime? TradeDate { get; set; }
-        public string SnNo { get; set; }
-        public int MerBuddyType { get; set; }
-        public int HelpMonthCount { get; set; }
-        public ulong MerHelpFlag { get; set; }
-        public string MerNo { get; set; }
-        public int MerchantId { get; set; }
-        public int UserId { get; set; }
-    }
-}

Models/TradeRecordTest.cs

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

Models/UserAccount.cs

@@ -38,10 +38,10 @@ namespace MySystem.Models
         public decimal ValidAmount { get; set; }
         public decimal LeaderBalanceAmount { get; set; }
         public decimal HelpProfitBalanceAmount { get; set; }
-        public decimal TempAmountForBalance { get; set; }
-        public decimal ThisMonthPreAmount { get; set; }
-        public decimal ValidPreAmount { get; set; }
         public decimal SmallStoreDeposit { get; set; }
+        public decimal ValidPreAmount { get; set; }
+        public decimal ThisMonthPreAmount { get; set; }
+        public decimal TempAmountForBalance { get; set; }
         public decimal StoreDeposit { get; set; }
     }
 }

Models/Users.cs

@@ -88,11 +88,11 @@ namespace MySystem.Models
         public string DeviceType { get; set; }
         public DateTime? HelpProfitAgreeDate { get; set; }
         public ulong HelpProfitAgree { get; set; }
-        public int ThisMonthSend { get; set; }
-        public int StoreStock { get; set; }
-        public DateTime? CreateStoreDate { get; set; }
-        public ulong IsSign { get; set; }
-        public DateTime? SignDate { get; set; }
         public string SignPic { get; set; }
+        public DateTime? SignDate { get; set; }
+        public ulong IsSign { get; set; }
+        public DateTime? CreateStoreDate { get; set; }
+        public int StoreStock { get; set; }
+        public int ThisMonthSend { get; set; }
     }
 }

Startup.cs

@@ -155,11 +155,11 @@ namespace MySystem
         {
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
             Library.OtherMySqlConn.connstr = Configuration["Setting:SqlConnStr"];
-            System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'KxsMainServer2'");
+            System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'KxsMainServer'");
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             {
                 Dictionary<string, string> Columns = new Dictionary<string, string>();
-                System.Data.DataTable columncollection = Library.OtherMySqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'KxsMainServer2' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
+                System.Data.DataTable columncollection = Library.OtherMySqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'KxsMainServer' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
                 foreach (System.Data.DataRow column in columncollection.Rows)
                 {
                     string datatype = column["DATA_TYPE"].ToString();

appsettings.json

@@ -18,8 +18,8 @@
     "Host": "http://test.bs.kexiaoshuang.com/",
     "OssHost": "http://oss.kexiaoshuang.com",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;charset=utf8;",
-    "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
+    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
+    "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
     "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",
     "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",

wwwroot/layuiadmin/modules/SysAdminRole_Admin.js

@@ -239,7 +239,7 @@ layui.config({
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
                     

wwwroot/layuiadmin/modules_main/UserAccount_Admin.js

@@ -112,6 +112,8 @@ layui.config({
                 { field: 'ValidPreAmount', width: 110, title: '可用预发额度' ,sort: true},
                 { field: 'AccountStatusName', width: 110, title: '账户状态' ,sort: true},
                 { field: 'SeoDescription', width: 100, title: '备注' ,sort: true},
+                { field: 'LeaderReserve', width: 100, title: '盟主储蓄金' ,sort: true},
+                { field: 'LeaderBalanceAmount', width: 100, title: '盟主可提现余额' ,sort: true},
                 // { field: 'CreateDate', width: 200, title: '创建时间' ,sort: true},
                 { field: 'UpdateDate', width: 160, title: '冻结/解冻时间' ,sort: true},
                 { field: 'UpdateMan', width: 160, title: '操作信息' ,sort: true},