Merge remote-tracking branch 'origin/master'

src/main/java/org/rcisoft/business/cmsActivity/service/impl/CmsActivityServiceImpl.java

@@ -58,16 +58,12 @@ public class CmsActivityServiceImpl extends ServiceImpl<CmsActivityRepository, C
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
     public CyPersistModel persist(CmsActivity cmsActivity) {
-        CmsActivity check = baseMapper.checkWeight(cmsActivity.getWeight());
-        if (ObjectUtil.isNotNull(check)) {
-            throw new CyServiceException(500, "权重已存在");
-        } else {
+        System.out.println("cmsActivity: "+cmsActivity);
         int line = baseMapper.insert(cmsActivity);
         log.debug(CyUserUtil.getAuthenUsername() + "新增了ID为" +
                 cmsActivity.getBusinessId() + "的活动信息");
         return new CyPersistModel(line);
     }
-    }
 
     /**
      * 删除 活动
@@ -223,15 +219,15 @@ public class CmsActivityServiceImpl extends ServiceImpl<CmsActivityRepository, C
 
     private void extracted(Integer businessId, CmsActivity info) {
         Set<String> map = redisTemplate.keys(RedisCons.ORDER_ACTIVITY + ":" + businessId + ":" +"*");
-        if (CollectionUtils.isEmpty(map)){
-            //根据活动id查询报名信息
-            Integer count = baseMapper.selectByActivityId(businessId);
-            if (count > 0){
-                throw new CyServiceException("活动已经报名，不允许取消发布");
-            }
-        }
-        if (CollectionUtils.isNotEmpty(map)) //报名人数和实际剩余报名人数不等
-            throw new CyServiceException("活动已经报名，不允许取消发布");
+//        if (CollectionUtils.isEmpty(map)){
+//            //根据活动id查询报名信息
+//            Integer count = baseMapper.selectByActivityId(businessId);
+//            if (count > 0){
+//                throw new CyServiceException("活动已经报名，不允许取消发布");
+//            }
+//        }
+//        if (CollectionUtils.isNotEmpty(map)) //报名人数和实际剩余报名人数不等
+//            throw new CyServiceException("活动已经报名，不允许取消发布");
         if ("0".equals(info.getPublishStatus()))
             throw new CyServiceException("活动未发布，不能取消");
     }