Merge branch '20221010' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MusicGroupStatusEnum.java

@@ -4,7 +4,7 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum MusicGroupStatusEnum implements BaseEnum<String, MusicGroupStatusEnum> {
 	DRAFT("草稿"), AUDIT("审核中"), AUDIT_FAILED("审核失败"), PRE_APPLY("预报名"), PRE_BUILD_FEE("创建缴费"),
-	FEE_AUDIT("费用审核中"), APPLY("报名中"), PAY("缴费中"), PREPARE("筹备中"), PROGRESS(
+	FEE_AUDIT("费用审核中"),FEE_AUDIT_FAILED("费用审核失败"), APPLY("报名中"), PAY("缴费中"), PREPARE("筹备中"), PROGRESS(
 			"进行中"), CANCELED("取消"), PAUSE("暂停"), CLOSE("关闭");
 
 	private String msg;

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

@@ -365,30 +365,23 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentBaseCalender.getCalenderMember();
         if (calenderMember != null) {
             calenderMember = musicGroupPaymentCalenderMemberService.initBean(calenderMember);
+            calenderMember.setActualAmount(memberActualAmount);
             calenderMember.setOriginalAmount(memberOriginalAmount);
             calenderMember.setCalenderId(calenderId);
-            if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-                calenderMember.setActualAmount(BigDecimal.ZERO);
-            }
             musicGroupPaymentCalenderMemberService.insert(calenderMember);
         }
         //保存乐保缴费信息
         MusicGroupPaymentCalenderRepair musicRepair = musicGroupPaymentBaseCalender.getMusicRepair();
         if (musicRepair != null) {
             musicRepair.setOriginalAmount(repairOriginalAmount);
+            musicRepair.setActualAmount(repairActualAmount);
             musicRepair.setCalenderId(calenderId);
-            if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-                musicRepair.setActualAmount(BigDecimal.ZERO);
-            }
             musicGroupPaymentCalenderRepairService.insert(musicRepair);
         }
         //保存活动缴费信息
         List<MusicGroupPaymentCalenderActivity> calenderActivityList = musicGroupPaymentBaseCalender.getCalenderActivityList();
         if (calenderActivityList != null && calenderActivityList.size() > 0) {
             musicGroupPaymentCalenderActivityService.initBean(calenderActivityList);
-            if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-                calenderActivityList.forEach(e -> e.setActualAmount(BigDecimal.ZERO));
-            }
             musicGroupPaymentCalenderActivityService.batchInsert(musicGroupPaymentBaseCalender, calenderId);
         }
         //保存课程费用列表
@@ -1083,6 +1076,18 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult<ModelMap> merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+    	
+    	Long calenderId = musicGroupPaymentBaseCalender.getCalenderId();
+    	
+    	MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(calenderId);
+    	if(musicGroupPaymentCalender == null){
+    		throw new BizException("缴费项目[{}]查询失败", calenderId);
+    	}
+    	
+    	if(musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.DRAFT || musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.REJECT){
+    		throw new BizException("当前缴费项目状态不支持修改");
+    	}
+    	
         del(musicGroupPaymentBaseCalender.getCalenderId());
         return create1(musicGroupPaymentBaseCalender);
     }

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

@@ -1161,7 +1161,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     goodsDto.setOrderAmount(goodsDto.getOrderAmount().add(goodsGroup.getPrice()));
 
                     //分部分润金额
-                    goodsDto.setOrderAmount(goodsDto.getOrderAmount().add(goodsGroup.getOrganShareProfit()));
+                    if(goodsGroup.getOrganShareProfit() != null){
+                    	goodsDto.setOrderAmount(goodsDto.getOrderAmount().add(goodsGroup.getOrganShareProfit()));
+                    }
                 }
             }
             goodsDto.setOrderAmount(goodsDto.getOrderAmount().subtract(goodsDto.getRemitFee()));
@@ -1646,6 +1648,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             });
             
             musicGroupPaymentCalenderDao.batchUpdate(musicGroupPaymentCalenderList);
+            
+            //修改乐团状态
+            musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT_FAILED);
+            musicGroup.setUpdateTime(date);
+            musicGroupDao.update(musicGroup);
         }
         
     }