Merge branch 'feature-dgy-重置后台密码' into feature-dgy-后台测试

Areas/Admin/Controllers/HomeController.cs

@@ -343,5 +343,39 @@ namespace MySystem.Areas.Admin.Controllers
             OtherMySqlConn.connstr = "";
             return "ok";
         }
+
+
+        #region 通过用户Id修改登录密码
+        /// <summary>
+        /// 通过用户Id修改登录密码
+        /// </summary>
+        /// <returns></returns>
+        public string ChangeLoginPassworByIdDo(string SysId, string NewPassword,string Operator)
+        {
+            if (string.IsNullOrEmpty(SysId))
+            {
+                return "请输入旧密码";
+            }
+            if (string.IsNullOrEmpty(NewPassword))
+            {
+                return "请输入新密码";
+            }
+            if (string.IsNullOrEmpty(Operator))
+            {
+                return "请输入操作人信息";
+            }
+            var Id = int.Parse(SysId);
+            BsModels.SysAdmin sys = db.SysAdmin.FirstOrDefault(m => m.Id == Id);
+            if (sys != null)
+            {
+                sys.Password = function.MD5_32(NewPassword);
+                sys.UpdateMan = Operator;
+                db.SaveChanges();
+                return "success";
+            }
+            return "修改失败,未找到相关账号信息";
+        }
+
+        #endregion
     }
 }

Areas/Admin/Controllers/MainServer/LeaderReserveRecordController.cs

@@ -220,7 +220,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 SqlString += " and SeoKeyword=" + SeoKeyword;
             }
-            var Sql = "SELECT c.MakerCode '创客编号',c.RealName '创客姓名',DATE_FORMAT(c.CreateDate,'%Y-%m-%d %H:%i:%s') '创建时间',c.Remark '变动类型',(CASE WHEN c.ChangeType=1 THEN '增加' WHEN c.ChangeType=2 THEN '减少' ELSE '' end) '操作类型',c.Type1Num '电签兑换券张数',c.Type2Num '大POS兑换券张数',d.LeaderBalanceAmount '可提现余额',c.ChangeAmt '使用额度',c.BeforeAmt '使用前剩余额度',c.AfterAmt '使用后剩余额度' FROM(SELECT a.*,b.MakerCode,b.RealName FROM(SELECT Id,UserId,CreateDate,ChangeAmt,BeforeAmt,AfterAmt,Remark,ChangeType,REPLACE (JSON_EXTRACT (SeoTitle, '$[0].Num'),'\\\"','') AS 'Type1Num', REPLACE (JSON_EXTRACT (SeoTitle, '$[1].Num'),'\\\"','') AS 'Type2Num' FROM LeaderReserveRecord WHERE 1=1 " + SqlString + ") a LEFT JOIN Users b ON a.UserId=b.Id) c LEFT JOIN UserAccount d ON c.UserId=d.Id";
+            var Sql = "SELECT c.MakerCode '创客编号',c.RealName '创客姓名',DATE_FORMAT(c.CreateDate,'%Y-%m-%d %H:%i:%s') '创建时间',c.Remark '变动类型',c.SeoDescription '备注',(CASE WHEN c.ChangeType=1 THEN '增加' WHEN c.ChangeType=2 THEN '减少' ELSE '' end) '操作类型',c.Type1Num '电签兑换券张数',c.Type2Num '大POS兑换券张数',d.LeaderBalanceAmount '可提现余额',c.ChangeAmt '使用额度',c.BeforeAmt '使用前剩余额度',c.AfterAmt '使用后剩余额度' FROM(SELECT a.*,b.MakerCode,b.RealName FROM(SELECT Id,UserId,CreateDate,ChangeAmt,BeforeAmt,AfterAmt,Remark,SeoDescription,ChangeType,REPLACE (JSON_EXTRACT (SeoTitle, '$[0].Num'),'\\\"','') AS 'Type1Num', REPLACE (JSON_EXTRACT (SeoTitle, '$[1].Num'),'\\\"','') AS 'Type2Num' FROM LeaderReserveRecord WHERE 1=1 " + SqlString + ") a LEFT JOIN Users b ON a.UserId=b.Id) c LEFT JOIN UserAccount d ON c.UserId=d.Id";
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var FileName = "盟主储蓄金变动记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
@@ -286,6 +286,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["LeaderBalanceAmount"] = userAccount.LeaderBalanceAmount;
 
                 dic["Remark"] = leaderReserveRecord.Remark;
+                dic["SeoDescription"] = leaderReserveRecord.SeoDescription;
                 dic["CreateDate"] = leaderReserveRecord.CreateDate;
 
                 //变动类型
@@ -331,6 +332,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("RealName", "创客姓名");
             ReturnFields.Add("CreateDate", "创建时间");
             ReturnFields.Add("Remark", "变动类型");
+            ReturnFields.Add("SeoDescription", "备注");
             ReturnFields.Add("ChangeTypeName", "操作类型");
             ReturnFields.Add("dPosCoupons", "电签兑换券张数");
             ReturnFields.Add("bPosCoupons", "大POS兑换券张数");

Areas/Admin/Controllers/MainServer/LeadersController.cs

@@ -119,8 +119,8 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic["LeaderReserve"] = userAccount.LeaderReserve;
                 dic["LeaderBalanceAmount"] = userAccount.LeaderBalanceAmount;
-                var lastMonth = DateTime.Now.AddMonths(-1).ToString("yyyy-MM");
-                var leaderReconRecord = db.LeaderReconRecord.FirstOrDefault(m => m.UserId == UserId && m.StatMonth == lastMonth) ?? new LeaderReconRecord();
+                var StatMonth = DateTime.Now.ToString("yyyy-MM");
+                var leaderReconRecord = db.LeaderReconRecord.FirstOrDefault(m => m.UserId == UserId && m.StatMonth == StatMonth) ?? new LeaderReconRecord();
                 dic["LastMonthReserve"] = leaderReconRecord.ReserveAmount;
                 dic["LastMonthBalanceAmount"] = leaderReconRecord.BalanceAmount;
 
@@ -724,7 +724,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string QuickExportExcelDo(string UserIdMakerCode, string LeaderLevelSelect, string LeaderStatusSelect, string LastBuyDateData, string ExpiredDateData, string CreateDateData)
         {
-            var lastMonth = DateTime.Now.AddMonths(-1).ToString("yyyy-MM");
+            var lastMonth = DateTime.Now.ToString("yyyy-MM");
             string condition = " and a.Status>-1 and d.StatMonth='" + lastMonth + "'";
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -329,10 +329,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 JsonData dr = list[i];
                 string PosNo = dr[0].ToString(); // 机具Sn
-                var Amount = double.Parse(dr[1].ToString()); // 调整费率
-                int Kind = int.Parse(dr[2].ToString()); // 1 调升 2 调低(0.6) 3 调低(0.63)
+                var Amount = decimal.Parse(dr[1].ToString()); // 调整费率
+                int Kind = int.Parse(dr[2].ToString()); // 1 调升 2 调低(0.63) 3 调低(0.6)
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosNo) ?? new PosMachinesTwo();
-                if (pos.UpFeeFlag == 1 && pos.DownFeeFlag == 0)
+                var poschange = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == pos.Id && m.ChangeFee == Amount) ?? new PosMachinesFeeChangeRecord();
+                if ((pos.UpFeeFlag == 1 && pos.DownFeeFlag == 0) || (pos.UpFeeFlag == 1 && pos.DownFeeFlag == 1 && poschange.Status == 0))
                 {
                     if (Kind < 2)
                     {
@@ -344,7 +345,7 @@ namespace MySystem.Areas.Admin.Controllers
                         pos.DownFeeFlag = 1;
                         pos.DownFeeDate = DateTime.Now;
                         pos.DownFeeMan = SysUserName + "_" + SysRealName;
-                        var poschange = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == pos.Id);
+                        pos.DownFee = Amount;
                         poschange.Status = 1;
                         db.SaveChanges();
                         dnposIds.Add(pos.Id);
@@ -358,7 +359,6 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
                 }
-
                 else
                 {
                     warning += PosNo + ",该机具不符合调低条件，请检查好后全部重新导入";

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -174,7 +174,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
 
                 //是否为第一台机具
-                int IsFirst = int.Parse(dic["IsFirst"].ToString());
+                int IsFirst = int.Parse(dic["FirstFlag"].ToString());
                 if (IsFirst == 0) dic["IsFirst"] = "否";
                 if (IsFirst == 1) dic["IsFirst"] = "是";
 

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -197,7 +197,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
 
                 //是否为第一台机具
-                int IsFirst = int.Parse(dic["IsFirst"].ToString());
+                int IsFirst = int.Parse(dic["FirstFlag"].ToString());
                 if (IsFirst == 0) dic["IsFirst"] = "否";
                 if (IsFirst == 1) dic["IsFirst"] = "是";
 
@@ -901,7 +901,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
 
                 //是否为第一台机具
-                int IsFirst = int.Parse(dic["IsFirst"].ToString());
+                int IsFirst = int.Parse(dic["FirstFlag"].ToString());
                 if (IsFirst == 0) dic["IsFirst"] = "否";
                 if (IsFirst == 1) dic["IsFirst"] = "是";
 

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -540,7 +540,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             var amount = 0.00M;
             List<Dictionary<string, object>> diclist = new List<Dictionary<string, object>>();
-            DataTable dt = OtherMySqlConn.dtable("SELECT a.BrandId,a.PosSn,a.BindMerchantId,a.SeoKeyword,b.KqMerNo,b.MerIdcardNo,b.MerchantName,b.MerchantMobile FROM PosMachinesTwo a,PosMerchantInfo b WHERE a.`Status`>-1 AND a.SeoKeyword!='' AND a.SeoKeyword!='0' AND a.SeoKeyword IS NOT NULL AND a.IsFirst=1 AND b.StandardMonths=10 AND b.StandardStatus=4 AND a.BindMerchantId=b.Id " + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT a.BrandId,a.PosSn,a.BindMerchantId,a.SeoKeyword,b.KqMerNo,b.MerIdcardNo,b.MerchantName,b.MerchantMobile FROM PosMachinesTwo a,PosMerchantInfo b WHERE a.`Status`>-1 AND a.SeoKeyword!='' AND a.SeoKeyword!='0' AND a.SeoKeyword IS NOT NULL AND a.FirstFlag=1 AND b.StandardMonths=10 AND b.StandardStatus=4 AND a.BindMerchantId=b.Id " + condition);
             if (dt.Rows.Count > 0)
             {
                 foreach (DataRow item in dt.Rows)
@@ -631,7 +631,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             var amount = 0.00M;
             List<Dictionary<string, object>> diclist = new List<Dictionary<string, object>>();
-            DataTable dt = OtherMySqlConn.dtable("SELECT a.BrandId,a.PosSn,a.BindMerchantId,a.SeoKeyword,b.KqMerNo,b.MerIdcardNo,b.MerchantName,b.MerchantMobile FROM PosMachinesTwo a,PosMerchantInfo b WHERE a.`Status`>-1 AND a.SeoKeyword!='' AND a.SeoKeyword!='0' AND a.SeoKeyword IS NOT NULL  AND a.IsFirst=0 AND b.StandardMonths=10 AND b.StandardStatus=4 AND a.BindMerchantId=b.Id " + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT a.BrandId,a.PosSn,a.BindMerchantId,a.SeoKeyword,b.KqMerNo,b.MerIdcardNo,b.MerchantName,b.MerchantMobile FROM PosMachinesTwo a,PosMerchantInfo b WHERE a.`Status`>-1 AND a.SeoKeyword!='' AND a.SeoKeyword!='0' AND a.SeoKeyword IS NOT NULL  AND a.FirstFlag=0 AND b.StandardMonths=10 AND b.StandardStatus=4 AND a.BindMerchantId=b.Id " + condition);
             if (dt.Rows.Count > 0)
             {
                 foreach (DataRow item in dt.Rows)
@@ -1110,7 +1110,7 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             Dictionary<string, object> curData = new Dictionary<string, object>();
                             var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == item.KqSnNo) ?? new PosMachinesTwo();
-                            int IsFirst = int.Parse(posInfo.IsFirst.ToString());
+                            int IsFirst = int.Parse(posInfo.FirstFlag.ToString());
                             var IsFirstName = "";
                             if (IsFirst == 1) IsFirstName = "首台";
                             if (IsFirst == 0) IsFirstName = "非首台";
@@ -1166,7 +1166,7 @@ namespace MySystem.Areas.Admin.Controllers
                     if (thisdate <= otherdate)
                     {
                         changeFlag = 1;
-                        posInfo.IsFirst = 0;
+                        posInfo.FirstFlag = 0;
                         flag = changeFlag;
                     }
                     else
@@ -1177,13 +1177,13 @@ namespace MySystem.Areas.Admin.Controllers
                 if (flag == 1)
                 {
                     AddSysLog(PosSn, "PosMachinesTwo", "SetFirstPos");
-                    pos.IsFirst = 1;
+                    pos.FirstFlag = 1;
                 }
             }
             else
             {
                 AddSysLog(PosSn, "PosMachinesTwo", "SetFirstPos");
-                pos.IsFirst = 1;
+                pos.FirstFlag = 1;
             }
             db.SaveChanges();
             return "success";

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1228,6 +1228,8 @@ namespace MySystem.Areas.Admin.Controllers
                             toStore.LaveNum += 1;
                             fromStore.TotalNum -= 1;
                             fromStore.LaveNum -= 1;
+                            posInfo.FirstFlag = 0;
+                            posInfo.IsExecute = 0;
                             PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                             db.SaveChanges();
                         }
@@ -1320,6 +1322,8 @@ namespace MySystem.Areas.Admin.Controllers
                             fuserMachineData.UnBindCount -= 1;
                             toStore.LaveNum += 1;
                             toStore.TotalNum += 1;
+                            posInfo.FirstFlag = 0;
+                            posInfo.IsExecute = 0;
                             PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                             db.SaveChanges();
                         }
@@ -1416,7 +1420,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int StoreKind = int.Parse(dic["StoreKind"].ToString());
                 if (StoreKind == 0) dic["StoreKind"] = "分仓";
                 if (StoreKind == 1) dic["StoreKind"] = "总仓";
-                
+
                 //小分仓
                 int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
                 int PreCount = db.PreSendStockDetail.Count(m => m.FromStoreId == Id && m.ApplyFlag == 0 && m.Status >= 0 && m.Status <= 1);

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1843,6 +1843,8 @@ namespace MySystem.Areas.Admin.Controllers
                 newpos.PrizeParams = oldpos.PrizeParams;
                 newpos.LeaderUserId = oldpos.LeaderUserId;
                 oldpos.Status = -1;
+                newpos.FirstFlag = oldpos.FirstFlag;
+                newpos.IsExecute = oldpos.IsExecute;
 
                 //对应调整客小爽企业版数据
                 var posInfo = db.BusinessPartnerPos.FirstOrDefault(m => m.PosId == oldpos.Id);
@@ -2077,6 +2079,8 @@ namespace MySystem.Areas.Admin.Controllers
 
                     newpos.StoreId = oldpos.StoreId;
                     newpos.PreUserId = oldpos.PreUserId;
+                    newpos.FirstFlag = oldpos.FirstFlag;
+                    newpos.IsExecute = oldpos.IsExecute;
 
                     if (!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
                     {
@@ -2124,6 +2128,8 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.BuyUserId = 0;
                     oldpos.UserId = 0;
                     oldpos.Status = -1;
+                    oldpos.FirstFlag = 0;
+                    oldpos.IsExecute = 0;
                     PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
                     opdb.SaveChanges();
@@ -2274,6 +2280,8 @@ namespace MySystem.Areas.Admin.Controllers
                     newpos.PreUserId = oldpos.PreUserId;
                     newpos.IsFirst = oldpos.IsFirst;
                     newpos.TransferTime = oldpos.TransferTime;
+                    newpos.FirstFlag = oldpos.FirstFlag;
+                    newpos.IsExecute = oldpos.IsExecute;
 
                     if (!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
                     {
@@ -2350,6 +2358,8 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.BuyUserId = 0;
                     oldpos.UserId = 0;
                     oldpos.Status = -1;
+                    oldpos.FirstFlag = 0;
+                    oldpos.IsExecute = 0;
                     PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
                     opdb.SaveChanges();
@@ -2615,6 +2625,8 @@ namespace MySystem.Areas.Admin.Controllers
                 newpos.PrizeParams = oldpos.PrizeParams;
                 newpos.LeaderUserId = oldpos.LeaderUserId;
                 newpos.BindMerchantId = oldpos.BindMerchantId;
+                newpos.FirstFlag = oldpos.FirstFlag;
+                newpos.IsExecute = oldpos.IsExecute;
 
                 newpos.PreUserId = oldpos.PreUserId;
 
@@ -2667,6 +2679,8 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.SourcePosSn = null;
                 oldpos.BuyUserId = 0;
                 oldpos.UserId = 0;
+                oldpos.FirstFlag = 0;
+                oldpos.IsExecute = 0;
 
                 PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                 db.SaveChanges();
@@ -4712,6 +4726,8 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.SourcePosSn = null;
                 oldpos.BuyUserId = 0;
                 oldpos.UserId = 0;
+                oldpos.FirstFlag = 0;
+                oldpos.IsExecute = 0;
                 PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
             }
             if (!string.IsNullOrEmpty(error))
@@ -5079,6 +5095,8 @@ namespace MySystem.Areas.Admin.Controllers
                     pos.SourcePosSn = null;
                     pos.BuyUserId = 0;
                     pos.UserId = 0;
+                    pos.FirstFlag = 0;
+                    pos.IsExecute = 0;
                     PublicFunction.ClearPosHistory(db, pos.PosSn); //清除机具历史记录
                 }
                 else
@@ -5245,7 +5263,7 @@ namespace MySystem.Areas.Admin.Controllers
                     // {
                     //     IsFirst = "非首台";
                     // }
-                    if (pos.IsFirst == 1)
+                    if (pos.FirstFlag == 1)
                     {
                         IsFirst = "首台";
                     }

Areas/Admin/Controllers/OperateServer/StoreHouseOperateController.cs

@@ -738,6 +738,8 @@ namespace MySystem.Areas.Admin.Controllers
                                 posInfo.LeaderUserId = 0;
                                 posInfo.PreUserId = 0;
                                 posInfo.IsFirst = 0;
+                                posInfo.FirstFlag = 0;
+                                posInfo.IsExecute = 0;
                                 fuserMachineData.TotalMachineCount -= 1;
                                 fuserMachineData.UnBindCount -= 1;
                                 toStore.TotalNum += 1;
@@ -831,6 +833,8 @@ namespace MySystem.Areas.Admin.Controllers
                                 posInfo.LeaderUserId = 0;
                                 posInfo.PreUserId = 0;
                                 posInfo.IsFirst = 0;
+                                posInfo.FirstFlag = 0;
+                                posInfo.IsExecute = 0;
                                 fuserMachineData.TotalMachineCount -= 1;
                                 fuserMachineData.UnBindCount -= 1;
                                 toStore.LaveNum += 1;

wwwroot/layuiadmin/modules_main/LeaderReserveRecord_Admin.js

@@ -96,6 +96,7 @@ layui.config({
             , { field: 'UserIdRealName', width: 110, title: '真实姓名', sort: true }
             , { field: 'CreateDate', width: 180, title: '创建时间', sort: true }
             , { field: 'Remark', width: 110, title: '变动类型', sort: true }
+            , { field: 'SeoDescription', width: 110, title: '备注', sort: true }
             , { field: 'ChangeTypeName', width: 110, title: '操作类型', sort: true }
             , { field: 'SourceMakerCode', width: 110, title: '购券创客', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '订单编号', sort: true }