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

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
@@ -175,13 +176,14 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
     /**
      * 查询用户的乐团信息
      *
-     * @param UserId
+     * @param userId
      * @return
      */
-    MusicGroup findUserMusicGroup(@Param("UserId") Integer UserId);
+    MusicGroup findUserMusicGroup(@Param("userId") Integer userId);
 
     /**
      * 获取乐团信息
+     *
      * @param list
      * @return
      */
@@ -189,9 +191,16 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     /**
      * 获取乐团名称
+     *
      * @param musicGroupIds
      * @return
      */
     List<Map<String, String>> queryMusicGroupNameMap(@Param("musicGroupIds") Set<String> musicGroupIds);
 
+    /**
+     * 查询用户的学校
+     * @param userId
+     * @return
+     */
+    School findUserSchool(@Param("userId") Integer userId);
 }

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

@@ -30,145 +30,143 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
-public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicChargeInfo>  implements SporadicChargeInfoService {
-	
-	@Autowired
-	private SporadicChargeInfoDao sporadicChargeInfoDao;
-	@Autowired
-	private StudentPaymentOrderDao studentPaymentOrderDao;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-	@Autowired
-	private SysMessageService sysMessageService;
-	@Autowired
-	private OrganizationDao organizationDao;
-	@Autowired
-	private TeacherDao teacherDao;
-	@Autowired
-	private SysUserCashAccountService sysUserCashAccountService;
-	@Autowired
-	private SysUserCashAccountDetailService sysUserCashAccountDetailService;
+public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicChargeInfo> implements SporadicChargeInfoService {
 
-	@Override
-	public BaseDAO<Integer, SporadicChargeInfo> getDAO() {
-		return sporadicChargeInfoDao;
-	}
+    @Autowired
+    private SporadicChargeInfoDao sporadicChargeInfoDao;
+    @Autowired
+    private StudentPaymentOrderDao studentPaymentOrderDao;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private SysMessageService sysMessageService;
+    @Autowired
+    private OrganizationDao organizationDao;
+    @Autowired
+    private TeacherDao teacherDao;
+    @Autowired
+    private SysUserCashAccountService sysUserCashAccountService;
+    @Autowired
+    private SysUserCashAccountDetailService sysUserCashAccountDetailService;
 
-	@Override
-	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-	public Boolean renewForCallback(StudentPaymentOrder studentPaymentOrder) {
-		int updateCount = studentPaymentOrderDao.update(studentPaymentOrder);
-		if(updateCount <= 0){
-			throw new BizException("订单更新失败");
-		}
-		Integer userId = studentPaymentOrder.getUserId();
-		SysUser sysUser = sysUserFeignService.queryUserById(userId);
-		SporadicChargeInfo info = sporadicChargeInfoDao.get(Integer.parseInt(studentPaymentOrder.getMusicGroupId()));
-		Map<Integer,String> map = new HashMap();
-		map.put(userId,sysUser.getPhone());
-		Map<Integer,String> yimei = new HashMap();
-		map.put(userId,userId.toString());
-		if(studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS){
-			//活动，增加课程余额
-			if(info.getChargeType().equals("6")){
-				sysUserCashAccountService.appendCourseBalance(userId,studentPaymentOrder.getActualAmount());
-			}
+    @Override
+    public BaseDAO<Integer, SporadicChargeInfo> getDAO() {
+        return sporadicChargeInfoDao;
+    }
 
-			//插入交易明细
-			BigDecimal amount = studentPaymentOrder.getActualAmount();
-			if (amount != null && amount.compareTo(BigDecimal.ZERO) > 0) {
-				Date nowDate = new Date();
-				SysUserCashAccount cashAccount = sysUserCashAccountService.get(userId);
-				//充值
-				SysUserCashAccountDetail rechargeDetail = new SysUserCashAccountDetail();
-				rechargeDetail.setAmount(amount);
-				rechargeDetail.setBalance(cashAccount.getBalance().add(amount));
-				rechargeDetail.setComment("缴费前充值");
-				rechargeDetail.setCreateTime(nowDate);
-				rechargeDetail.setStatus(DealStatusEnum.SUCCESS);
-				rechargeDetail.setTransNo(studentPaymentOrder.getTransNo());
-				rechargeDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
-				rechargeDetail.setUpdateTime(nowDate);
-				rechargeDetail.setUserId(userId);
-				rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-				rechargeDetail.setComAmount(studentPaymentOrder.getComAmount());
-				rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount());
-				sysUserCashAccountDetailService.insert(rechargeDetail);
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    public Boolean renewForCallback(StudentPaymentOrder studentPaymentOrder) {
+        int updateCount = studentPaymentOrderDao.update(studentPaymentOrder);
+        if (updateCount <= 0) {
+            throw new BizException("订单更新失败");
+        }
+        Integer userId = studentPaymentOrder.getUserId();
+        SysUser sysUser = sysUserFeignService.queryUserById(userId);
+        SporadicChargeInfo info = sporadicChargeInfoDao.get(Integer.parseInt(studentPaymentOrder.getMusicGroupId()));
+        Map<Integer, String> map = new HashMap();
+        map.put(userId, sysUser.getPhone());
+        Map<Integer, String> yimei = new HashMap();
+        map.put(userId, userId.toString());
+        if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
+            //活动，增加课程余额
+            if (info.getChargeType().equals("6")) {
+                sysUserCashAccountService.appendCourseBalance(userId, studentPaymentOrder.getActualAmount());
+            }
 
-				//缴费
-				SysUserCashAccountDetail paymentDetail = new SysUserCashAccountDetail();
-				paymentDetail.setAmount(amount.negate());
-				paymentDetail.setBalance(cashAccount.getBalance());
-				paymentDetail.setComment(info.getTitle());
-				paymentDetail.setCreateTime(nowDate);
-				paymentDetail.setStatus(DealStatusEnum.SUCCESS);
-				paymentDetail.setTransNo(studentPaymentOrder.getTransNo());
-				paymentDetail.setType(PlatformCashAccountDetailTypeEnum.PAY_FEE);
-				paymentDetail.setUpdateTime(nowDate);
-				paymentDetail.setUserId(userId);
-				rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-				if (studentPaymentOrder.getComAmount() != null) {
-					rechargeDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
-					rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
-				}
+            //插入交易明细
+            BigDecimal amount = studentPaymentOrder.getActualAmount();
+            Date nowDate = new Date();
+            SysUserCashAccount cashAccount = sysUserCashAccountService.get(userId);
+            //充值
+            SysUserCashAccountDetail rechargeDetail = new SysUserCashAccountDetail();
+            rechargeDetail.setAmount(amount);
+            rechargeDetail.setBalance(cashAccount.getBalance().add(amount));
+            rechargeDetail.setComment("缴费前充值");
+            rechargeDetail.setCreateTime(nowDate);
+            rechargeDetail.setStatus(DealStatusEnum.SUCCESS);
+            rechargeDetail.setTransNo(studentPaymentOrder.getTransNo());
+            rechargeDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
+            rechargeDetail.setUpdateTime(nowDate);
+            rechargeDetail.setUserId(userId);
+            rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
+            rechargeDetail.setComAmount(studentPaymentOrder.getComAmount());
+            rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount());
+            sysUserCashAccountDetailService.insert(rechargeDetail);
 
-				sysUserCashAccountDetailService.insert(paymentDetail);
-			}
+            //缴费
+            SysUserCashAccountDetail paymentDetail = new SysUserCashAccountDetail();
+            paymentDetail.setAmount(amount.negate());
+            paymentDetail.setBalance(cashAccount.getBalance());
+            paymentDetail.setComment(info.getTitle());
+            paymentDetail.setCreateTime(nowDate);
+            paymentDetail.setStatus(DealStatusEnum.SUCCESS);
+            paymentDetail.setTransNo(studentPaymentOrder.getTransNo());
+            paymentDetail.setType(PlatformCashAccountDetailTypeEnum.PAY_FEE);
+            paymentDetail.setUpdateTime(nowDate);
+            paymentDetail.setUserId(userId);
+            rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
+            if (studentPaymentOrder.getComAmount() != null) {
+                rechargeDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
+                rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
+            }
 
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_SUCCESS, map, null, 0, "1",
-					studentPaymentOrder.getActualAmount(),info.getTitle());
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_SPORADIC_PAYMENT_SUCCESS, yimei, null, 0, "1",
-					studentPaymentOrder.getActualAmount(),info.getTitle());
-			return true;
-		}
-		if(studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED){
-			if(studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) >0 ){
-				sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(),PlatformCashAccountDetailTypeEnum.REFUNDS,info.getTitle()+"支付失败");
-			}
+            sysUserCashAccountDetailService.insert(paymentDetail);
 
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0,"",
-					studentPaymentOrder.getActualAmount(),info.getTitle());
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, yimei, null, 0, "",
-					studentPaymentOrder.getActualAmount(),info.getTitle());
-			return false;
-		}
-		return false;
-	}
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_SUCCESS, map, null, 0, "1",
+                    studentPaymentOrder.getActualAmount(), info.getTitle());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_SPORADIC_PAYMENT_SUCCESS, yimei, null, 0, "1",
+                    studentPaymentOrder.getActualAmount(), info.getTitle());
+            return true;
+        }
+        if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
+            if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
+                sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, info.getTitle() + "支付失败");
+            }
 
-	@Override
-	public PageInfo queryDetailPage(SporadicChargeInfoQueryInfo queryInfo) {
-		PageInfo<SporadicChargeInfo> pageInfo = queryPage(queryInfo);
-		List<SporadicChargeInfo> rows = pageInfo.getRows();
-		if(rows != null && rows.size() > 0){
-			Set<Integer> organIds = rows.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
-			List<Integer> userIds = rows.stream().map(e -> e.getUserId()).collect(Collectors.toList());
-			Set<Integer> operatorIds = rows.stream().map(e -> e.getOperatorId()).collect(Collectors.toSet());
-			Map<Integer,String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMap(StringUtils.join(organIds,",")));
-			Map<Integer,String> operatorNames = MapUtil.convertMybatisMap(teacherDao.queryNameByIds(StringUtils.join(operatorIds,",")));
-			Map<Integer,String> userNames = MapUtil.convertMybatisMap(teacherDao.queryUsernameByIds(userIds));
-			rows.forEach(e->{
-				e.setOrganName(organNames.get(e.getOrganId()));
-				if(e.getUserId() != null){
-					e.setUserName(userNames.get(e.getUserId()));
-				}
-				e.setOperatorName(operatorNames.get(e.getOperatorId()));
-			});
-		}
-		return pageInfo;
-	}
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0, "",
+                    studentPaymentOrder.getActualAmount(), info.getTitle());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, yimei, null, 0, "",
+                    studentPaymentOrder.getActualAmount(), info.getTitle());
+            return false;
+        }
+        return false;
+    }
 
-	@Override
-	public SporadicChargeInfo getDetail(Integer id) {
-		SporadicChargeInfo sporadicChargeInfo = sporadicChargeInfoDao.get(id);
-		if(sporadicChargeInfo.getUserId() != null){
-			SysUser sysUser = sysUserFeignService.queryUserById(sporadicChargeInfo.getUserId());
-			sporadicChargeInfo.setUserName(sysUser.getUsername());
-		}
-		return sporadicChargeInfo;
-	}
+    @Override
+    public PageInfo queryDetailPage(SporadicChargeInfoQueryInfo queryInfo) {
+        PageInfo<SporadicChargeInfo> pageInfo = queryPage(queryInfo);
+        List<SporadicChargeInfo> rows = pageInfo.getRows();
+        if (rows != null && rows.size() > 0) {
+            Set<Integer> organIds = rows.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
+            List<Integer> userIds = rows.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+            Set<Integer> operatorIds = rows.stream().map(e -> e.getOperatorId()).collect(Collectors.toSet());
+            Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMap(StringUtils.join(organIds, ",")));
+            Map<Integer, String> operatorNames = MapUtil.convertMybatisMap(teacherDao.queryNameByIds(StringUtils.join(operatorIds, ",")));
+            Map<Integer, String> userNames = MapUtil.convertMybatisMap(teacherDao.queryUsernameByIds(userIds));
+            rows.forEach(e -> {
+                e.setOrganName(organNames.get(e.getOrganId()));
+                if (e.getUserId() != null) {
+                    e.setUserName(userNames.get(e.getUserId()));
+                }
+                e.setOperatorName(operatorNames.get(e.getOperatorId()));
+            });
+        }
+        return pageInfo;
+    }
 
-	@Override
-	public SporadicChargeInfo findByOrganIdAndType(Integer organId, Integer type) {
-		return sporadicChargeInfoDao.findByOrganIdAndType(organId,type);
-	}
+    @Override
+    public SporadicChargeInfo getDetail(Integer id) {
+        SporadicChargeInfo sporadicChargeInfo = sporadicChargeInfoDao.get(id);
+        if (sporadicChargeInfo.getUserId() != null) {
+            SysUser sysUser = sysUserFeignService.queryUserById(sporadicChargeInfo.getUserId());
+            sporadicChargeInfo.setUserName(sysUser.getUsername());
+        }
+        return sporadicChargeInfo;
+    }
+
+    @Override
+    public SporadicChargeInfo findByOrganIdAndType(Integer organId, Integer type) {
+        return sporadicChargeInfoDao.findByOrganIdAndType(organId, type);
+    }
 }

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

@@ -796,44 +796,42 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
             //插入交易明细
             BigDecimal amount = studentPaymentOrder.getActualAmount();
-            if (amount != null && amount.compareTo(BigDecimal.ZERO) > 0) {
-                SysUserCashAccount cashAccount = sysUserCashAccountService.get(studentRegistration.getUserId());
-                //充值
-                SysUserCashAccountDetail rechargeDetail = new SysUserCashAccountDetail();
-                rechargeDetail.setAmount(amount);
-                rechargeDetail.setBalance(cashAccount.getBalance().add(amount));
-                rechargeDetail.setComment("缴费前充值");
-                rechargeDetail.setCreateTime(nowDate);
-                rechargeDetail.setStatus(DealStatusEnum.SUCCESS);
-                rechargeDetail.setTransNo(studentPaymentOrder.getTransNo());
-                rechargeDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
-                rechargeDetail.setUpdateTime(nowDate);
-                rechargeDetail.setUserId(studentRegistration.getUserId());
-                rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-                rechargeDetail.setComAmount(studentPaymentOrder.getComAmount());
-                rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount());
-                sysUserCashAccountDetailService.insert(rechargeDetail);
-
-                //缴费
-                SysUserCashAccountDetail paymentDetail = new SysUserCashAccountDetail();
-                paymentDetail.setAmount(amount.negate());
-                paymentDetail.setBalance(cashAccount.getBalance());
-                paymentDetail.setComment("报名缴费");
-                paymentDetail.setCreateTime(nowDate);
-                paymentDetail.setStatus(DealStatusEnum.SUCCESS);
-                paymentDetail.setTransNo(studentPaymentOrder.getTransNo());
-                paymentDetail.setType(PlatformCashAccountDetailTypeEnum.PAY_FEE);
-                paymentDetail.setUpdateTime(nowDate);
-                paymentDetail.setUserId(studentRegistration.getUserId());
-                rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-                if (studentPaymentOrder.getComAmount() != null) {
-                    rechargeDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
-                    rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
-                }
-
-                sysUserCashAccountDetailService.insert(paymentDetail);
+            SysUserCashAccount cashAccount = sysUserCashAccountService.get(studentRegistration.getUserId());
+            //充值
+            SysUserCashAccountDetail rechargeDetail = new SysUserCashAccountDetail();
+            rechargeDetail.setAmount(amount);
+            rechargeDetail.setBalance(cashAccount.getBalance().add(amount));
+            rechargeDetail.setComment("缴费前充值");
+            rechargeDetail.setCreateTime(nowDate);
+            rechargeDetail.setStatus(DealStatusEnum.SUCCESS);
+            rechargeDetail.setTransNo(studentPaymentOrder.getTransNo());
+            rechargeDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
+            rechargeDetail.setUpdateTime(nowDate);
+            rechargeDetail.setUserId(studentRegistration.getUserId());
+            rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
+            rechargeDetail.setComAmount(studentPaymentOrder.getComAmount());
+            rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount());
+            sysUserCashAccountDetailService.insert(rechargeDetail);
+
+            //缴费
+            SysUserCashAccountDetail paymentDetail = new SysUserCashAccountDetail();
+            paymentDetail.setAmount(amount.negate());
+            paymentDetail.setBalance(cashAccount.getBalance());
+            paymentDetail.setComment("报名缴费");
+            paymentDetail.setCreateTime(nowDate);
+            paymentDetail.setStatus(DealStatusEnum.SUCCESS);
+            paymentDetail.setTransNo(studentPaymentOrder.getTransNo());
+            paymentDetail.setType(PlatformCashAccountDetailTypeEnum.PAY_FEE);
+            paymentDetail.setUpdateTime(nowDate);
+            paymentDetail.setUserId(studentRegistration.getUserId());
+            rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
+            if (studentPaymentOrder.getComAmount() != null) {
+                rechargeDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
+                rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
             }
 
+            sysUserCashAccountDetailService.insert(paymentDetail);
+
             MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
             //三方乐团不发送缴费通知
             if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType() == CooperationOrgan.OwnershipType.OWN) {

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

@@ -310,7 +310,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			//正常签退范围(课程结束前10分钟，1小时内)
 			if(DateUtil.minutesBetween(classEndDateCut10Minutes,date) > 0 && DateUtil.minutesBetween(date,classEndDateAdd60Minutes) > 0){
 				teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
-			}else if(DateUtil.minutesBetween(classEndDateAdd60Minutes,date) > 0){
+				//异常签退时间段，并且没有签退状态
+			}else if(DateUtil.minutesBetween(classEndDateAdd60Minutes,date) > 0 && teacherAttendance.getSignOutStatus() == null){
 				teacherAttendance.setSignOutStatus(YesOrNoEnum.NO);
 			}else {
 				return;

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

@@ -148,10 +148,14 @@
     <select id="queryVipGroupTeacherClassTimesByMonth" resultMap="TaskRewardsRulesDtoMap">
 		SELECT COUNT(cs.id_) times_,cs.actual_teacher_id_,csrr.id_ active_id_ FROM course_schedule_rewards_rules csrr
 		LEFT JOIN vip_group vg ON FIND_IN_SET(vg.vip_group_category_id_,csrr.vip_group_category_id_list_)
-		LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_ AND FIND_IN_SET(cs.actual_teacher_id_,csrr.teacher_id_)
-		LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_ AND csts.user_id_ = cs.actual_teacher_id_
+		LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_
+		LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
+		LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
 		WHERE cs.group_type_ = 'VIP' AND csts.settlement_time_ IS NOT NULL
 		AND cs.class_date_ &gt;= #{firstDayOfMonth} AND cs.class_date_ &lt;= #{lastDayOfMonth}
+		AND FIND_IN_SET(cs.actual_teacher_id_,csrr.teacher_id_)
+		AND FIND_IN_SET(cg.subject_id_list_,csrr.subject_id_)
+		AND csts.user_id_ = cs.actual_teacher_id_
 		GROUP BY cs.actual_teacher_id_,csrr.id_
 	</select>
 	<select id="findByIds" resultMap="CourseScheduleRewardsRules">

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

@@ -384,7 +384,7 @@
 	<select id="findUserMusicGroup" resultMap="MusicGroup">
 		SELECT mg.* FROM music_group mg
 		LEFT JOIN student_registration sr on sr.music_group_id_ = mg.id_
-		WHERE sr.user_id_ = #{UserId} ORDER BY sr.id_ ASC LIMIT 1
+		WHERE sr.user_id_ = #{userId} ORDER BY sr.id_ ASC LIMIT 1
 	</select>
 
     <select id="findMusicGroup" resultMap="MusicGroup">
@@ -403,4 +403,11 @@
 		</foreach>
 		AND name_ IS NOT NULL
 	</select>
+
+	<select id="findUserSchool" resultMap="com.ym.mec.biz.dal.dao.SchoolDao.School">
+		SELECT s.* FROM music_group mg
+		LEFT JOIN student_registration sr on sr.music_group_id_ = mg.id_
+		LEFT JOIN school s on mg.school_id_ = s.id_
+		WHERE sr.user_id_ = #{userId} ORDER BY sr.id_ DESC LIMIT 1
+	</select>
 </mapper>

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

@@ -55,9 +55,9 @@
             <if test="balance!=null">balance_,</if>
             <if test="description!=null">description_,</if>
             <if test="comment!=null">comment_,</if>
-            <if test="createTime!=null">create_time_,</if>
+            create_time_,
             update_time_,
-            attribute1_,
+            <if test="attribute!=null">attribute1_,</if>
             <if test="channel!=null">channel_,</if>
             <if test="platformAccountNo!=null">platform_account_no_,</if>
         </trim>

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dao.VipGroupDao;
 import com.ym.mec.biz.dal.dto.*;
@@ -62,6 +63,8 @@ public class ExportController extends BaseController {
     private StudentRegistrationDao studentRegistrationDao;
     @Autowired
     private VipGroupDao vipGroupDao;
+    @Autowired
+    private MusicGroupDao musicGroupDao;
 
     @ApiOperation(value = "导出学员是否有课")
     @PostMapping("export/studentHasCourse")
@@ -235,7 +238,6 @@ public class ExportController extends BaseController {
                 row.setSporadicAmount(row.getActualAmount());
                 row.setMusicalFee(BigDecimal.ZERO);
                 row.setTeachingFee(BigDecimal.ZERO);
-                row.setTeachingFee(BigDecimal.ZERO);
                 if (row.getChargeType() != null) {
                     if (row.getChargeType().equals(1)) {
                         row.setSporadicType("考级");
@@ -251,6 +253,10 @@ public class ExportController extends BaseController {
                         row.setSporadicType("福袋活动");
                     }
                 }
+                School userSchool = musicGroupDao.findUserSchool(row.getUserId());
+                if(userSchool!= null){
+                    row.setSchoolName(userSchool.getName());
+                }
             }
             String paymentChannel = "";
             if (row.getPaymentChannel() == null) {