update

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

@@ -168,4 +168,11 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	 * @param musicGroupId
 	 */
 	void updateCalender(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
+
+	/**
+	 * 修改课程费用
+	 * @param ids
+	 * @param courseFee
+	 */
+    void batchUpdateCourseFee(@Param("ids") String ids, @Param("courseFee") BigDecimal courseFee);
 }

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

@@ -11,11 +11,11 @@ public interface MusicGroupPaymentCalenderDetailService extends BaseService<Long
 
     /**
      * 修改学员预计缴费金额
-     * @param actualAmount
+     * @param expectAmount
      * @param ids
      * @return
      */
-    void updateActualAmount(BigDecimal actualAmount,String ids);
+    void updateExpectAmount(BigDecimal expectAmount,String ids);
 
     /**
      * 开启缴费

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

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.common.service.BaseService;
 
+import java.math.BigDecimal;
+
 public interface MusicGroupStudentFeeService extends BaseService<Long, MusicGroupStudentFee> {
 
 	/**
@@ -33,4 +35,10 @@ public interface MusicGroupStudentFeeService extends BaseService<Long, MusicGrou
 	void updateStudentFeeIsLock(UpdateStudentFeeDto studentFeeDto);
 
 
+	/**
+	 * 批量修改课程费用
+	 * @param ids
+	 * @param courseFee
+	 */
+    void batchUpdateCourseFee(String ids, BigDecimal courseFee);
 }

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

@@ -35,8 +35,8 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void updateActualAmount(BigDecimal actualAmount,String ids) {
-		if(actualAmount == null || StringUtils.isEmpty(ids)){
+	public void updateExpectAmount(BigDecimal expectAmount,String ids) {
+		if(expectAmount == null || StringUtils.isEmpty(ids)){
 			throw new BizException("参数校验失败");
 		}
 		String[] split = ids.split(",");
@@ -51,7 +51,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 				throw new BizException("修改失败,缴费状态不匹配");
 			}
 			e.setUpdateTime(date);
-			e.setActualAmount(actualAmount);
+			e.setExpectAmount(expectAmount);
 		});
 		musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);
 	}

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

@@ -15,10 +15,12 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 @Service
@@ -102,4 +104,13 @@ public class MusicGroupStudentFeeServiceImpl extends BaseServiceImpl<Long, Music
 		musicGroupStudentFeeDao.updateStudentFeeIsLock(studentFeeDto);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void batchUpdateCourseFee(String ids, BigDecimal courseFee) {
+		if(StringUtils.isEmpty(ids) || courseFee == null){
+			throw new BizException("参数校验失败");
+		}
+		musicGroupStudentFeeDao.batchUpdateCourseFee(ids,courseFee);
+	}
+
 }

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

@@ -23,6 +23,7 @@
 		</association>
 		<association property="studentRegistration" javaType="com.ym.mec.biz.dal.entity.StudentRegistration">
 			<result column="subject_names_" property="subjectName" />
+			<result column="music_group_status_" property="musicGroupStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		</association>
 	</resultMap>
 
@@ -144,20 +145,22 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail"
 		parameterType="map">
-		SELECT mgpc.*,su.username_,st.name_ subject_names_
-		FROM music_group_payment_calender_detail mgpc
-		LEFT JOIN sys_user su ON su.id_ = mgpc.user_id_
-		LEFT JOIN student_registration sr ON sr.user_id_ = mgpc.user_id_
+		SELECT mgpcd.*,su.username_,st.name_ subject_names_,sr.music_group_status_
+		FROM music_group_payment_calender_detail mgpcd
+		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
+		LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_
 		LEFT JOIN `subject` st ON st.id_ = sr.actual_subject_id_
+		LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
 		<where>
+			mgpc.music_group_id_ = sr.music_group_id_
 			<if test="userId != null">
-				AND mgpc.user_id_ = #{userId}
+				AND mgpcd.user_id_ = #{userId}
 			</if>
 			<if test="id != null">
-				AND mgpc.music_group_payment_calender_id_ = #{id}
+				AND mgpcd.music_group_payment_calender_id_ = #{id}
 			</if>
 			<if test="paymentStatus != null">
-				AND mgpc.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				AND mgpcd.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 			<if test="subjectId != null">
 				AND #{subjectId} = sr.actual_subject_id_
@@ -169,21 +172,21 @@
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(mgpc.id_) FROM music_group_payment_calender_detail mgpc
-		LEFT JOIN student_registration sr ON sr.user_id_ = mgpc.user_id_
+		SELECT COUNT(DISTINCT mgpcd.id_) FROM music_group_payment_calender_detail mgpcd
+		LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_
 		LEFT JOIN `subject` st ON st.id_ = sr.actual_subject_id_
 		<where>
 			<if test="userId != null">
-				AND mgpc.user_id_ = #{userId}
+				AND mgpcd.user_id_ = #{userId}
 			</if>
 			<if test="id != null">
-				AND mgpc.music_group_payment_calender_id_ = #{id}
+				AND mgpcd.music_group_payment_calender_id_ = #{id}
 			</if>
 			<if test="subjectId != null">
 				AND #{subjectId} = sr.actual_subject_id_
 			</if>
 			<if test="paymentStatus != null">
-				AND mgpc.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				AND mgpcd.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 		</where>
 	</select>

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

@@ -264,4 +264,8 @@
         SELECT GROUP_CONCAT(mgpc.payment_month_) FROM music_group_payment_calender mgpc WHERE mgpc.music_group_id_ = mgsf.music_group_id_)
         WHERE mgsf.music_group_id_ = #{musicGroupId} AND mgsf.user_id_ = #{userId}
     </update>
+    <update id="batchUpdateCourseFee">
+        UPDATE music_group_student_fee_ mgsf SET mgsf.course_fee_ = #{courseFee}
+        WHERE FIND_IN_SET(mgsf.id_,#{ids})
+    </update>
 </mapper>

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

@@ -30,10 +30,10 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
     }
 
     @ApiOperation(value = "修改学员预计缴费金额")
-    @PostMapping("/updateActualAmount")
-    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalenderDetail/updateActualAmount')")
-    public Object updateActualAmount(BigDecimal actualAmount,String ids) {
-        musicGroupPaymentCalenderDetailService.updateActualAmount(actualAmount,ids);
+    @PostMapping("/updateExpectAmount")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalenderDetail/updateExpectAmount')")
+    public Object updateExpectAmount(BigDecimal expectAmount,String ids) {
+        musicGroupPaymentCalenderDetailService.updateExpectAmount(expectAmount,ids);
         return succeed();
     }
 

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

@@ -8,9 +8,12 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+
 @RequestMapping("musicGroupStudentFee")
 @Api(tags = "乐团学生费用")
 @RestController
@@ -26,4 +29,12 @@ public class MusicGroupStudentFeeController extends BaseController {
         return succeed(musicGroupStudentFeeService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "批量修改课程费用")
+    @PostMapping("/batchUpdateCourseFee")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupStudentFee/batchUpdateCourseFee')")
+    public Object batchUpdateCourseFee(String ids, BigDecimal courseFee) {
+        musicGroupStudentFeeService.batchUpdateCourseFee(ids,courseFee);
+        return succeed();
+    }
+
 }