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

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

@@ -64,15 +64,17 @@ public interface ContractService {
 	 * 传递商品协议
 	 * @param userId
 	 * @param musicGroupId
+	 * @param musicGroupSubjectGoodsGroupIds
 	 * @return
 	 */
-	boolean transferGoodsContract(Integer userId, String musicGroupId);
+	boolean transferGoodsContract(Integer userId, String musicGroupId, String musicGroupSubjectGoodsGroupIds);
 
 	/**
 	 * 查询商品协议
 	 * @param userId
 	 * @param musicGroupId
+	 * @param musicGroupSubjectGoodsGroupIds
 	 * @return
 	 */
-	String queryGoodsContract(Integer userId, String musicGroupId);
+	String queryGoodsContract(Integer userId, String musicGroupId, String musicGroupSubjectGoodsGroupIds);
 }

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

@@ -886,7 +886,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setCreateTime(date);
                 courseSchedule.setUpdateTime(date);
                 courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
-                courseSchedule.setType(CourseSchedule.CourseScheduleType.SINGLE);
+                courseSchedule.setType(classGroup4MixDto.getCourseType());
                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
 
                 courseScheduleDao.insert(courseSchedule);
@@ -1087,7 +1087,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setCreateTime(date);
                 courseSchedule.setUpdateTime(date);
                 courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
-                courseSchedule.setType(CourseSchedule.CourseScheduleType.SINGLE);
+                courseSchedule.setType(classGroup4MixDto.getCourseType());
                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
 
                 courseScheduleDao.insert(courseSchedule);
@@ -1290,7 +1290,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setCreateTime(date);
                 courseSchedule.setUpdateTime(date);
                 courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
-                courseSchedule.setType(CourseSchedule.CourseScheduleType.SINGLE);
+                courseSchedule.setType(classGroup4MixDto.getCourseType());
                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
 
                 courseScheduleDao.insert(courseSchedule);

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

@@ -22,6 +22,7 @@ import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
 import com.ym.mec.biz.dal.dto.StudentInfo;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.Subject;
@@ -29,8 +30,9 @@ import com.ym.mec.biz.dal.entity.SysUserContracts;
 import com.ym.mec.biz.dal.entity.SysUserContracts.ContractType;
 import com.ym.mec.biz.dal.entity.SysUserTsign;
 import com.ym.mec.biz.dal.entity.VipGroup;
-import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.service.ContractService;
+import com.ym.mec.biz.service.GoodsService;
+import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.StudentRegistrationService;
@@ -68,6 +70,9 @@ public class ContractServiceImpl implements ContractService {
 
 	@Autowired
 	private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+	
+	@Autowired
+	private MusicGroupSubjectGoodsGroupService musicGroupSubjectGoodsGroupService;
 
 	@Autowired
 	private VipGroupService vipGroupService;
@@ -80,6 +85,9 @@ public class ContractServiceImpl implements ContractService {
 
 	@Autowired
 	private StoragePlugin storagePlugin;
+	
+	@Autowired
+	private GoodsService goodsService;
 
 	@Value("${contract.baseDir:/var/pdf}")
 	private String contractBaseDir;
@@ -469,7 +477,7 @@ public class ContractServiceImpl implements ContractService {
 	}
 
 	@Override
-	public boolean transferGoodsContract(Integer userId, String musicGroupId) {
+	public boolean transferGoodsContract(Integer userId, String musicGroupId, String musicGroupSubjectGoodsGroupIds) {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
@@ -504,8 +512,12 @@ public class ContractServiceImpl implements ContractService {
 		studentInfo.setSubject(subject);
 
 		params.put("studentInfo", studentInfo);
-
-		List<Goods> goodsList = studentPaymentOrderService.queryApplyGoodsList(musicGroupId, OrderDetailTypeEnum.MUSICAL);
+		
+		List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroupList = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(musicGroupSubjectGoodsGroupIds);
+		
+		String goodIdList = musicGroupSubjectGoodsGroupList.stream().map(t -> t.getGoodsIdList()).collect(Collectors.joining(","));
+		
+		List<Goods> goodsList = goodsService.findGoodsByIds(goodIdList);
 		params.put("goodsList", goodsList);
 
 		MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
@@ -546,7 +558,7 @@ public class ContractServiceImpl implements ContractService {
 	}
 
 	@Override
-	public String queryGoodsContract(Integer userId, String musicGroupId) {
+	public String queryGoodsContract(Integer userId, String musicGroupId, String musicGroupSubjectGoodsGroupIds) {
 
 		// 合成freemarker
 		String srcPdfPath = contractBaseDir + "/goods/" + userId + ".pdf";
@@ -572,8 +584,12 @@ public class ContractServiceImpl implements ContractService {
 		studentInfo.setSubject(subject);
 
 		params.put("studentInfo", studentInfo);
-
-		List<Goods> goodsList = studentPaymentOrderService.queryApplyGoodsList(musicGroupId, OrderDetailTypeEnum.MUSICAL);
+		
+		List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroupList = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(musicGroupSubjectGoodsGroupIds);
+		
+		String goodIdList = musicGroupSubjectGoodsGroupList.stream().map(t -> t.getGoodsIdList()).collect(Collectors.joining(","));
+		
+		List<Goods> goodsList = goodsService.findGoodsByIds(goodIdList);
 		params.put("goodsList", goodsList);
 
 		MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);