update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderActivityDao.java

@@ -3,5 +3,9 @@ package com.ym.mec.biz.dal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity;
 
+import java.util.List;
+
 public interface MusicGroupPaymentCalenderActivityDao extends BaseMapper<MusicGroupPaymentCalenderActivity> {
+
+    void insertBatch(List<MusicGroupPaymentCalenderActivity> musicGroupPaymentCalenderActivities);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalender.java

@@ -188,6 +188,50 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 	//会员等级名称
 	private String memberRankSettingName;
 
+	//会员是否必选
+	private Boolean memberOptionalFlag = false;
+
+	//乐保年限
+	private BigDecimal musicRepairNum = BigDecimal.ZERO;
+
+	//乐保购买价格
+	private BigDecimal musicRepairActualPrice = BigDecimal.ZERO;
+
+	//乐保是否必选
+	private Boolean musicRepairOptionalFlag = false;
+
+	public Boolean getMemberOptionalFlag() {
+		return memberOptionalFlag;
+	}
+
+	public void setMemberOptionalFlag(Boolean memberOptionalFlag) {
+		this.memberOptionalFlag = memberOptionalFlag;
+	}
+
+	public BigDecimal getMusicRepairNum() {
+		return musicRepairNum;
+	}
+
+	public void setMusicRepairNum(BigDecimal musicRepairNum) {
+		this.musicRepairNum = musicRepairNum;
+	}
+
+	public BigDecimal getMusicRepairActualPrice() {
+		return musicRepairActualPrice;
+	}
+
+	public void setMusicRepairActualPrice(BigDecimal musicRepairActualPrice) {
+		this.musicRepairActualPrice = musicRepairActualPrice;
+	}
+
+	public Boolean getMusicRepairOptionalFlag() {
+		return musicRepairOptionalFlag;
+	}
+
+	public void setMusicRepairOptionalFlag(Boolean musicRepairOptionalFlag) {
+		this.musicRepairOptionalFlag = musicRepairOptionalFlag;
+	}
+
 	public PeriodEnum getMemberPeriod() {
 		return memberPeriod;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderActivity.java

@@ -1,97 +1,123 @@
 package com.ym.mec.biz.dal.entity;
 
-import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
 /**
- * 对应数据库表(music_group_payment_calender_activity):
+ * 缴费项目关联活动(MusicGroupPaymentCalenderActivity)表实体类
+ *
+ * @author zx
+ * @since 2021-12-22 15:54:47
  */
-public class MusicGroupPaymentCalenderActivity{
+@ApiModel(value = "music_group_payment_calender_activity-缴费项目关联活动")
+public class MusicGroupPaymentCalenderActivity implements Serializable {
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "${column.comment}")
+    private Long id;
 
-	private Integer id;
+    @TableField("activity_id_")
+    @ApiModelProperty(value = "活动编号")
+    private Integer activityId;
 
-	@ApiModelProperty(value = "活动编号", required = true)
-	private Integer activityId;
+    @TableField("calender_id_")
+    @ApiModelProperty(value = "缴费项目编号")
+    private Long calenderId;
 
-	@ApiModelProperty(value = "缴费项目编号", required = false)
-	private Integer calenderId;
+    @TableField("optional_flag_")
+    @ApiModelProperty(value = "是否必选")
+    private Integer optionalFlag;
 
-	@ApiModelProperty(value = "现价", required = true)
-	private BigDecimal actualPrice;
+    @TableField("actual_price_")
+    @ApiModelProperty(value = "现价")
+    private BigDecimal actualPrice;
 
-	@ApiModelProperty(value = "原价", required = true)
-	private BigDecimal originalPrice;
+    @TableField("original_price_")
+    @ApiModelProperty(value = "原价")
+    private BigDecimal originalPrice;
 
-	@ApiModelProperty(value = "是否必选", required = true)
-	private Boolean optionalFlag = false;
+    @TableField("create_time_")
+    @ApiModelProperty(value = "${column.comment}")
+    private Date createTime;
 
-	private Date createTime;
+    @TableField("update_time_")
+    @ApiModelProperty(value = "${column.comment}")
+    private Date updateTime;
 
-	private Date updateTime;
+    private static final long serialVersionUID = 1L;
 
-	public BigDecimal getActualPrice() {
-		return actualPrice;
-	}
+    public Long getId() {
+        return id;
+    }
 
-	public void setActualPrice(BigDecimal actualPrice) {
-		this.actualPrice = actualPrice;
-	}
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-	public BigDecimal getOriginalPrice() {
-		return originalPrice;
-	}
+    public Integer getActivityId() {
+        return activityId;
+    }
 
-	public void setOriginalPrice(BigDecimal originalPrice) {
-		this.originalPrice = originalPrice;
-	}
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
 
-	public Date getCreateTime() {
-		return createTime;
-	}
+    public Long getCalenderId() {
+        return calenderId;
+    }
 
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
+    public void setCalenderId(Long calenderId) {
+        this.calenderId = calenderId;
+    }
 
-	public Date getUpdateTime() {
-		return updateTime;
-	}
+    public Integer getOptionalFlag() {
+        return optionalFlag;
+    }
 
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
+    public void setOptionalFlag(Integer optionalFlag) {
+        this.optionalFlag = optionalFlag;
+    }
 
-	public Integer getId() {
-		return id;
-	}
+    public BigDecimal getActualPrice() {
+        return actualPrice;
+    }
 
-	public void setId(Integer id) {
-		this.id = id;
-	}
+    public void setActualPrice(BigDecimal actualPrice) {
+        this.actualPrice = actualPrice;
+    }
 
-	public Integer getActivityId() {
-		return activityId;
-	}
+    public BigDecimal getOriginalPrice() {
+        return originalPrice;
+    }
 
-	public void setActivityId(Integer activityId) {
-		this.activityId = activityId;
-	}
+    public void setOriginalPrice(BigDecimal originalPrice) {
+        this.originalPrice = originalPrice;
+    }
 
-	public Integer getCalenderId() {
-		return calenderId;
-	}
+    public Date getCreateTime() {
+        return createTime;
+    }
 
-	public void setCalenderId(Integer calenderId) {
-		this.calenderId = calenderId;
-	}
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 
-	public Boolean getOptionalFlag() {
-		return optionalFlag;
-	}
 
-	public void setOptionalFlag(Boolean optionalFlag) {
-		this.optionalFlag = optionalFlag;
-	}
 }
+

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

@@ -1,4 +1,15 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.MusicGroupPaymentBaseCalender;
+
 public interface MusicGroupPaymentCalenderActivityService {
+    /**
+    * @description: 新增活动缴费项目
+     * @param musicGroupPaymentBaseCalender
+     * @param calenderId
+    * @return void
+    * @author zx
+    * @date 2021/12/22 15:31
+    */
+    void batchInsert(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender, Long calenderId);
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
 import com.ym.mec.common.service.BaseService;
 import java.util.List;
@@ -17,7 +18,7 @@ public interface MusicGroupPaymentCalenderCourseSettingsService extends BaseServ
      */
     Map<String, Integer> getMusicCourseSettingsWithStudents(String musicGroupId, List<Integer> studentIds);
 
-    void batchInsert(List<MusicGroupPaymentCalenderCourseSettings> currentMusicGroupPaymentCalenderCourseSettings);
+    void batchInsert(MusicGroupPaymentCalender musicGroupPaymentCalender);
 
     void deleteByMusicGroupPaymentCalenderId(List<Long> calenderIds);
 

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

@@ -1,13 +1,20 @@
 package com.ym.mec.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderActivityDao;
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentBaseCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderActivityService;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderBaseService;
-
+import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
+import java.util.List;
+
+@Service
+public class MusicGroupPaymentCalenderActivityServiceImpl extends ServiceImpl<MusicGroupPaymentCalenderActivityDao, MusicGroupPaymentCalenderActivity>
+        implements MusicGroupPaymentCalenderActivityService, MusicGroupPaymentCalenderBaseService {
 
-public class MusicGroupPaymentCalenderActivityServiceImpl implements MusicGroupPaymentCalenderActivityService, MusicGroupPaymentCalenderBaseService {
     @Override
     public void createComponent(MusicGroupPaymentBaseCalender baseCalender) {
 
@@ -20,6 +27,19 @@ public class MusicGroupPaymentCalenderActivityServiceImpl implements MusicGroupP
 
     @Override
     public BigDecimal getActualAmount(MusicGroupPaymentBaseCalender baseCalender) {
-        return null;
+        List<MusicGroupPaymentCalenderActivity> calenderActivityList = baseCalender.getCalenderActivityList();
+        if(calenderActivityList != null && calenderActivityList.size() > 0){
+            return calenderActivityList.stream().map(e->e.getActualPrice()).reduce(BigDecimal.ZERO,BigDecimal::add);
+        }
+        return BigDecimal.ZERO;
+    }
+
+    @Override
+    public void batchInsert(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender, Long calenderId) {
+        List<MusicGroupPaymentCalenderActivity> calenderActivityList = musicGroupPaymentBaseCalender.getCalenderActivityList();
+        if(calenderActivityList != null && calenderActivityList.size() > 0){
+            calenderActivityList.stream().forEach(e->e.setCalenderId(calenderId));
+            baseMapper.insertBatch(calenderActivityList);
+        }
     }
 }

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dao.MusicGroupPaymentStudentCourseDetailDao;
 import com.ym.mec.biz.dal.dao.OrganizationCourseUnitPriceSettingsDao;
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentBaseCalender;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.service.MusicGroupOrganizationCourseSettingsService;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderBaseService;
 import com.ym.mec.common.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,8 @@ public class MusicGroupPaymentCalenderCourseSettingsServiceImpl extends BaseServ
 	private MusicGroupOrganizationCourseSettingsDetailDao musicGroupOrganizationCourseSettingsDetailDao;
 	@Autowired
 	private OrganizationCourseUnitPriceSettingsDao organizationCourseUnitPriceSettingsDao;
+	@Autowired
+	private MusicGroupOrganizationCourseSettingsService musicGroupOrganizationCourseSettingsService;
 
 	@Override
 	public BaseDAO<Integer, MusicGroupPaymentCalenderCourseSettings> getDAO() {
@@ -64,8 +67,19 @@ public class MusicGroupPaymentCalenderCourseSettingsServiceImpl extends BaseServ
 	}
 
     @Override
-    public void batchInsert(List<MusicGroupPaymentCalenderCourseSettings> currentMusicGroupPaymentCalenderCourseSettings) {
-        musicGroupPaymentCalenderCourseSettingsDao.batchInsert(currentMusicGroupPaymentCalenderCourseSettings);
+    public void batchInsert(MusicGroupPaymentCalender musicGroupPaymentCalender) {
+		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingss = musicGroupPaymentCalender.getMusicGroupPaymentCalenderCourseSettingsList();
+		if (musicGroupPaymentCalenderCourseSettingss != null && musicGroupPaymentCalenderCourseSettingss.size() > 0) {
+			MusicGroupOrganizationCourseSettings courseSettings = musicGroupOrganizationCourseSettingsService.get(musicGroupPaymentCalender
+					.getMusicGroupOrganizationCourseSettingId());
+			for (MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : musicGroupPaymentCalenderCourseSettingss) {
+				musicGroupPaymentCalenderCourseSettings.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
+				if (courseSettings != null) {
+					musicGroupPaymentCalenderCourseSettings.setName(courseSettings.getName());
+				}
+			}
+			musicGroupPaymentCalenderCourseSettingsDao.batchInsert(musicGroupPaymentCalenderCourseSettingss);
+		}
     }
 
 	@Override

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

@@ -127,6 +127,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	private StudentService studentService;
 	@Autowired
 	private CloudTeacherOrderDao cloudTeacherOrderDao;
+	@Autowired
+	private MusicGroupPaymentCalenderActivityService musicGroupPaymentCalenderActivityService;
 	@Resource(name = "musicRepairService")
 	private MusicGroupPaymentCalenderBaseService musicRepairService;
 	@Resource(name = "memberCalenderService")
@@ -453,20 +455,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			musicGroupPaymentCalenderDao.insert(musicGroupPaymentCalender);
 
 			//课程费用列表
-			List<MusicGroupPaymentCalenderCourseSettings> currentMusicGroupPaymentCalenderCourseSettings = musicGroupPaymentCalender
-					.getMusicGroupPaymentCalenderCourseSettingsList();
-
-			if (currentMusicGroupPaymentCalenderCourseSettings != null && currentMusicGroupPaymentCalenderCourseSettings.size() > 0) {
-				MusicGroupOrganizationCourseSettings courseSettings = musicGroupOrganizationCourseSettingsService.get(musicGroupPaymentCalender
-						.getMusicGroupOrganizationCourseSettingId());
-				for (MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : currentMusicGroupPaymentCalenderCourseSettings) {
-					musicGroupPaymentCalenderCourseSettings.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
-					if (courseSettings != null) {
-						musicGroupPaymentCalenderCourseSettings.setName(courseSettings.getName());
-					}
-				}
-				musicGroupPaymentCalenderCourseSettingsService.batchInsert(currentMusicGroupPaymentCalenderCourseSettings);
-			}
+			musicGroupPaymentCalenderCourseSettingsService.batchInsert(musicGroupPaymentCalender);
 
 			//如果是跨团班级合并,保存用户缴费详情
 			List<MusicGroupPaymentCalenderStudentDetail> musicGroupPaymentCalenderStudentDetails = null;
@@ -479,7 +468,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			if (musicGroupPaymentCalender.getStatus() != AUDITING) {
 				// 如果是进行中加学生
 				if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT) {
-					addStudent(musicGroupPaymentCalender, currentMusicGroupPaymentCalenderCourseSettings,musicGroup);
+					addStudent(musicGroupPaymentCalender, musicGroupPaymentCalender
+							.getMusicGroupPaymentCalenderCourseSettingsList(),musicGroup);
 				}else if(musicGroupPaymentCalender.getPaymentType() == SPAN_GROUP_CLASS_ADJUST){
 					//如果是跨团班级合并,添加学员
 					musicGroupPaymentCalenderDetailService.batchAdd(musicGroupPaymentCalender,musicGroupPaymentCalenderStudentDetails);
@@ -608,13 +598,16 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		musicGroupPaymentCalender.setCreateTime(date);
 		musicGroupPaymentCalender.setUpdateTime(date);
 		musicGroupPaymentCalender.setStatus(status);
+		musicGroupPaymentCalender.setPaymentType(musicGroupPaymentBaseCalender.getPaymentType());
 
 		BigDecimal totalPaymentAmount = BigDecimal.ZERO;
-		totalPaymentAmount.add(memberCalenderService.getActualAmount(musicGroupPaymentBaseCalender));
-		totalPaymentAmount.add(((MusicGroupPaymentCalenderCourseSettingsServiceImpl)musicGroupPaymentCalenderCourseSettingsService).getActualAmount(musicGroupPaymentBaseCalender));
-		totalPaymentAmount.add(musicRepairService.getActualAmount(musicGroupPaymentBaseCalender));
+		totalPaymentAmount = totalPaymentAmount.add(memberCalenderService.getActualAmount(musicGroupPaymentBaseCalender));
+		totalPaymentAmount = totalPaymentAmount.add(((MusicGroupPaymentCalenderCourseSettingsServiceImpl)musicGroupPaymentCalenderCourseSettingsService).getActualAmount(musicGroupPaymentBaseCalender));
+		totalPaymentAmount = totalPaymentAmount.add(musicRepairService.getActualAmount(musicGroupPaymentBaseCalender));
+		totalPaymentAmount = totalPaymentAmount.add(((MusicGroupPaymentCalenderActivityServiceImpl)musicGroupPaymentCalenderActivityService).getActualAmount(musicGroupPaymentBaseCalender));
 		musicGroupPaymentCalender.setPaymentAmount(totalPaymentAmount);
 
+		//会员缴费信息
 		CalenderMemberDto calenderMember = musicGroupPaymentBaseCalender.getCalenderMember();
 		if(calenderMember != null){
 			//设置会员缴费金额、级别以及有效期
@@ -622,6 +615,14 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			musicGroupPaymentCalender.setMemberRankSettingId(calenderMember.getMemberRankSettingId());
 			musicGroupPaymentCalender.setMemberValidDate(calenderMember.getMemberNum());
 			musicGroupPaymentCalender.setMemberPeriod(calenderMember.getPeriodEnum());
+			musicGroupPaymentCalender.setMemberOptionalFlag(calenderMember.getOptionalFlag());
+		}
+		//乐保缴费信息
+		MusicRepairDto musicRepair = musicGroupPaymentBaseCalender.getMusicRepair();
+		if(musicRepair != null){
+			musicGroupPaymentCalender.setMusicRepairNum(musicRepair.getNum());
+			musicGroupPaymentCalender.setMusicRepairActualPrice(musicRepair.getActualAmount());
+			musicGroupPaymentCalender.setMusicRepairOptionalFlag(musicRepair.getOptionalFlag());
 		}
 
 //		BigDecimal totalPaymentAmount = musicGroupPaymentCalenderDto.getMasterTotalPrice();
@@ -670,19 +671,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		musicGroupPaymentCalenderDao.insert(musicGroupPaymentCalender);
 
 		//课程费用列表
-		List<MusicGroupPaymentCalenderCourseSettings> currentMusicGroupPaymentCalenderCourseSettings = musicGroupPaymentCalender
-				.getMusicGroupPaymentCalenderCourseSettingsList();
-		if (currentMusicGroupPaymentCalenderCourseSettings != null && currentMusicGroupPaymentCalenderCourseSettings.size() > 0) {
-			MusicGroupOrganizationCourseSettings courseSettings = musicGroupOrganizationCourseSettingsService.get(musicGroupPaymentCalender
-					.getMusicGroupOrganizationCourseSettingId());
-			for (MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : currentMusicGroupPaymentCalenderCourseSettings) {
-				musicGroupPaymentCalenderCourseSettings.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
-				if (courseSettings != null) {
-					musicGroupPaymentCalenderCourseSettings.setName(courseSettings.getName());
-				}
-			}
-			musicGroupPaymentCalenderCourseSettingsService.batchInsert(currentMusicGroupPaymentCalenderCourseSettings);
-		}
+		musicGroupPaymentCalenderCourseSettingsService.batchInsert(musicGroupPaymentCalender);
+		//活动费用列表
+		musicGroupPaymentCalenderActivityService.batchInsert(musicGroupPaymentBaseCalender,musicGroupPaymentCalender.getId());
+		//
 
 		// 如果是报名，需要修改乐团状态
 		if (paymentType == MUSIC_APPLY) {
@@ -1053,17 +1045,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
 			}
 
-			if (currentMusicGroupPaymentCalenderCourseSettings.size() > 0) {
-				MusicGroupOrganizationCourseSettings courseSettings = musicGroupOrganizationCourseSettingsService.get(musicGroupPaymentCalender
-						.getMusicGroupOrganizationCourseSettingId());
-				for (MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : currentMusicGroupPaymentCalenderCourseSettings) {
-					musicGroupPaymentCalenderCourseSettings.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
-					if (courseSettings != null) {
-						musicGroupPaymentCalenderCourseSettings.setName(courseSettings.getName());
-					}
-				}
-				musicGroupPaymentCalenderCourseSettingsService.batchInsert(currentMusicGroupPaymentCalenderCourseSettings);
-			}
+			//课程费用列表
+			musicGroupPaymentCalenderCourseSettingsService.batchInsert(musicGroupPaymentCalender);
 		}
 
 		// 如果是报名，需要修改乐团状态

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

@@ -4,12 +4,25 @@
   <resultMap id="BaseResultMap" type="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity">
     <id column="id_" jdbcType="BIGINT" property="id" />
     <result column="activity_id_" jdbcType="INTEGER" property="activityId" />
-    <result column="calender_id_" jdbcType="INTEGER" property="calenderId" />
+    <result column="calender_id_" property="calenderId" />
     <result column="optional_flag_" jdbcType="TINYINT" property="optionalFlag" />
+    <result column="actual_price_" jdbcType="TINYINT" property="actualPrice" />
+    <result column="original_price_" jdbcType="TINYINT" property="originalPrice" />
     <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id_, activity_id_, calender_id_, optional_flag_, create_time_, update_time_
+    id_, activity_id_, calender_id_, optional_flag_,actual_price_ ,original_price_, create_time_, update_time_
   </sql>
+
+  <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_price_,
+    original_price_, create_time_, update_time_)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+      (#{entity.activityId}, #{entity.calenderId}, #{entity.optionalFlag}, #{entity.actualPrice},
+      #{entity.originalPrice}, NOW(), NOW())
+    </foreach>
+  </insert>
 </mapper>

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

@@ -36,6 +36,10 @@
         <result column="member_rank_setting_id_" property="memberRankSettingId"/>
         <result column="member_valid_date_" property="memberValidDate"/>
         <result column="member_period_" property="memberPeriod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="member_optional_flag_" property="memberOptionalFlag"/>
+        <result column="music_repair_num_" property="musicRepairNum"/>
+        <result column="music_repair_actual_price_" property="musicRepairActualPrice"/>
+        <result column="music_repair_optional_flag_" property="musicRepairOptionalFlag"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -55,13 +59,15 @@
         (music_group_id_,music_group_organization_course_settings_id_,pay_user_type_,reject_reason_,start_payment_date_,deadline_payment_date_,status_,expect_num_,
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,
         payment_pattern_,payment_type_,payment_amount_,batch_no_,audit_memo_,operator_,attribute1_,
-         attribute2_,student_ids_,member_payment_amount_,member_rank_setting_id_,member_valid_date_,original_member_payment_amount_,member_period_)
+         attribute2_,student_ids_,member_payment_amount_,member_rank_setting_id_,member_valid_date_
+         ,original_member_payment_amount_,member_period_,member_optional_flag_,music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_)
         VALUES(#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{rejectReason},#{startPaymentDate},#{deadlinePaymentDate},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{expectNum},#{actualNum},#{memo},#{isGiveMusicNetwork},now(),now(),
         #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{paymentAmount},#{batchNo},#{auditMemo},#{operator},#{attribute1},#{attribute2},#{studentIds},
-               #{memberPaymentAmount},#{memberRankSettingId},#{memberValidDate},#{originalMemberPaymentAmount},#{memberPeriod})
+               #{memberPaymentAmount},#{memberRankSettingId},#{memberValidDate},#{originalMemberPaymentAmount},#{memberPeriod},
+               #{memberOptionalFlag},#{musicRepairNum},#{musicRepairActualPrice},#{musicRepairOptionalFlag})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
@@ -70,14 +76,16 @@
         (music_group_id_,music_group_organization_course_settings_id_,pay_user_type_,reject_reason_,start_payment_date_,deadline_payment_date_,status_,expect_num_,
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,payment_amount_,
         payment_type_,batch_no_,audit_memo_,operator_,attribute1_,attribute2_,student_ids_,
-         member_payment_amount_,member_rank_setting_id_,member_valid_date_,original_member_payment_amount_,member_period_)
+         member_payment_amount_,member_rank_setting_id_,member_valid_date_,original_member_payment_amount_,member_period_
+        ,member_optional_flag_,music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
         (#{item.musicGroupId},#{item.musicGroupOrganizationCourseSettingId},#{item.payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.rejectReason},#{item.startPaymentDate},#{item.deadlinePaymentDate},#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{item.expectNum},#{item.actualNum},#{item.memo},#{item.isGiveMusicNetwork},now(),now(),
         #{item.paymentValidStartDate},#{item.paymentValidEndDate},#{item.paymentPattern},#{item.paymentAmount},#{item.paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{item.batchNo},#{item.auditMemo},#{item.operator},#{item.attribute1},#{item.attribute2},
-         #{item.studentIds},#{item.memberPaymentAmount},#{item.memberRankSettingId},#{item.memberValidDate},#{item.originalMemberPaymentAmount},#{item.memberPeriod})
+         #{item.studentIds},#{item.memberPaymentAmount},#{item.memberRankSettingId},#{item.memberValidDate},#{item.originalMemberPaymentAmount},#{item.memberPeriod},
+            #{item.memberOptionalFlag},#{item.musicRepairNum},#{item.musicRepairActualPrice},#{item.musicRepairOptionalFlag})
         </foreach>
     </insert>
 
@@ -85,6 +93,18 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender">
         UPDATE music_group_payment_calender
         <set>
+            <if test="memberOptionalFlag != null">
+                member_optional_flag_ = #{memberOptionalFlag},
+            </if>
+            <if test="musicRepairNum != null">
+                music_repair_num_ = #{musicRepairNum},
+            </if>
+            <if test="musicRepairActualPrice != null">
+                music_repair_actual_price_ = #{musicRepairActualPrice},
+            </if>
+            <if test="musicRepairOptionalFlag != null">
+                music_repair_optional_flag_ = #{musicRepairOptionalFlag},
+            </if>
             <if test="memberPeriod != null">
                 member_period_ = #{memberPeriod},
             </if>

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -4,17 +4,18 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.ym.common.ApiException;
-import com.ym.common.BaseResponse;
 import com.ym.common.DisplayEnum;
 import com.ym.common.ErrorEnum;
 import com.ym.config.IMProperties;
 import com.ym.config.RoomProperties;
-import com.ym.dao.*;
+import com.ym.dao.RoomDao;
+import com.ym.dao.RoomMemberDao;
+import com.ym.dao.UserDao;
+import com.ym.dao.WhiteboardDao;
 import com.ym.job.ScheduleManager;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.dao.CourseScheduleStudentMusicScoreDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.RongyunBasicUserDto;
 import com.ym.mec.biz.dal.entity.*;
@@ -91,8 +92,6 @@ public class RoomServiceImpl implements RoomService {
     @Autowired
     private SysExamSongDao sysExamSongDao;
     @Autowired
-    private SysConfigDao sysConfigDao;
-    @Autowired
     private CourseScheduleStudentMusicScoreDao courseScheduleStudentMusicScoreDao;
     @Autowired
     private SysMusicScoreAccompanimentDao sysMusicScoreAccompanimentDao;
@@ -124,13 +123,6 @@ public class RoomServiceImpl implements RoomService {
         return Integer.parseInt(roomId);
     }
 
-    public static void main(String[] args) {
-        Date date = DateUtil.stringToDate("2021-12-14 11:34:00", DateUtil.EXPANDED_DATE_TIME_FORMAT);
-        Date classDate = DateUtil.stringToDate("2021-12-14 11:40:00", DateUtil.EXPANDED_DATE_TIME_FORMAT);
-        int i = classDate.compareTo(DateUtil.addMinutes(date, 5));
-        int i1 = DateUtil.minutesBetween(classDate, date);
-    }
-
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     @Override
     public RoomResult joinRoom(String roomId) throws Exception {
@@ -163,7 +155,7 @@ public class RoomServiceImpl implements RoomService {
             continueCourseTime = "5";
         }
 
-        String autoCloseNetworkRoomTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_BEFORE_BUFFER_TIME,courseSchedule.getTenantId());
+        String autoCloseNetworkRoomTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_AFTER_BUFFER_TIME,courseSchedule.getTenantId());
         if(StringUtils.isEmpty(autoCloseNetworkRoomTime)){
             autoCloseNetworkRoomTime = "15";
         }