Merge branch 'cloud_teacher_active_2021_09'

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

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

@@ -8,6 +8,7 @@ import java.util.Map;
 import com.ym.mec.biz.dal.dto.CirculationUser;
 import com.ym.mec.biz.dal.dto.OAFinancialDto;
 import com.ym.mec.biz.dal.entity.SysUserTsign;
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.common.entity.HttpResponseResult;
 
@@ -116,7 +117,7 @@ public interface ContractService {
 	 * @param userId
 	 * @return
 	 */
-	boolean transferProduceContract(Integer userId,String musicGroupId);
+	boolean transferProduceContract(Integer userId, String musicGroupId, CourseViewTypeEnum courseViewType);
 
 	/**
 	 * 传递产品协议-仅生成课程协议
@@ -130,7 +131,7 @@ public interface ContractService {
 	 * @param userId
 	 * @return
 	 */
-	Map<String, Object> queryProductContract(Integer userId,String musicGroupId);
+	Map<String, Object> queryProductContract(Integer userId,String musicGroupId, CourseViewTypeEnum courseViewType);
 
 
 	/**

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

@@ -413,7 +413,7 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
             }
 
             try {
-                contractService.transferProduceContract(userId, null);
+                contractService.transferProduceContract(userId, null, null);
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -330,7 +330,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 	@Override
 	public boolean transferMusicGroupCoursesContract(Integer userId, String musicGroupId) {
 		if(true){
-			return transferProduceContract(userId, musicGroupId);
+			return transferProduceContract(userId, musicGroupId, null);
 		}
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
@@ -525,7 +525,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 	@Override
 	public boolean transferVipGroupCoursesContract(Integer userId, Long vipGroupId) {
 		if(true){
-			return transferProduceContract(userId, null);
+			return transferProduceContract(userId, null, null);
 		}
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
@@ -667,8 +667,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 	@Override
 	public boolean transferGoodsContract(Integer userId, String musicGroupId, String goodsIds, KitGroupPurchaseTypeEnum kitGroupPurchaseTypeEnum) {
-			
-		return transferProduceContract(userId, musicGroupId);
+
+		return transferProduceContract(userId, musicGroupId, null);
 
 	}
 
@@ -778,7 +778,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 	@Override
 	public boolean transferPracticeCoursesContract(Integer userId, int courseSectionNum, Date startDate, Date endDate, BigDecimal fee) {
 		if(true){
-			return transferProduceContract(userId, null);
+			return transferProduceContract(userId, null, null);
 		}
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
@@ -856,7 +856,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 	@Override
 	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED, propagation = Propagation.REQUIRES_NEW)
-	public boolean transferProduceContract(Integer userId,String musicGroupId) {
+	public boolean transferProduceContract(Integer userId,String musicGroupId, CourseViewTypeEnum courseViewType) {
 		SysUser user = studentDao.lockUserReturnInfo(userId);
 
 		if (user == null) {
@@ -919,6 +919,10 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			ownershipType = musicGroup.getCourseViewType();
 		}
 
+		if(Objects.nonNull(courseViewType)){
+			ownershipType = courseViewType;
+		}
+
 		List<SysUserContracts> userContracts = sysUserContractsService.getUserContractWithType(userId, ContractType.PRODUCT, ownershipType.getContractVersion());
 		if(!CollectionUtils.isEmpty(userContracts)){
 			return true;
@@ -972,7 +976,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 	@Override
 	@Transactional(isolation = Isolation.READ_COMMITTED)
-	public Map<String, Object> queryProductContract(Integer userId,String musicGroupId) {
+	public Map<String, Object> queryProductContract(Integer userId,String musicGroupId, CourseViewTypeEnum courseViewType) {
 		// 合成freemarker
 		String srcPdfPath = contractBaseDir + "/product/" + userId + ".pdf";
 
@@ -1019,6 +1023,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			ownershipType = musicGroup.getCourseViewType();
 		}
 
+		if(Objects.nonNull(courseViewType)){
+			ownershipType = courseViewType;
+		}
 
 		templateEngine.render(params, "product"+ownershipType.getContractVersion()+".ftl", srcFile);
 

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

@@ -407,7 +407,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 			}
 
 			try {
-				contractService.transferProduceContract(userId, null);
+				contractService.transferProduceContract(userId, null, CourseViewTypeEnum.MEMBER_FEE);
 			} catch (Exception e) {
 				logger.error("产品协议生成失败", e);
 			}
@@ -475,4 +475,4 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 			}
 		}
 	}
-}
+}

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

@@ -3068,7 +3068,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, courseFee, "乐团续费", userId);
 
             try {
-                contractService.transferProduceContract(userId, musicGroupId);
+                contractService.transferProduceContract(userId, musicGroupId, null);
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -447,7 +447,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             //添加sell_order
             this.addSellOrder(studentPaymentOrder, replacementInstrumentActivity);
             try {
-                contractService.transferProduceContract(userId, null);
+                contractService.transferProduceContract(userId, null, null);
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -77,7 +77,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
         map.put(userId, userId.toString());
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             try {
-                contractService.transferProduceContract(userId, null);
+                contractService.transferProduceContract(userId, null, null);
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -219,7 +219,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         //支付成功
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             try {
-                contractService.transferProduceContract(userId, null);
+                contractService.transferProduceContract(userId, null, null);
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -715,7 +715,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             try {
-                contractService.transferProduceContract(userId, null);
+                contractService.transferProduceContract(userId, null, null);
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }
@@ -1013,7 +1013,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             try {
-                contractService.transferProduceContract(userId, null);
+                contractService.transferProduceContract(userId, null, null);
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -563,7 +563,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
 
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             try {
-                contractService.transferProduceContract(userId, subjectChange.getMusicGroupId());
+                contractService.transferProduceContract(userId, subjectChange.getMusicGroupId(), null);
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -5,6 +5,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.ym.mec.biz.dal.entity.SysUserContracts;
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.service.SysUserContractsService;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -89,7 +90,7 @@ public class ContractsController extends BaseController {
 
 	@ApiOperation("查询产品协议")
 	@GetMapping(value = "queryProduceContract")
-	public Object queryProduceContract(Integer userId, String musicGroupId) {
+	public Object queryProduceContract(Integer userId, String musicGroupId, CourseViewTypeEnum courseViewType) {
 		if(Objects.isNull(userId)){
 			SysUser sysUser = sysUserFeignService.queryUserInfo();
 			if (sysUser == null) {
@@ -97,7 +98,7 @@ public class ContractsController extends BaseController {
 			}
 			userId = sysUser.getId();
 		}
-		return succeed(contractService.queryProductContract(userId,musicGroupId));
+		return succeed(contractService.queryProductContract(userId,musicGroupId, courseViewType));
 	}
 
 	@ApiOperation(value = "生成学生课程协议")

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

@@ -81,7 +81,7 @@ public class ContractsController extends BaseController {
 	@PostMapping("transferProduceContract")
 	public HttpResponseResult transferProduceContract(@RequestBody List<Integer> userIds){
 		for (Integer userId : userIds) {
-			contractService.transferProduceContract(userId,null);
+			contractService.transferProduceContract(userId,null, null);
 		}
 		return succeed();
 	}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduContractsController.java

@@ -2,6 +2,7 @@ package com.ym.mec.web.controller.education;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -29,7 +30,7 @@ public class EduContractsController extends BaseController {
 
     @ApiOperation("查询产品协议")
     @GetMapping(value = "queryProduceContract")
-    public Object queryProduceContract(Integer userId, String musicGroupId) {
+    public Object queryProduceContract(Integer userId, String musicGroupId, CourseViewTypeEnum courseViewType) {
         if(Objects.isNull(userId)){
             SysUser sysUser = sysUserFeignService.queryUserInfo();
             if (sysUser == null) {
@@ -37,6 +38,6 @@ public class EduContractsController extends BaseController {
             }
             userId = sysUser.getId();
         }
-        return succeed(contractService.queryProductContract(userId,musicGroupId));
+        return succeed(contractService.queryProductContract(userId,musicGroupId, courseViewType));
     }
 }