Просмотр исходного кода

Merge branch 'feature-dgy-立刷加码奖励' into feature-dgy-后台测试

DuGuYang 2 лет назад
Родитель
Сommit
5ab690e73f

+ 3 - 0
AppStart/ExcelHelper.cs

@@ -43,6 +43,7 @@ namespace MySystem
                     while (DoCount < list.Rows.Count)
                     {
                         WebCMSEntities db = new WebCMSEntities();
+                        //机具入库
                         if (_Kind == "1")
                         {
                             var tran = db.Database.BeginTransaction();
@@ -233,6 +234,7 @@ namespace MySystem
                             }
                             tran.Dispose();
                         }
+                        //仓库调拨
                         else if (_Kind == "2")
                         {
                             Dictionary<string, int> storeData = new Dictionary<string, int>();
@@ -505,6 +507,7 @@ namespace MySystem
                                 }
                             }
                         }
+                        //仓库发货至创客
                         else if (_Kind == "3")
                         {
                             Dictionary<string, int> storeData = new Dictionary<string, int>();

+ 4 - 4
AppStart/Helper/SycnProfitServiceV3.cs

@@ -276,14 +276,14 @@ namespace MySystem
             CustomerSqlConn.op("delete from UserFriend", conn);
             
             CustomerSqlConn.op("insert into UserFriend (Id) select Id from Users where AuthFlag=1 and AuthDate<'" + Month + "-01 00:00:00' and Id not in (select UserId from PosMachinesTwo where `Status`>-1 and BuyUserId!=UserId and UserId not in (select UserId from PullnewSummary) and UserId not in (select BuyUserId from PosMachinesTwo where `Status`>-1))", conn);
-
-            CustomerSqlConn.op("update UserAccount a set BalanceAmount=0 where Id in (select Id from UserFriend) and BalanceAmount>0 and BalanceAmount<10", conn);
-
-            CustomerSqlConn.op("update UserAccount a set BalanceAmount=BalanceAmount-10 where Id in (select Id from UserFriend) and BalanceAmount>=10", conn);
             
             CustomerSqlConn.op("insert into UserAccountRecord (CreateDate,UpdateDate,UserId,ChangeType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount) select now(),now(),Id,125,BalanceAmount,TotalAmount BeforeTotalAmount,TotalAmount AfterTotalAmount,FreezeAmount,FreezeAmount,BalanceAmount BeforeBalanceAmount,BalanceAmount-BalanceAmount AfterBalanceAmount from UserAccount where Id in (select Id from UserFriend) and BalanceAmount>0 and BalanceAmount<10", conn);
 
             CustomerSqlConn.op("insert into UserAccountRecord (CreateDate,UpdateDate,UserId,ChangeType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount) select now(),now(),Id,125,10,TotalAmount BeforeTotalAmount,TotalAmount AfterTotalAmount,FreezeAmount,FreezeAmount,BalanceAmount BeforeBalanceAmount,BalanceAmount-10 AfterBalanceAmount from UserAccount where Id in (select Id from UserFriend) and BalanceAmount>=10;", conn);
+
+            CustomerSqlConn.op("update UserAccount a set BalanceAmount=0 where Id in (select Id from UserFriend) and BalanceAmount>0 and BalanceAmount<10", conn);
+
+            CustomerSqlConn.op("update UserAccount a set BalanceAmount=BalanceAmount-10 where Id in (select Id from UserFriend) and BalanceAmount>=10", conn);
         }
 
         #endregion

+ 3 - 3
Areas/Admin/Controllers/MainServer/LeadersController.cs

@@ -320,7 +320,7 @@ namespace MySystem.Areas.Admin.Controllers
                 else if (Kind == 3 && Amount <= account.LeaderReserve)
                 {
                     account.LeaderReserve -= Amount;
-                    ChangeType = 4;
+                    ChangeType = 2;
                     decimal AfterLeaderReserve = account.LeaderReserve; //变更后盟主储蓄金
                     decimal AfterLeaderBalanceAmount = account.LeaderBalanceAmount; //变更后盟主可提现余额
                     var query = db.LeaderReserveRecord.Add(new LeaderReserveRecord()
@@ -403,7 +403,7 @@ namespace MySystem.Areas.Admin.Controllers
                 else if (Kind == 3 && Amount <= account.LeaderBalanceAmount)
                 {
                     account.LeaderBalanceAmount -= Amount;
-                    ChangeType = 6;
+                    ChangeType = 2;
                     decimal AfterLeaderReserve = account.LeaderReserve; //变更后总金额
                     decimal AfterLeaderBalanceAmount = account.LeaderBalanceAmount; //变更后冻结金额
                     var query = db.LeaderReserveRecord.Add(new LeaderReserveRecord()
@@ -429,7 +429,7 @@ namespace MySystem.Areas.Admin.Controllers
                 else if (Kind == 4)
                 {
                     account.LeaderBalanceAmount += Amount;
-                    ChangeType = 5;
+                    ChangeType = 1;
                     decimal AfterLeaderReserve = account.LeaderReserve; //变更后总金额
                     decimal AfterLeaderBalanceAmount = account.LeaderBalanceAmount; //变更后冻结金额
                     var query = db.LeaderReserveRecord.Add(new LeaderReserveRecord()

+ 8 - 151
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -941,9 +941,15 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             prizes.Add(50);
                         }
+                        //9月1日-9月30日立刷机具刷5000激活时额外奖励30元立刷活动奖
+                        else if (pos.BrandId == 6 && pos.CreditTrade >= 5000M && pos.ActivationTime >= DateTime.Parse("2023-08-31 00:00:00") && pos.ActivationTime < DateTime.Parse("2023-10-01 00:00:00"))
+                        {
+                            prizes.Add(30);
+                        }
                         foreach (decimal prize in prizes)
                         {
                             int ChangeType = prize == 40 ? 12 : 0;
+                            if (prize == 30) ChangeType = 133;
                             bool check = db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn && m.RewardAmount == prize);
                             if (!check)
                             {
@@ -1144,7 +1150,6 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
-
         #region 取消商户代理
 
         public IActionResult CancelMerAgent(string right)
@@ -1240,7 +1245,6 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
-
         #region 查看SP原始数据日志
 
         public IActionResult SeeSpLog(string right)
@@ -3327,155 +3331,8 @@ namespace MySystem.Areas.Admin.Controllers
             Users user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId);
             if (user != null)
             {
-                if (!string.IsNullOrEmpty(user.ParentNav))
-                {
-                    decimal Prize = 20;
-                    List<string> PrizeFlag = new List<string>();
-                    string[] ParentNavs = user.ParentNav.Trim(',').Replace(",,", ",").Split(',');
-                    for (int i = ParentNavs.Length - 1; i >= 0; i--)
-                    {
-                        int UserId = int.Parse(ParentNavs[i]);
-                        Users puser = db.Users.FirstOrDefault(m => m.Id == UserId && m.AuthFlag == 1);
-                        if (puser != null && Prize > 0)
-                        {
-                            int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台兑换机
-                            int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机(不限购买或赠送)
-                            int couponCount = db.PosCoupons.Count(m => m.UserId == puser.Id && m.IsUse == 0); //判断是否拥有3张券
-                            if (machineCount + ActiveCount + couponCount >= 3)
-                            {
-                                int pTopUserId = 0;
-                                if (!string.IsNullOrEmpty(puser.ParentNav))
-                                {
-                                    pTopUserId = int.Parse(puser.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
-                                }
-                                Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
-                                OpenRewardDetail detail = db.OpenRewardDetail.Add(new OpenRewardDetail()
-                                {
-                                    CreateDate = DateTime.Now,
-                                    UpdateDate = DateTime.Now,
-                                    TradeMonth = DateTime.Now.ToString("yyyyMM"), //交易月
-                                    TradeDate = pos.ActivationTime, //达标日期
-                                    UserId = puser.Id, //创客
-                                    BrandId = pos.BrandId, //品牌
-                                    ProductName = RelationClass.GetKqProductBrandInfo(pos.BrandId), //产品名称
-                                    MerchantId = pos.BindMerchantId, //商户
-                                    DirectUserId = merchant.UserId, //商户直属人
-                                    SnNo = pos.PosSn, //SN号
-                                    MerNo = merchant.KqMerNo, //渠道商户号
-                                    SnType = pos.PosSnType, //机具类型
-                                    StandardDate = pos.ActivationTime, //商户的激活日期
-                                    SnStoreId = pos.StoreId, //SN仓库
-                                    MerBuddyType = puser.MerchantType, //商户创客类型
-                                    RewardType = 1, //奖励类型 1-开机直接奖励,2-开机间接奖励
-                                    RewardTips = "开机奖励", //奖励描述
-                                    CreditTradeAmt = pos.CreditTrade, //贷记卡交易总金额
-                                    DebitTradeAmt = pos.DebitCardTrade, //借记卡交易总金额
-                                    CreditRewardAmount = Prize, //贷记卡交易奖励金额
-                                    RewardDesc = "开机奖励", //奖励描述
-                                    TopUserId = pTopUserId, //顶级创客
-                                    SeoTitle = machineUser.RealName,
-                                }).Entity;
-                                db.OpenReward.Add(new OpenReward()
-                                {
-                                    CreateDate = DateTime.Now,
-                                    UpdateDate = DateTime.Now,
-                                    TradeMonth = DateTime.Now.ToString("yyyyMM"), //交易月
-                                    TradeDate = DateTime.Now, //达标日期
-                                    UserId = puser.Id, //创客
-                                    BrandId = pos.BrandId, //品牌
-                                    RewardType = 2, //奖励类型
-                                    CreditTradeAmt = pos.CreditTrade, //贷记卡交易总金额
-                                    DebitTradeAmt = pos.DebitCardTrade, //借记卡交易总金额
-                                    CreditRewardAmount = Prize, //贷记卡交易奖励金额
-                                    RewardDesc = "开机奖励", //奖励描述
-                                    TopUserId = pTopUserId, //顶级创客
-                                });
-                                string IdBrand = puser.Id + "_" + pos.BrandId;
-                                UserMachineData userData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
-                                if (userData == null)
-                                {
-                                    userData = db.UserMachineData.Add(new UserMachineData()
-                                    {
-                                        IdBrand = IdBrand,
-                                    }).Entity;
-                                    db.SaveChanges();
-                                }
-                                userData.OpenProfit += Prize;
-                                db.SaveChanges();
-                                //账户入库
-                                UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == puser.Id);
-                                if (account == null)
-                                {
-                                    account = db.UserAccount.Add(new UserAccount()
-                                    {
-                                        Id = puser.Id,
-                                        UserId = puser.Id,
-                                    }).Entity;
-                                    db.SaveChanges();
-                                }
-                                //收支明细入库
-                                decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                                decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                                decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                                account.BalanceAmount += Prize;
-                                account.TotalAmount += Prize;
-                                decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                                decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                                decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                                UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
-                                {
-                                    CreateDate = DateTime.Now,
-                                    UpdateDate = DateTime.Now,
-                                    UserId = puser.Id, //创客
-                                    ChangeType = 50, //变动类型
-                                    ProductType = pos.BrandId, //产品类型
-                                    ChangeAmount = Prize, //变更金额
-                                    BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                    AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                    BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                    AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                    BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                    AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                }).Entity;
-                                db.SaveChanges();
-                                RedisDbconn.Instance.Set("UserAccount:" + puser.Id, account);
-
-                                string dateString = DateTime.Now.ToString("yyyyMMdd");
-                                string monthString = DateTime.Now.ToString("yyyyMM");
-                                // 开机奖励列表
-                                List<string> dates = RedisDbconn.Instance.GetList<string>("OpenRewardDay:" + puser.Id + ":" + pos.BrandId);
-                                if (!dates.Contains(dateString))
-                                {
-                                    RedisDbconn.Instance.AddList("OpenRewardDay:" + puser.Id + ":" + pos.BrandId, dateString);
-                                }
-                                RedisDbconn.Instance.AddNumber("OpenRewardAmt:" + puser.Id + ":" + pos.BrandId + ":" + dateString, Prize);
-
-                                List<string> months = RedisDbconn.Instance.GetList<string>("OpenRewardMonth:" + puser.Id + ":" + pos.BrandId);
-                                if (!months.Contains(monthString))
-                                {
-                                    RedisDbconn.Instance.AddList("OpenRewardMonth:" + puser.Id + ":" + pos.BrandId, monthString);
-                                }
-                                RedisDbconn.Instance.AddNumber("OpenRewardAmt:" + puser.Id + ":" + pos.BrandId + ":" + monthString, Prize);
-
-                                // 开机奖励详情
-                                RedisDbconn.Instance.AddList("OpenRewardDetail:" + puser.Id + ":" + pos.BrandId + ":" + dateString, detail);
-
-                                //收支明细
-                                RedisDbconn.Instance.AddList("UserAccountRecord:" + puser.Id + ":1:" + monthString, userAccountRecord);
-                                RedisDbconn.Instance.AddNumber("UserAccount:" + puser.Id + ":1:" + monthString, Prize);
-
-                                Prize = 0;
-                                PrizeFlag.Add(Prize.ToString("f0"));
-                            }
-                        }
-                    }
-                    string result = "";
-                    if (string.IsNullOrEmpty(result))
-                    {
-                        return "发放成功";
-                    }
-                    return result;
-                }
+                RedisDbconn.Instance.AddList("OpenRewardQueue", Id.ToString());
+                return "操作成功,请稍后查询";
             }
             db.Dispose();
             return "操作失败";

+ 1 - 1
Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -247,7 +247,7 @@ namespace MySystem.Areas.Admin.Controllers
             // other.Add("ChangeTypeAmount125", ChangeTypeAmount125); //软件服务费
 
             string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount3 = "0.00", ChangeTypeAmount4 = "0.00", ChangeTypeAmount5 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount12 = "0.00", ChangeTypeAmount20 = "0.00", ChangeTypeAmount31 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount114 = "0.00", ChangeTypeAmount115 = "0.00", ChangeTypeAmount116 = "0.00", ChangeTypeAmount119 = "0.00", ChangeTypeAmount121 = "0.00", ChangeTypeAmount122 = "0.00", ChangeTypeAmount123 = "0.00", ChangeTypeAmount118And120 = "0.00", ChangeTypeAmount124 = "0.00", ChangeTypeAmount125 = "0.00", ChangeTypeAmount126 = "0.00", ChangeTypeAmount127 = "0.00", ChangeTypeAmount202 = "0.00", ChangeTypeAmount30 = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)) + sum(if(ChangeType=12, ChangeAmount, 0) + sum(if(ChangeType=133, ChangeAmount, 0)),sum(if(ChangeType=1 and ProductType!=101, ChangeAmount, 0)) + sum(if(ChangeType in(112,1) and ProductType=101, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=12, ChangeAmount, 0)),sum(if(ChangeType=20, ChangeAmount, 0)),sum(if(ChangeType=31 and (Remark!='开机抢红包活动' or Remark IS NULL), ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112  and ProductType=0, ChangeAmount, 0)),sum(if(ChangeType=114, ChangeAmount, 0)),sum(if(ChangeType=115, ChangeAmount, 0)),sum(if(ChangeType=116, ChangeAmount, 0)),sum(if(ChangeType=119, ChangeAmount, 0)),sum(if(ChangeType=121, ChangeAmount, 0)),sum(if(ChangeType=122, ChangeAmount, 0)),sum(if(ChangeType=123, ChangeAmount, 0)),sum(if(ChangeType in(118,120), ChangeAmount, 0)),sum(if(ChangeType=124, ChangeAmount, 0)),sum(if(ChangeType=125, ChangeAmount, 0)),sum(if(ChangeType=126, ChangeAmount, 0)),sum(if(ChangeType=127, ChangeAmount, 0)),sum(if(ChangeType=202, ChangeAmount, 0)),sum(if(ChangeType=31 and Remark='开机抢红包活动', ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
+            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)) + sum(if(ChangeType=12, ChangeAmount, 0)) + sum(if(ChangeType=133, ChangeAmount, 0)),sum(if(ChangeType=1 and ProductType!=101, ChangeAmount, 0)) + sum(if(ChangeType in(112,1) and ProductType=101, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=12, ChangeAmount, 0)),sum(if(ChangeType=20, ChangeAmount, 0)),sum(if(ChangeType=31 and (Remark!='开机抢红包活动' or Remark IS NULL), ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112  and ProductType=0, ChangeAmount, 0)),sum(if(ChangeType=114, ChangeAmount, 0)),sum(if(ChangeType=115, ChangeAmount, 0)),sum(if(ChangeType=116, ChangeAmount, 0)),sum(if(ChangeType=119, ChangeAmount, 0)),sum(if(ChangeType=121, ChangeAmount, 0)),sum(if(ChangeType=122, ChangeAmount, 0)),sum(if(ChangeType=123, ChangeAmount, 0)),sum(if(ChangeType in(118,120), ChangeAmount, 0)),sum(if(ChangeType=124, ChangeAmount, 0)),sum(if(ChangeType=125, ChangeAmount, 0)),sum(if(ChangeType=126, ChangeAmount, 0)),sum(if(ChangeType=127, ChangeAmount, 0)),sum(if(ChangeType=202, ChangeAmount, 0)),sum(if(ChangeType=31 and Remark='开机抢红包活动', ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 ChangeTypeAmount0 = dt.Rows[0][0].ToString();

+ 3 - 0
Areas/Admin/Views/MainServer/LeaderReserveRecord/Index.cshtml

@@ -67,6 +67,9 @@
                                 <option value="推荐小盟主">推荐小盟主</option>
                                 <option value="机具券兑换">机具券兑换</option>
                                 <option value="系统增加(盟主储蓄金)">系统增加(盟主储蓄金)</option>
+                                <option value="系统扣减(盟主储蓄金)">系统扣减(盟主储蓄金)</option>
+                                <option value="系统增加(盟主可提现余额)">系统增加(盟主可提现余额)</option>
+                                <option value="系统扣减(盟主可提现余额)">系统扣减(盟主可提现余额)</option>
                                 <option value="购机奖励">购机奖励</option>
                             </select>
                         </div>

+ 2 - 2
Areas/Admin/Views/MainServer/SchoolMorningMeet/Add.cshtml

@@ -47,14 +47,14 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">开始时间</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PublishDate" name="CreateDate"
+                                    <input class="layui-input" type="text" id="PublishDate" readonly name="CreateDate"
                                         lay-verify="" autocomplete="off" placeholder="请输入开始时间">
                                 </div>
                             </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">结束时间</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PublishDates" name="UpdateDate"
+                                    <input class="layui-input" type="text" id="PublishDates" readonly name="UpdateDate"
                                         lay-verify="" autocomplete="off" placeholder="请输入结束时间">
                                 </div>
                             </div>

+ 2 - 2
Areas/Admin/Views/MainServer/SchoolMorningMeet/Edit.cshtml

@@ -54,14 +54,14 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">开始时间</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PublishDate" name="CreateDate" value="@(Library.function.ConvertIntDateTime(editData.Sort*60).ToString("yyyy-MM-dd HH:mm:ss"))"
+                                    <input class="layui-input" type="text" id="PublishDate" readonly name="CreateDate" value="@(Library.function.ConvertIntDateTime(editData.Sort*60).ToString("yyyy-MM-dd HH:mm:ss"))"
                                         lay-verify="" autocomplete="off" placeholder="请输入开始时间">
                                 </div>
                             </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">结束时间</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PublishDates" name="UpdateDate" value="@(Library.function.ConvertIntDateTime(editData.QueryCount*60).ToString("yyyy-MM-dd HH:mm:ss"))"
+                                    <input class="layui-input" type="text" id="PublishDates" readonly name="UpdateDate" value="@(Library.function.ConvertIntDateTime(editData.QueryCount*60).ToString("yyyy-MM-dd HH:mm:ss"))"
                                         lay-verify="" autocomplete="off" placeholder="请输入结束时间">
                                 </div>
                             </div>