Merge remote-tracking branch 'origin/feature/0529-live' into feature/0529-live

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -562,7 +562,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
 
         vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.PASS);
-        vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.APPLYING);
+        if (now.after(vipGroupApplyBaseInfoDto.getRegistrationStartTime())) {
+            vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.APPLYING);
+        }else {
+            vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.NOT_START);
+        }
 
          vipGroupApplyBaseInfoDto.setTotalPrice(costInfo.getOrDefault("totalPrice", ZERO));
          vipGroupApplyBaseInfoDto.setOriginalTotalPrice(costInfo.getOrDefault("originalTotalPrice", ZERO));
@@ -4632,7 +4636,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
         
         //更新到报名中
-/*        List<VipGroup> normalVipGroupList = vipGroupDao.queryNormalStatusList();
+        List<VipGroup> normalVipGroupList = vipGroupDao.queryNormalStatusList();
         if (!CollectionUtils.isEmpty(normalVipGroupList)) {
             List<VipGroup> needUpdateVipGroups = new ArrayList<>();
             for (VipGroup vipGroup : normalVipGroupList) {
@@ -4647,7 +4651,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             if (!CollectionUtils.isEmpty(needUpdateVipGroups)) {
                 vipGroupDao.batchUpdate(needUpdateVipGroups);
             }
-        }*/
+        }
     }
 
     @Override