update

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

@@ -411,6 +411,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         	// 记录操作日志
             musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功", sysUser.getId(), ""));
             
+            musicGroup.setApplyExpireDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
             musicGroup.setUpdateTime(date);
             musicGroupDao.update(musicGroup);
         }

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

@@ -1454,14 +1454,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     throw new BizException(musicGroupSubjectGoodsGroup.getName() + " 请选择提供方式");
                 }
                 
-                if(musicGroupSubjectGoodsGroup.getType().equals(GoodsType.INSTRUMENT)){
-                    if(musicGroupSubjectGoodsGroup.getOrganShareProfit() == null){
-                    	throw new BizException("请设置分润金额");
-                    }
-                    //判断分润是否超过最大值
-                    if(maxProfits.compareTo(musicGroupSubjectGoodsGroup.getOrganShareProfit()) < 0){
-                    	throw new BizException("超过了分润最大金额[{}]，请重新设置分润金额", maxProfits.doubleValue());
-                    }
+                //判断分润是否超过最大值
+                if(musicGroupSubjectGoodsGroup.getOrganShareProfit() != null && maxProfits.compareTo(musicGroupSubjectGoodsGroup.getOrganShareProfit()) < 0){
+                	throw new BizException("超过了分润最大金额[{}]，请重新设置分润金额", maxProfits.doubleValue());
                 }
                 
                 if (musicGroupSubjectGoodsGroup.getGroupRemissionCourseFee() == null) {