1

Mall.Module.TradePavilion/FirstShopListModule.cs

@@ -217,6 +217,19 @@ namespace Mall.Module.TradePavilion
                     }
                     model.EnrollList = enrollList;
                 }
+
+                if (model.ListState == Common.Enum.TradePavilion.ListStateEnum.Enroll && model.StartDate <= DateTime.Now && model.EndDate >= DateTime.Now)
+                {
+                    model.State = 1;//进行中
+                }
+                else if (model.ListState == Common.Enum.TradePavilion.ListStateEnum.Enroll && model.EndDate <= DateTime.Now)
+                {
+                    model.State = 2;//报名已截止
+                }
+                else if (model.ListState == Common.Enum.TradePavilion.ListStateEnum.Confirmed)
+                {
+                    model.State = 3;//已放榜
+                }
             }
             return model;
         }
@@ -373,7 +386,7 @@ namespace Mall.Module.TradePavilion
             if (demodel.Id > 0)
             {
                 #region 验证
-                var valistList = firstShop_ListEnrollRepository.GetList(new RB_FirstShop_ListEnroll_Extend() { MallBaseId = demodel.MallBaseId, ListId = demodel.ListId, UserId = demodel.UserId, ObjectType = demodel.ObjectType, ObjectId = demodel.ObjectId });
+                var valistList = firstShop_ListEnrollRepository.GetList(new RB_FirstShop_ListEnroll_Extend() { MallBaseId = demodel.MallBaseId, ListId = demodel.ListId, UserId = demodel.UserId, ObjectType = demodel.ObjectType });
                 if (valistList.Where(x => x.Id != demodel.Id).Any())
                 {
                     return "该品牌/载体已报名，无法重复报名";
@@ -397,7 +410,7 @@ namespace Mall.Module.TradePavilion
             else
             {
                 #region 验证
-                var valistList = firstShop_ListEnrollRepository.GetList(new RB_FirstShop_ListEnroll_Extend() { MallBaseId = demodel.MallBaseId, ListId = demodel.ListId, UserId = demodel.UserId, ObjectType = demodel.ObjectType, ObjectId = demodel.ObjectId });
+                var valistList = firstShop_ListEnrollRepository.GetList(new RB_FirstShop_ListEnroll_Extend() { MallBaseId = demodel.MallBaseId, ListId = demodel.ListId, UserId = demodel.UserId, ObjectType = demodel.ObjectType });
                 if (valistList.Any())
                 {
                     return "该品牌/载体已报名，无法重复报名";

Mall.Module.User/MiniProgramMsgModule.cs

@@ -1138,7 +1138,7 @@ namespace Mall.Module.User
                         {
                             value = objectName
                         },
-                        thing6 = new
+                        thing3 = new
                         {
                             value = result
                         },

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2274,6 +2274,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 model.EnableRank,
                 model.PrizeNum,
                 model.ListState,
+                model.State,
                 EnrollList = model.EnrollList?.Select(x => new
                 {
                     x.Id,
@@ -2443,6 +2444,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 FinishDate = x.FinishDate.ToString("yyyy-MM-dd HH:mm"),
                 x.PrizeNum,
                 x.EnableRank,
+                x.ListState,
                 x.Rank,
                 x.MedalImage,
                 x.RankListState