Merge remote-tracking branch 'origin/master'

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

@@ -12,6 +12,8 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
+	
+	MusicGroup getLocked(String id);
 
     /**
      * 获取学员所在乐团详情列表

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

@@ -1,48 +1,59 @@
 package com.ym.mec.biz.dal.dao;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrder> {
 
-    /**
-     * 查询商品列表
-     *
-     * @param musicGroupId
-     * @param type
-     * @return
-     */
-    List<Goods> queryApplyGoodsList(@Param("musicGroupId") Integer musicGroupId, @Param("type") OrderDetailTypeEnum type);
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/3
-     * 根据学生vip课获取缴费订单
-     */
-    StudentPaymentOrder findByStudentVipGroup(@Param("vipGroupId") Long vipGroupId, @Param("userId") Long userId);
-
-    /**
-     * 查询乐团报名的订单
-     *
-     * @param userId
-     * @param musicGroupId
-     * @param status
-     * @return
-     */
-    StudentPaymentOrder findMusicGroupApplyOrderByStatus(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId, @Param("status") DealStatusEnum status);
-
-    /**
-     * 根据订单号查询订单
-     * @param orderNo
-     * @return
-     */
-    StudentPaymentOrder findOrderByOrderNo(@Param("orderNo") String orderNo);
+	/**
+	 * 查询商品列表
+	 *
+	 * @param musicGroupId
+	 * @param type
+	 * @return
+	 */
+	List<Goods> queryApplyGoodsList(@Param("musicGroupId") String musicGroupId, @Param("type") OrderDetailTypeEnum type);
+
+	/**
+	 * @Author: Joburgess
+	 * @Date: 2019/10/3
+	 * 根据学生vip课获取缴费订单
+	 */
+	StudentPaymentOrder findByStudentVipGroup(@Param("vipGroupId") Long vipGroupId, @Param("userId") Long userId);
+
+	/**
+	 * 查询乐团报名的订单
+	 *
+	 * @param userId
+	 * @param musicGroupId
+	 * @param status
+	 * @return
+	 */
+	StudentPaymentOrder findMusicGroupApplyOrderByStatus(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId,
+			@Param("status") DealStatusEnum status);
+
+	/**
+	 * 根据订单号查询订单
+	 * @param orderNo
+	 * @return
+	 */
+	StudentPaymentOrder findOrderByOrderNo(@Param("orderNo") String orderNo);
+
+	/**
+	 * 查询指定交易状态的乐团报名的订单信息
+	 * @param musicGroupId 乐团编号
+	 * @param type 订单类型
+	 * @param status 订单状态
+	 * @return
+	 */
+	List<StudentPaymentOrder> queryByDealStatus(@Param("musicGroupId") String musicGroupId, @Param("type") OrderTypeEnum type,
+			@Param("status") DealStatusEnum status);
 }

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

@@ -43,10 +43,10 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
 
     /**
      * 通过乐团收费类型，获取默认的声部列表
-     * @param musicGroupId
+     * @param chargeTypeId
      * @return
      */
-    List<Subject> findDefaultSubByGroupId(Integer musicGroupId);
+    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId);
 
     /**
      * 通过乐团编号获取声部列表以及声部报名、缴费、计划人数

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

@@ -2,17 +2,14 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
 
 public interface SysUserCashAccountDao extends BaseDAO<Integer, SysUserCashAccount> {
+	
+	/**
+	 * 获取行级锁
+	 * @param userId
+	 * @return
+	 */
+	SysUserCashAccount getLocked(Integer userId);
 
-    /**
-     * 账户余额加
-     * @param userId
-     * @param amount
-     * @return
-     */
-    int incrAccount(@Param("userId") Integer userId, @Param("amount") BigDecimal amount);
 }

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

@@ -8,7 +8,7 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
 	APPLY("APPLY", "报名"),
 	RENEW("RENEW", "续费"),
-	ELSE("ELSE", "其他"),
+	OTHER("OTHER", "其他"),
 	SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "小课购买");
 
 	private String code;

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

@@ -29,7 +29,7 @@ public interface ContractService {
 	 * @param musicGroupId
 	 * @return
 	 */
-	boolean transferMusicGroupCoursesContract(Integer userId, Integer musicGroupId);
+	boolean transferMusicGroupCoursesContract(Integer userId, String musicGroupId);
 
 	/**
 	 * 查询课程协议
@@ -37,7 +37,7 @@ public interface ContractService {
 	 * @param musicGroupId
 	 * @return
 	 */
-	String queryMusicGroupCoursesContract(Integer userId, Integer musicGroupId);
+	String queryMusicGroupCoursesContract(Integer userId, String musicGroupId);
 
 	/**
 	 * 传递商品协议
@@ -45,7 +45,7 @@ public interface ContractService {
 	 * @param musicGroupId
 	 * @return
 	 */
-	boolean transferGoodsContract(Integer userId, Integer musicGroupId);
+	boolean transferGoodsContract(Integer userId, String musicGroupId);
 
 	/**
 	 * 查询商品协议
@@ -53,5 +53,5 @@ public interface ContractService {
 	 * @param musicGroupId
 	 * @return
 	 */
-	String queryGoodsContract(Integer userId, Integer musicGroupId);
+	String queryGoodsContract(Integer userId, String musicGroupId);
 }

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

@@ -6,9 +6,7 @@ import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
-import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.common.service.BaseService;
-import org.apache.ibatis.annotations.Param;
 
 public interface StudentPaymentOrderService extends BaseService<Long, StudentPaymentOrder> {
 
@@ -18,7 +16,7 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
 	 * @param type
 	 * @return
 	 */
-	List<Goods> queryApplyGoodsList(Integer musicGroupId, OrderDetailTypeEnum type);
+	List<Goods> queryApplyGoodsList(String musicGroupId, OrderDetailTypeEnum type);
 
 	/**
 	 * 查询报名缴费订单

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

@@ -35,10 +35,10 @@ public interface SubjectService extends BaseService<Integer, Subject> {
     /**
      * 通过乐团收费类型，获取默认的声部列表
      *
-     * @param musicGroupId
+     * @param chargeTypeId
      * @return
      */
-    List<Subject> findDefaultSubByGroupId(Integer musicGroupId);
+    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId);
 
     /**
      * 通过乐团编号获取声部列表以及声部报名、缴费、计划人数

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

@@ -1,8 +1,17 @@
 package com.ym.mec.biz.service;
 
+import java.math.BigDecimal;
+
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.common.service.BaseService;
 
 public interface SysUserCashAccountService extends BaseService<Integer, SysUserCashAccount> {
 
+	/**
+	 * 更新指定用户的账户余额
+	 * @param userId 用户编号
+	 * @param decimal 交易金额（支持负数）
+	 * @return
+	 */
+	boolean updateBalance(Integer userId, BigDecimal decimal);
 }

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

@@ -179,7 +179,7 @@ public class ContractServiceImpl implements ContractService {
 	}
 
 	@Override
-	public boolean transferMusicGroupCoursesContract(Integer userId, Integer musicGroupId) {
+	public boolean transferMusicGroupCoursesContract(Integer userId, String musicGroupId) {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
@@ -233,7 +233,7 @@ public class ContractServiceImpl implements ContractService {
 	}
 
 	@Override
-	public String queryMusicGroupCoursesContract(Integer userId, Integer musicGroupId) {
+	public String queryMusicGroupCoursesContract(Integer userId, String musicGroupId) {
 
 		// 合成freemarker
 		String srcPdfPath = contractBaseDir + "/courses/" + userId + ".pdf";
@@ -264,7 +264,7 @@ public class ContractServiceImpl implements ContractService {
 	}
 
 	@Override
-	public boolean transferGoodsContract(Integer userId, Integer musicGroupId) {
+	public boolean transferGoodsContract(Integer userId, String musicGroupId) {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
@@ -325,7 +325,7 @@ public class ContractServiceImpl implements ContractService {
 	}
 
 	@Override
-	public String queryGoodsContract(Integer userId, Integer musicGroupId) {
+	public String queryGoodsContract(Integer userId, String musicGroupId) {
 
 		// 合成freemarker
 		String srcPdfPath = contractBaseDir + "/goods/" + userId + ".pdf";

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

@@ -104,7 +104,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	public List<Date> getCourseScheduleDateByStudent(Date month, Integer isAttend) {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(null==user){
-			throw new BizException("请登录");
+			throw new BizException("获取用户信息失败");
 		}
 		return courseScheduleDao.getStudentCourseScheduleDate(user.getId().longValue(),month,isAttend);
 	}
@@ -113,7 +113,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	public List<Date> getCourseScheduleDateByTeacher(Date month) {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(null==user){
-			throw new BizException("请登录");
+			throw new BizException("获取用户信息失败");
 		}
 		return courseScheduleDao.getTeacherCourseScheduleDate(user.getId().longValue(),month);
 	}

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

@@ -20,6 +20,7 @@ import com.ym.mec.biz.dal.dao.MusicGroupPaymentEntitiesDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dao.MusicGroupSubjectGoodsGroupDao;
 import com.ym.mec.biz.dal.dao.MusicGroupSubjectPlanDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
@@ -29,10 +30,14 @@ import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentEntities;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
@@ -63,7 +68,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	
 	@Autowired
 	private ClassGroupStudentMapperDao classGroupStudentMapperDao;
-
+	
+	@Autowired
+	private StudentPaymentOrderDao studentPaymentOrderDao;
+	
+	@Autowired
+	private SysUserCashAccountService sysUserCashAccountService;
+	
 	@Override
 	public BaseDAO<String, MusicGroup> getDAO() {
 		return musicGroupDao;
@@ -114,7 +125,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				musicGroupSubjectGoodsGroupDao.insert(e);
 			});
 			// 新增聊天群
-			ImGroupModel imGroupModel = new ImGroupModel(musicGroupId, musicGroup.getName());
+//			ImGroupModel imGroupModel = new ImGroupModel(musicGroupId, musicGroup.getName());
 			// 教务老师和运营主管加入群组
 			ImGroupMember[] imGroupMembers = { new ImGroupMember(musicGroup.getTeamTeacherId().toString()),
 					new ImGroupMember(musicGroup.getEducationalTeacherId().toString()) };
@@ -146,7 +157,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public boolean cancelMusicGroup(String musicGroupId) {
-		MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+		MusicGroup musicGroup = musicGroupDao.getLocked(musicGroupId);
 		if (musicGroup == null) {
 			throw new BizException("乐团找不到");
 		}
@@ -158,9 +169,22 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		} else {
 			throw new BizException("乐团当前状态是{}，不能取消", musicGroup.getStatus().getMsg());
 		}
+		
+		//查询是否有中间状态的缴费信息
+		List<StudentPaymentOrder> studentPaymentOrders = studentPaymentOrderDao.queryByDealStatus(musicGroupId, OrderTypeEnum.APPLY, DealStatusEnum.ING);
+		
+		if(studentPaymentOrders != null && studentPaymentOrders.size()>0){
+			throw new BizException("缴费存在交易中的数据，不能取消乐团");
+		}
+		
+		//查询已缴费信息
+		studentPaymentOrders = studentPaymentOrderDao.queryByDealStatus(musicGroupId, OrderTypeEnum.APPLY, DealStatusEnum.SUCCESS);
 
 		// 退费
-
+		for(StudentPaymentOrder order : studentPaymentOrders){
+			sysUserCashAccountService.updateBalance(order.getUserId(), order.getActualAmount());
+		}
+		
 		return true;
 	}
 

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

@@ -2,14 +2,13 @@ package com.ym.mec.biz.service.impl;
 
 import java.util.List;
 
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 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.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -27,7 +26,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-    public List<Goods> queryApplyGoodsList(Integer musicGroupId, OrderDetailTypeEnum type) {
+    public List<Goods> queryApplyGoodsList(String musicGroupId, OrderDetailTypeEnum type) {
         return studentPaymentOrderDao.queryApplyGoodsList(musicGroupId, type);
     }
 

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

@@ -1,24 +1,24 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
+import java.util.Date;
+
+import javax.annotation.Resource;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.biz.dal.dao.StudentRechargeDao;
-import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
+import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dao.SysUserCashAccountDetailDao;
 import com.ym.mec.biz.dal.dto.RechargeDto;
 import com.ym.mec.biz.dal.entity.StudentRecharge;
 import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
 import com.ym.mec.biz.dal.enums.PlatformCashAccountDetailTypeEnum;
 import com.ym.mec.biz.service.StudentRechargeService;
+import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
-import javax.annotation.Resource;
-import java.util.Date;
-
 @Service
 public class StudentRechargeServiceImpl extends BaseServiceImpl<String, StudentRecharge>  implements StudentRechargeService {
 	
@@ -26,9 +26,9 @@ public class StudentRechargeServiceImpl extends BaseServiceImpl<String, StudentR
 	private StudentRechargeDao studentRechargeDao;
     @Autowired
     private StudentRegistrationDao studentRegistrationDao;
-
-	@Resource
-	private SysUserCashAccountDao sysUserCashAccountDao;
+	
+	@Autowired
+	private SysUserCashAccountService sysUserCashAccountService;
 
 	@Resource
 	private SysUserCashAccountDetailDao sysUserCashAccountDetailDao;
@@ -40,17 +40,17 @@ public class StudentRechargeServiceImpl extends BaseServiceImpl<String, StudentR
 	@Override
 	public Boolean recharge(RechargeDto rechargeDto) {
 
-		//TODO 调用第三方支付
+		//TODO 锟斤拷锟矫碉拷锟斤拷锟斤拷支锟斤拷
 		Date now  = new Date();
 
-		//充值记录
+		//锟斤拷值锟斤拷录
         StudentRecharge studentRecharge = new StudentRecharge();
         studentRecharge.setAmount(rechargeDto.getRechargeAmount());
 		studentRecharge.setCreateTime(now);
 		studentRecharge.setUserId(rechargeDto.getUserId().longValue());
 		studentRecharge.setTransNo(null);
 		studentRechargeDao.insert(studentRecharge);
-		//账户资金流水
+		//锟剿伙拷锟绞斤拷锟斤拷水
 		SysUserCashAccountDetail cashAccount = new SysUserCashAccountDetail();
 		cashAccount.setAmount(rechargeDto.getRechargeAmount());
 		cashAccount.setBalance(null);
@@ -60,8 +60,8 @@ public class StudentRechargeServiceImpl extends BaseServiceImpl<String, StudentR
 		cashAccount.setCreateTime(now);
 		sysUserCashAccountDetailDao.insert(cashAccount);
 
-		//扣减账户
-		sysUserCashAccountDao.incrAccount(rechargeDto.getUserId(),rechargeDto.getRechargeAmount());
+		//锟桔硷拷锟剿伙拷
+		sysUserCashAccountService.updateBalance(rechargeDto.getUserId(),rechargeDto.getRechargeAmount());
 
 		return true;
 	}

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

@@ -55,8 +55,8 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     }
 
     @Override
-    public List<Subject> findDefaultSubByGroupId(Integer musicGroupId) {
-        return subjectDao.findDefaultSubByGroupId(musicGroupId);
+    public List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId) {
+        return subjectDao.findDefaultSubByChargeTypeId(chargeTypeId);
     }
 
     @Override

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

@@ -1,12 +1,18 @@
 package com.ym.mec.biz.service.impl;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
 @Service
@@ -20,4 +26,21 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
 		return sysUserCashAccountDao;
 	}
 
+	@Override
+	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+	public boolean updateBalance(Integer userId, BigDecimal decimal) {
+		
+		SysUserCashAccount cashAccount = sysUserCashAccountDao.getLocked(userId);
+		if(cashAccount == null){
+			throw new BizException("用户[{}]现金账户不存在",userId);
+		}
+		
+		cashAccount.setBalance(cashAccount.getBalance().add(decimal));
+		cashAccount.setUpdateTime(new Date());
+		
+		sysUserCashAccountDao.update(cashAccount);
+		
+		return true;
+	}
+
 }

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

@@ -9,12 +9,17 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.CourseScheduleService;
+import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.ImGroupMember;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,8 +58,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     private StudentVipGroupPaymentDao studentVipGroupPaymentDao;
     @Autowired
 	private StudentApplyRefundsDao studentApplyRefundsDao;
-    @Autowired
-	private SysUserCashAccountDao sysUserCashAccountDao;
+	
+	@Autowired
+	private SysUserCashAccountService sysUserCashAccountService;
+
     @Autowired
 	private SysUserCashAccountDetailDao sysUserCashAccountDetailDao;
     @Autowired
@@ -63,6 +70,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
     @Autowired
 	private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
+    @Autowired
+	private ImFeignService imFeignService;
 
 	@Override
 	public BaseDAO<Long, VipGroup> getDAO() {
@@ -118,6 +127,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		vipGroupClassGroupMapper.setClassGroupId(classGroup.getId());
 		vipGroupClassGroupMapperDao.insert(vipGroupClassGroupMapper);
 
+		//创建融云班级群
+		// 指导老师加入群组
+		ImGroupMember[] imGroupMembers = { new ImGroupMember(vipGroup.getVipGroupApplyBaseInfo().getUserId().toString())};
+		// 创建群组
+		imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+
 		//创建班级老师关联记录
 		ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();
 		classGroupTeacherMapper.setTeacherRole(TeachTypeEnum.BISHOP);
@@ -563,8 +578,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		studentApplyRefundsDao.update(oldStudentApplyRefunds);
 		switch (studentApplyRefunds.getStatus()){
 			case PASS:
-				sysUserCashAccountDao.incrAccount(oldStudentApplyRefunds.getUserId(),oldStudentApplyRefunds.getActualAmount());
-				SysUserCashAccount sysUserCashAccount = sysUserCashAccountDao.get(studentApplyRefunds.getId().intValue());
+				sysUserCashAccountService.updateBalance(oldStudentApplyRefunds.getUserId(),oldStudentApplyRefunds.getActualAmount());
+				SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentApplyRefunds.getId().intValue());
 				SysUserCashAccountDetail sysUserCashAccountDetail=new SysUserCashAccountDetail();
 				sysUserCashAccountDetail.setUserId(studentApplyRefunds.getUserId());
 				sysUserCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);

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

@@ -33,6 +33,10 @@
 		SELECT * FROM
 		music_group WHERE id_ = #{id}
 	</select>
+	
+	<select id="getLocked" resultMap="MusicGroup">
+		SELECT * FROM music_group WHERE id_ = #{id} for update
+	</select>
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroup">

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

@@ -159,4 +159,8 @@
     <select id="findOrderByOrderNo" resultMap="StudentPaymentOrder">
         SELECT * FROM student_payment_order WHERE order_no_ = #{orderNo}
     </select>
+    
+    <select id="queryByDealStatus" resultMap="StudentPaymentOrder" parameterType="map">
+        SELECT * FROM student_payment_order WHERE music_group_id_= #{musicGroupId} AND user_id_=#{userId} AND type_ = #{type} AND status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+    </select>
 </mapper>

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

@@ -95,15 +95,10 @@
         SELECT * FROM subject <include refid="querySubPageSql"/>
     </select>
 
-    <select id="findDefaultSubByGroupId" resultMap="Subject">
-        SELECT s.id_,s.name_,g.name_ goods_name_,g.id_ goods_id_,ctsm.kit_group_purchase_type_,ctsm.deposit_fee_,ctsm.fee_
-        FROM music_group mg
-        LEFT JOIN charge_type_subject_mapper ctsm ON ctsm.charge_type_id_ = mg.charge_type_id_
-        LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_
-        LEFT JOIN subject_goods_mapper sgm ON s.id_ = sgm.subject_id_
-        LEFT JOIN goods_category gc ON gc.id_ = sgm.goods_category_id_
-        LEFT JOIN goods g ON gc.id_ = g.goods_category_id_
-        WHERE mg.id_ = #{musicGroupId}
+    <select id="findDefaultSubByChargeTypeId" resultMap="Subject">
+        SELECT s.* FROM charge_type_subject_mapper ctsm
+        LEFT JOIN `subject` s ON subject_id_ = s.id_
+        WHERE ctsm.charge_type_id_ = #{chargeTypeId}
     </select>
 
     <resultMap id="subApplyDetail" type="com.ym.mec.biz.dal.dto.SubjectApplyDetailDto">

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

@@ -21,6 +21,10 @@
     <select id="get" resultMap="SysUserCashAccount">
 		SELECT * FROM sys_user_cash_account WHERE user_id_ = #{userId} 
 	</select>
+	
+    <select id="getLocked" resultMap="SysUserCashAccount">
+		SELECT * FROM sys_user_cash_account WHERE user_id_ = #{userId} for update
+	</select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserCashAccount">
@@ -85,7 +89,4 @@
 		SELECT COUNT(*) FROM sys_user_cash_account
 	</select>
 
-    <update id="incrAccount">
-        update sys_user_cash_account set balance_ = balance_ + #{amount} where  user_id_ = #{userId}
-    </update>
 </mapper>

mec-im/src/main/java/com/ym/SealClassConfiguration.java

@@ -29,12 +29,12 @@ import java.util.List;
 @Configuration
 public class SealClassConfiguration {
 
-    @Bean
+    /*@Bean
     public <K, V> RedisTemplate<K, V> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
         RedisTemplate<K, V> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(redisConnectionFactory);
         return redisTemplate;
-    }
+    }*/
 
     @Bean
     public GlobalExceptionHandlerAdvice globalExceptionAdvice() {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/App.java

@@ -1,13 +0,0 @@
-package com.ym.mec.teacher.controller;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}

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

@@ -72,9 +72,9 @@ public class StudentRegistrationController extends BaseController {
             @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
     public Object queryFeeDetail(String studentId,String musicGroupId) {
         if (StringUtils.isEmpty(studentId) || StringUtils.isEmpty(musicGroupId)) {
-            return succeed(studentRegistrationService.queryFeeDetail(Integer.parseInt(studentId), musicGroupId));
+            return failed("参数校验异常");
         }
-        return failed();
+        return succeed(studentRegistrationService.queryFeeDetail(Integer.parseInt(studentId), musicGroupId));
     }
 
     @ApiOperation(value = "获取未分班的学生")

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

@@ -63,10 +63,10 @@ public class SubjectController extends BaseController {
     }
 
     @ApiOperation(value = "通过乐团收费类型，获取默认的声部列表")
-    @GetMapping("/findDefaultSubByGroupId")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findDefaultSubByGroupId(Integer musicGroupId){
-        return succeed(subjectService.findDefaultSubByGroupId(musicGroupId));
+    @GetMapping("/findDefaultSubByChargeTypeId")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "chargeTypeId", value = "收费类型编号", required = true, dataType = "Integer")})
+    public Object findDefaultSubByChargeTypeId(Integer chargeTypeId){
+        return succeed(subjectService.findDefaultSubByChargeTypeId(chargeTypeId));
     }
 
     @ApiOperation(value = "修改、新增声部关联的商品列表")