Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupPaymentBaseCalender.java

@@ -9,6 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 public class MusicGroupPaymentBaseCalender {
+	private Long calenderId;
 
 	@ApiModelProperty(value = "乐团编号", required = true)
 	private String musicGroupId;
@@ -50,6 +51,14 @@ public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "进行中加学员拓展信息", required = false)
 	private CalenderAddStudent calenderAddStudent;
 
+	public Long getCalenderId() {
+		return calenderId;
+	}
+
+	public void setCalenderId(Long calenderId) {
+		this.calenderId = calenderId;
+	}
+
 	public CalenderAddStudent getCalenderAddStudent() {
 		return calenderAddStudent;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupPaymentCalenderService.java

@@ -183,4 +183,13 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	List<MusicGroupPaymentCalender> findByBatchNo(String batchNo);
 
 	PageInfo<MusicGroupPaymentCalenderResultDto> queryCalenderPage(MusicGroupPaymentCalenderQueryInfo queryInfo);
+
+	/**
+	* @description: 新版修改缴费项目，先删除原有的缴费项目，再重新生成
+	 * @param musicGroupPaymentBaseCalender
+	* @return java.lang.String
+	* @author zx
+	* @date 2021/12/27 20:43
+	*/
+    String merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender);
 }

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

@@ -401,6 +401,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			musicGroupPaymentCalender.setCreateTime(date);
 			musicGroupPaymentCalender.setUpdateTime(date);
 			musicGroupPaymentCalender.setStatus(status);
+			musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
 
 			//缴费截止日期默认三天后
 			if (musicGroupPaymentCalender.getDeadlinePaymentDate() == null && payUserType == PayUserType.STUDENT) {
@@ -608,6 +609,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		musicGroupPaymentCalender.setCurrentTotalAmount(currentTotalAmount);
 		musicGroupPaymentCalender.setOriginalTotalAmount(originalTotalAmount);
 		musicGroupPaymentCalender.setStatus(status);
+		musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
 
 		if (musicGroupPaymentCalender.getStatus() != AUDITING) {
 			if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
@@ -1648,7 +1650,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = musicGroupPaymentCalenderDao.queryCalenderPage(params);
-			List<Integer> organIdList = dataList.stream().map(e -> e.getOrganId()).collect(Collectors.toList());
+			Set<Integer> organIdList = dataList.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
 			Map<Integer, String> organNameMap = getMap("organization", "id_", "name_", organIdList, Integer.class, String.class);
 			List<Integer> operatorIds = dataList.stream().map(e -> e.getOperator()).collect(Collectors.toList());
 			operatorIds.removeAll(Collections.singleton(null));
@@ -1665,7 +1667,14 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		return pageInfo;
 	}
 
-	@Override
+    @Override
+	@Transactional(rollbackFor = Exception.class)
+    public String merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+		del(musicGroupPaymentBaseCalender.getCalenderId());
+		return create1(musicGroupPaymentBaseCalender);
+    }
+
+    @Override
 	@Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
 	public boolean autoUpdateMusicGroupPaymentCalenderStatus() {
 		Date date = new Date();
@@ -1741,11 +1750,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		//缴费项目中没有学生即可删除缴费项目
 		List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList = musicGroupPaymentCalenderDetailDao.queryByCalenderId(id, null);
 		if (musicGroupPaymentCalenderDetailList != null && musicGroupPaymentCalenderDetailList.size() > 0) {
-			throw new BizException("缴费项目中已存在学员，不能删除");
+			throw new BizException("操作失败：缴费项目中已存在学员");
 		}
 		MusicGroupStudentClassAdjust byBatchNo = musicGroupStudentClassAdjustDao.findByBatchNo(calender.getBatchNo());
 		if(byBatchNo != null){
-			throw new BizException("删除失败,班级调整的缴费项目不允许删除");
+			throw new BizException("操作失败：班级调整的缴费项目不支持");
 		}
 
 		if (calender.getPaymentType() == PaymentType.MUSIC_APPLY) {
@@ -1753,7 +1762,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			List<StudentPaymentOrder> studentPaymentOrderList = studentPaymentOrderDao.queryByDealStatus(calender.getMusicGroupId(), OrderTypeEnum.APPLY,
 					DealStatusEnum.ING);
 			if (studentPaymentOrderList != null && studentPaymentOrderList.size() > 0) {
-				throw new BizException("存在缴费中的学生，不能删除");
+				throw new BizException("操作失败：存在缴费中的学生");
 			}
 		}
 		

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderActivityDao.xml

@@ -87,10 +87,13 @@
 
   <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
           parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity">
-    insert into music_group_payment_calender_activity(activity_id_, calender_id_, optional_flag_, actual_amount_ ,original_amount_, create_time_, update_time_, tenant_id_)    values
+    insert into music_group_payment_calender_activity(activity_id_, calender_id_, optional_flag_, actual_amount_ ,
+    original_amount_, create_time_, update_time_, tenant_id_)
+    VALUE
     <foreach collection="calenderActivityList" item="entity" separator=",">
-#{entity.activityId}, #{entity.calenderId}, #{entity.optionalFlag}, #{entity.actualAmount},
-      #{entity.originalAmount}, NOW(), NOW(),#{entity.tenantId})    </foreach>
+      (#{entity.activityId}, #{entity.calenderId}, #{entity.optionalFlag}, #{entity.actualAmount},
+      #{entity.originalAmount}, NOW(), NOW(),#{entity.tenantId})
+    </foreach>
   </insert>
   <delete id="delByCalenderId">
     DELETE FROM music_group_payment_calender_activity WHERE calender_id_ = #{calenderId}

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPaymentCalenderController.java

@@ -78,6 +78,16 @@ public class MusicGroupPaymentCalenderController extends BaseController {
         return succeed(map);
     }
 
+    @ApiOperation(value = "修改乐团缴费日历")
+    @PostMapping(value = "/updateCalender", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/updateCalender')")
+    public Object updateCalender(@RequestBody MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+    	String batchNo = musicGroupPaymentCalenderService.merge1(musicGroupPaymentBaseCalender);
+        ModelMap map = new ModelMap(1);
+        map.put("musicGroupPaymentCalenderBatchNo", batchNo);
+        return succeed(map);
+    }
+
     @ApiOperation(value = "待审核的缴费项目撤回")
     @PostMapping(value = "/revoke")
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/revoke')")