Merge remote-tracking branch 'origin/master'

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

@@ -8,7 +8,7 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum DealStatusEnum implements BaseEnum<String, DealStatusEnum> {
 	ING("ING", "交易中"),
 	SUCCESS("SUCCESS", "成功交易"),
-	FAilED("FAILED", "交易失败"),
+	FAILED("FAILED", "交易失败"),
 	CLOSE("CLOSE", "交易关闭");
 
 	private String code;

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

@@ -3,8 +3,10 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum MusicGroupStatusEnum implements BaseEnum<String, MusicGroupStatusEnum> {
-	DRAFT("DRAFT", "草稿"), AUDIT("AUDIT", "审核中"), AUDIT_FAILED("AUDIT_FAILED", "审核失败"), APPLY("APPLY", "报名中"), PAY("PAY", "缴费中"), PREPARE("PREPARE", "筹备中"), PROGRESS(
-			"PROGRESS", "进行中"), CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");
+	DRAFT("DRAFT", "草稿"), AUDIT("AUDIT", "审核中"),
+	AUDIT_FAILED("AUDIT_FAILED", "审核失败"), APPLY("APPLY", "报名中"),
+	PAY("PAY", "缴费中"), PREPARE("PREPARE", "筹备中"),
+	PROGRESS("PROGRESS", "进行中"), CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");
 
 	private String code;
 	private String msg;

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

@@ -231,4 +231,10 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param musicGroupId
 	 */
 	void musicGroupAuditSuccess(String musicGroupId) throws Exception;
+
+	/**
+	 * 乐团筹备结束后，3.0乐团推送小班课缴费信息
+	 * @param musicGroupId
+	 */
+	void pushMessage(String musicGroupId) throws IOException;
 }

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

@@ -86,4 +86,12 @@ public interface SubjectService extends BaseService<Integer, Subject> {
     List<Subject> findBySubjectByIdList(List<Integer> subjectIdList);
 
     List<Subject> findBySubjectByIdList(String subjectIdList);
+
+    /**
+     * 根据声部id字符串查询
+     *
+     * @param subIds
+     * @return
+     */
+    List<String> findBySubIds(String subIds);
 }

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

@@ -332,7 +332,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
             }
             //检测新排课冲突
-            courseScheduleService.checkNewCourseSchedules(courseScheduleList,false);
+            courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
             courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
             List<ImGroupMember> groupMembers = musicGroupService.queryMusicGroupTeachers(highClassGroup.getMusicGroupId());
             groupMembers.add(new ImGroupMember(classGroupTeacherMapper.getUserId().toString()));
@@ -494,7 +494,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         courseListDtos.addAll(classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ",")));
         courseListDtos.addAll(vipCourses);
         //检测对应乐团是否已申请退费
-        List<Map<String, Integer>> isApplyMaps = studentApplyRefundsDao.checkIsApplyRefund(musicGroupIds, userId);
+        List<Map<String, Integer>> isApplyMaps;
+        if(musicGroupIds != null && musicGroupIds.size() > 0){
+            isApplyMaps = studentApplyRefundsDao.checkIsApplyRefund(musicGroupIds, userId);
+        }else {
+            isApplyMaps = new ArrayList<>();
+        }
         Map<String, Integer> isApplyMap = MapUtil.convertIntegerMap(isApplyMaps);
         //获取所有教学点名称列表
         Set<Integer> schoolIds = courseListDtos.stream().map(CourseListDto::getTeacherSchoolId).collect(Collectors.toSet());
@@ -559,7 +564,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             //获取班级老师总数map
             List<Map<Integer, Long>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
-            Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(nums)),HashMap.class);
+            Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(nums)), HashMap.class);
             imGroupModels.forEach(e -> {
                 Integer num = numsMap.get(e.getId());
                 e.setCount((num == null ? 0 : num) + e.getCount());
@@ -1554,16 +1559,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     e.setMasterTeacherId(currentBishopTeacher.getUserId());
                     e.setMasterTeacherName(currentBishopTeacher.getUserName());
                 }
-
                 List<CourseScheduleTeacherSalary> currentCourseTeachingTeachers = courseScheduleTeachingTeacherMaps.get(e.getCourseScheduleId().longValue());
                 if (CollectionUtils.isEmpty(currentCourseTeachingTeachers)) {
-                    e.setTeacherNum(0);
-                    e.setTeachingTeachers(new ArrayList<>());
+                    currentCourseTeachingTeachers = new ArrayList<>();
+                    currentCourseTeachingTeachers.add(currentBishopTeacher);
+                    e.setTeacherNum(currentCourseTeachingTeachers.size());
+                    e.setTeachingTeachers(currentCourseTeachingTeachers);
                 } else {
+                    currentCourseTeachingTeachers.add(currentBishopTeacher);
                     e.setTeachingTeachers(currentCourseTeachingTeachers);
                     e.setTeacherNum(currentCourseTeachingTeachers.size());
                 }
-
             });
         }
         if (count == 0) {
@@ -1581,14 +1587,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public List<ClassGroup> highClassGroupList(String musicGroupId) {
-        List<Subject> subjectList = subjectService.findAll(new HashMap<>());
         List<ClassGroup> classGroupList = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId, ClassGroupTypeEnum.HIGH);
         for (ClassGroup classGroup : classGroupList) {
-            for (Subject subject : subjectList) {
-                if (classGroup.getSubjectIdList().equals(subject.getId().toString())) {
-                    classGroup.setSubjectName(subject.getName());
-                }
-            }
+            List<String> subjects = subjectService.findBySubIds(classGroup.getSubjectIdList());
+            String subjectName = StringUtils.join(subjects, "/");
+            classGroup.setSubjectName(subjectName);
         }
         return classGroupList;
     }

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

@@ -182,7 +182,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
             });
             studentRegistrationDao.batchInsert(studentRegistrationList);
-            musicGroup.setStatus(MusicGroupStatusEnum.PREPARE);
+            musicGroup.setStatus(MusicGroupStatusEnum.PAY);
             musicGroupDao.update(musicGroup);
             musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "跨团调整", sysUser.getId(),""));
         }
@@ -261,7 +261,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
         musicGroupDao.update(musicGroup);
         //3.0发送该消息
-        if(new Integer(3).equals(musicGroup.getChargeTypeId())){
+        /*if(new Integer(3).equals(musicGroup.getChargeTypeId())){
             Map<Integer,String> studentMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(studentRegistrationDao.findIdMapByMusicGroupId(musicGroupId,2))),HashMap.class);
             if(studentMap != null && studentMap.size() > 0){
                 String url = "http://mstudev.dayaedu.com/#/smallRegister?musicGroupId=" + musicGroupId;
@@ -269,7 +269,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 sysMessageService.batchSendMessage(MessageSender.JIGUANG,MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE,
                         studentMap,null,0,"5?" + url,musicGroup.getName(),HttpUtil.getSortUrl(url),serverPhone);
             }
-        }
+        }*/
         //给老师发送乐团成立通知
         Map<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(musicGroupDao.queryTeacherIdMap(musicGroupId))),HashMap.class);
         if(map != null && map.size() > 0){
@@ -350,6 +350,21 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
+    public void pushMessage(String musicGroupId) throws IOException {
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        //3.0发送该消息
+        if(new Integer(3).equals(musicGroup.getChargeTypeId())){
+            Map<Integer,String> studentMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(studentRegistrationDao.findIdMapByMusicGroupId(musicGroupId,2))),HashMap.class);
+            if(studentMap != null && studentMap.size() > 0){
+                String url = "http://mstudev.dayaedu.com/#/smallRegister?musicGroupId=" + musicGroupId;
+                String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
+                sysMessageService.batchSendMessage(MessageSender.JIGUANG,MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE,
+                        studentMap,null,0,"5?" + url,musicGroup.getName(),HttpUtil.getSortUrl(url),serverPhone);
+            }
+        }
+    }
+
+    @Override
     public List<MusicCardDto> queryUserMusicGroups(Integer userId) {
         List<MusicCardDto> musicCardDtos = musicGroupDao.queryUserMusicGroups(userId);
         Set<String> musicGroupIds = musicCardDtos.stream().map(MusicCardDto::getMusicGroupId).collect(Collectors.toSet());
@@ -758,7 +773,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     studentRegistration.getParentsName(),studentPaymentOrder.getActualAmount());
             return true;
         }
-        if(studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAilED){
+        if(studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED){
 //            String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + musicGroupId;
             String memo = "http://mstudev.dayaedu.com/#/renew?musicGroupId=" + musicGroupId;
             //4?http://mstudev.dayaedu.com/#/renew?musicGroupId=" +musicGroupId

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

@@ -1,11 +1,23 @@
 package com.ym.mec.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.huifu.adapay.model.payment.Payment;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
@@ -20,11 +32,6 @@ import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.thirdparty.yqpay.RsqMsg;
 import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
 import com.ym.mec.thirdparty.yqpay.YqPayUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, StudentPaymentOrder> implements StudentPaymentOrderService {
@@ -153,7 +160,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     private void updateOrder(Map<String, String> rpMap) throws Exception {
-        DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAilED;
+        DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
         StudentPaymentOrder order = findOrderByOrderNo(rpMap.get("merOrderNo"));
         if (order == null || !order.getStatus().equals(DealStatusEnum.ING)) {
             return;
@@ -188,7 +195,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
         List<StudentPaymentOrder> ordersOverTime = findOrdersOverTime(orderNoList, DealStatusEnum.ING, beforeDate);
         for (StudentPaymentOrder order : ordersOverTime) {
-            order.setStatus(DealStatusEnum.FAilED);
+            order.setStatus(DealStatusEnum.FAILED);
             order.setMemo("超时未支付关闭");
             if (order.getType().equals(OrderTypeEnum.APPLY)) { //报名订单
                 studentRegistrationService.updateApplyOrder(order);

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

@@ -99,7 +99,7 @@ public class StudentRechargeServiceImpl extends BaseServiceImpl<String, StudentR
 				throw new BizException("充值记录不存在");
 			}
 
-			DealStatusEnum status = notifyMsg.getStatus().equals("TRADE_SUCCESS") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAilED;
+			DealStatusEnum status = notifyMsg.getStatus().equals("TRADE_SUCCESS") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
 
 			String transNo = notifyMsg.getSeqId();
 

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

@@ -553,7 +553,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //失败减去已收款金额
 
         //减去缴费人数
-        if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAilED)) {
+        if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAILED)) {
             musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
             musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
             //发送缴费成功通知（短信 + push）

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

@@ -66,6 +66,10 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType, String platformAccountNo) {
+		
+		if (status == null || status == DealStatusEnum.ING) {
+			throw new BizException("交易状态有误");
+		}
 
 		StudentWithdraw studentWithdraw = get(id);
 
@@ -96,7 +100,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 			}
 			sysUserCashAccount.setFrozenAmount(sysUserCashAccount.getFrozenAmount().subtract(amount));
 
-			if (status == DealStatusEnum.FAilED) {
+			if (status == DealStatusEnum.FAILED) {
 				sysUserCashAccount.setBalance(sysUserCashAccount.getBalance().add(amount));
 			}
 			sysUserCashAccount.setUpdateTime(date);

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

@@ -175,4 +175,9 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     public List<Subject> findBySubjectByIdList(String subjectIdList) {
         return subjectDao.findBySubjectByIdList(subjectIdList);
     }
+
+    @Override
+    public List<String> findBySubIds(String subIds) {
+        return subjectDao.findBySubIds(subIds);
+    }
 }

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

@@ -512,9 +512,9 @@
     </select>
 
     <select id="countStudyNum" resultType="java.util.Map">
-        SELECT sr.class_group_id_ 'key',COUNT(sr.user_id_) 'value' FROM student_registration sr
-        WHERE FIND_IN_SET(sr.class_group_id_,#{classGroupIds}) AND sr.music_group_status_ != 'QUIT'
-        GROUP BY sr.class_group_id_
+        SELECT cgsm.class_group_id_ 'key',COUNT(cgsm.user_id_) 'value' FROM class_group_student_mapper cgsm
+        LEFT JOIN student_registration sr ON (sr.user_id_ = cgsm.user_id_ AND sr.music_group_id_ = cgsm.music_group_id_)
+        WHERE FIND_IN_SET(cgsm.class_group_id_,#{classGroupIds}) AND cgsm.status_='NORMAL' AND FIND_IN_SET(sr.music_group_status_,'NORMAL,LEAVE') GROUP BY cgsm.class_group_id_
     </select>
 
     <select id="countQuitNum" resultType="java.util.Map">

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

@@ -99,7 +99,7 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="StudentRechargeVO" parameterType="map">
-        SELECT sr.*,u.username_,cad.trans_no_,cad.trans_type_ FROM student_recharge sr left join sys_user u on sr.user_id_ = u.id_ left join sys_user_cash_account_detail cad on sr.user_id_ = cad.user_id_ where 1 = 1
+        SELECT sr.*,u.username_,cad.trans_no_,cad.trans_type_ FROM student_recharge sr, sys_user u, sys_user_cash_account_detail cad where sr.user_id_ = u.id_ and sr.user_id_ = cad.user_id_
         <if test="status != null">
            and sr.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>

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

@@ -94,17 +94,14 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="StudentWithdraw" parameterType="map">
         SELECT sw.*,cad.platform_account_no_,cad.trans_type_,su.real_name_,cad.balance_
-        FROM student_withdraw sw
-        LEFT JOIN sys_user_cash_account_detail cad ON sw.id_ = cad.attribute1_
-        LEFT JOIN sys_user su ON su.id_ = sw.user_id_
-        <where>
-            <if test="userId != null">
-                and sw.user_id_ = #{userId}
-            </if>
-            <if test="bankCardNo != null">
-                and sw.bank_card_no_ = #{bankCardNo}
-            </if>
-        </where>
+        FROM student_withdraw sw,sys_user_cash_account_detail cad ,sys_user su
+        where cad.type_ = 'WITHDRAW' and sw.id_ = cad.attribute1_ and su.id_ = sw.user_id_ and sw.status_ = cad.status_
+        <if test="userId != null">
+            and sw.user_id_ = #{userId}
+        </if>
+        <if test="bankCardNo != null">
+            and sw.bank_card_no_ = #{bankCardNo}
+        </if>
         ORDER BY sw.create_time_ DESC
         <include refid="global.limit"/>
     </select>

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

@@ -43,17 +43,17 @@
         </selectKey>
         -->
         INSERT INTO sys_user_cash_account_detail
-        (user_id_,trans_no_,type_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_,channel_,platform_account_no_)
-        VALUES(#{userId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},#{comment},now(),now(),#{attribute},#{channel},#{platformAccountNo})
+        (user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_,channel_,platform_account_no_)
+        VALUES(#{userId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},#{comment},now(),now(),#{attribute},#{channel},#{platformAccountNo})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountDetail" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account_detail
-        (user_id_,trans_no_,type_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_,channel_,platform_account_no_)
+        (user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_,channel_,platform_account_no_)
         VALUE
         <foreach collection="sysUserCashAccountDetails" item="sysUserCashAccountDetail" separator=",">
-            (#{sysUserCashAccountDetail.userId},#{sysUserCashAccountDetail.transNo},#{sysUserCashAccountDetail.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.amount},#{sysUserCashAccountDetail.balance},#{sysUserCashAccountDetail.description},#{sysUserCashAccountDetail.comment},now(),now(),#{sysUserCashAccountDetail.attribute},#{sysUserCashAccountDetail.channel},#{sysUserCashAccountDetail.platformAccountNo})
+            (#{sysUserCashAccountDetail.userId},#{sysUserCashAccountDetail.transNo},#{sysUserCashAccountDetail.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.amount},#{sysUserCashAccountDetail.balance},#{sysUserCashAccountDetail.description},#{sysUserCashAccountDetail.comment},now(),now(),#{sysUserCashAccountDetail.attribute},#{sysUserCashAccountDetail.channel},#{sysUserCashAccountDetail.platformAccountNo})
         </foreach>
     </insert>
 

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

@@ -365,7 +365,6 @@
 
     <sql id="queryTeacherAttendanceSql">
         <where>
-            (cs.type_ = 'SINGLE' OR cs.type_ = 'MIX')
             <if test="startTime != null and startTime != ''">
                 AND cs.class_date_ &gt;= #{startTime}
             </if>

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -220,7 +220,7 @@ public class StudentOrderController extends BaseController {
     }
 
     public void updateOrder(Map<String, String> rpMap) throws Exception {
-        DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAilED;
+        DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
         StudentPaymentOrder order = studentPaymentOrderService.findOrderByOrderNo(rpMap.get("merOrderNo"));
         if (order == null || !order.getStatus().equals(DealStatusEnum.ING)) {
             return;
@@ -255,7 +255,7 @@ public class StudentOrderController extends BaseController {
 
         List<StudentPaymentOrder> ordersOverTime = studentPaymentOrderService.findOrdersOverTime(orderNoList, DealStatusEnum.ING, beforeDate);
         for (StudentPaymentOrder order : ordersOverTime) {
-            order.setStatus(DealStatusEnum.FAilED);
+            order.setStatus(DealStatusEnum.FAILED);
             order.setMemo("超时未支付关闭");
             if (order.getType().equals(OrderTypeEnum.APPLY)) { //报名订单
                 studentRegistrationService.updateApplyOrder(order);

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

@@ -116,6 +116,21 @@ public class MusicGroupController extends BaseController {
 		return succeed(musicGroupService.createGroup(subFeeSettingDto));
 	}
 
+	@ApiOperation(value = "乐团筹备结束后，3.0乐团推送小班课缴费信息")
+	@PostMapping("/pushMessage")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/pushMessage')")
+	public Object pushMessage(String musicGroupId) throws Exception {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null || sysUser.getId() == null) {
+			return failed("获取用户信息失败");
+		}
+		if(StringUtils.isEmpty(musicGroupId)){
+			throw new Exception("参数校验错误");
+		}
+		musicGroupService.pushMessage(musicGroupId);
+		return succeed();
+	}
+
 	@ApiOperation(value = "根据乐团ids获取乐团列表")
 	@PostMapping("/queryListByIds")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/queryListByIds')")