update:协议

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.enums;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.ym.mec.common.enums.BaseEnum;
 
 /**
@@ -63,4 +65,14 @@ public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
     public String getCode() {
         return this.code;
     }
+    
+    public static OrderTypeEnum get(String code){
+    	for(OrderTypeEnum e : values()){
+    		if(StringUtils.equals(code, e.code)){
+    			return e;
+    		}
+    	}
+    	
+    	return null;
+    }
 }

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

@@ -8,6 +8,7 @@ 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.biz.dal.enums.OrderTypeEnum;
 
 public interface ContractService {
 
@@ -43,7 +44,7 @@ public interface ContractService {
 	 * @param musicGroupId
 	 * @return
 	 */
-	boolean transferMusicGroupCoursesContract(Integer userId, String musicGroupId);
+	boolean transferMusicGroupCoursesContract(Integer userId, String musicGroupId, OrderTypeEnum orderType);
 
 	/**
 	 * 查询乐团课程协议
@@ -59,7 +60,7 @@ public interface ContractService {
 	 * @param vipGroupId
 	 * @return
 	 */
-	boolean transferVipGroupCoursesContract(Integer userId, Long vipGroupId);
+	boolean transferVipGroupCoursesContract(Integer userId, Long vipGroupId, OrderTypeEnum orderType);
 
 	/**
 	 * 查询VIP课程协议
@@ -77,7 +78,7 @@ public interface ContractService {
 	 * @param kitGroupPurchaseTypeEnum
 	 * @return
 	 */
-	boolean transferGoodsContract(Integer userId, String musicGroupId, String goodsIds, KitGroupPurchaseTypeEnum kitGroupPurchaseTypeEnum);
+	boolean transferGoodsContract(Integer userId, String musicGroupId, String goodsIds, OrderTypeEnum orderType);
 
 	/**
 	 * 查询商品协议
@@ -109,21 +110,21 @@ public interface ContractService {
 	 * @param fee
 	 * @return
 	 */
-	boolean transferPracticeCoursesContract(Integer userId, int courseSectionNum, Date startDate, Date endDate, BigDecimal fee);
+	boolean transferPracticeCoursesContract(Integer userId, int courseSectionNum, Date startDate, Date endDate, BigDecimal fee, OrderTypeEnum orderType);
 
 	/**
 	 * 传递产品协议
 	 * @param userId
 	 * @return
 	 */
-	void transferProduceContract(Integer userId, String musicGroupId, CourseViewTypeEnum courseViewType);
+	void transferProduceContract(Integer userId, String musicGroupId, OrderTypeEnum orderType);
 
 	/**
 	 * 查询产品协议
 	 * @param userId
 	 * @return
 	 */
-	Map<String, Object> queryProductContract(Integer userId,String musicGroupId, CourseViewTypeEnum courseViewType);
+	Map<String, Object> queryProductContract(Integer userId,String musicGroupId, OrderTypeEnum orderType);
 
 
 	/**

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, null);
+                contractService.transferProduceContract(userId, null, studentPaymentOrder.getType());
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -62,6 +62,7 @@ import com.ym.mec.biz.dal.entity.TenantInfo;
 import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.GoodsService;
 import com.ym.mec.biz.service.MusicGroupService;
@@ -365,9 +366,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
     }
 
     @Override
-    public boolean transferMusicGroupCoursesContract(Integer userId, String musicGroupId) {
+    public boolean transferMusicGroupCoursesContract(Integer userId, String musicGroupId, OrderTypeEnum orderType) {
         if (true) {
-            transferProduceContract(userId, musicGroupId, null);
+            transferProduceContract(userId, musicGroupId, orderType);
             return true;
         }
         SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
@@ -561,9 +562,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
     }
 
     @Override
-    public boolean transferVipGroupCoursesContract(Integer userId, Long vipGroupId) {
+    public boolean transferVipGroupCoursesContract(Integer userId, Long vipGroupId, OrderTypeEnum orderType) {
         if (true) {
-            transferProduceContract(userId, null, null);
+            transferProduceContract(userId, null, orderType);
             return true;
         }
 
@@ -705,9 +706,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
     }
 
     @Override
-    public boolean transferGoodsContract(Integer userId, String musicGroupId, String goodsIds, KitGroupPurchaseTypeEnum kitGroupPurchaseTypeEnum) {
+    public boolean transferGoodsContract(Integer userId, String musicGroupId, String goodsIds, OrderTypeEnum orderType) {
 
-        transferProduceContract(userId, musicGroupId, null);
+        transferProduceContract(userId, musicGroupId, orderType);
         return true;
     }
 
@@ -816,9 +817,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
     @Override
     @Async
-    public boolean transferPracticeCoursesContract(Integer userId, int courseSectionNum, Date startDate, Date endDate, BigDecimal fee) {
+    public boolean transferPracticeCoursesContract(Integer userId, int courseSectionNum, Date startDate, Date endDate, BigDecimal fee, OrderTypeEnum orderType) {
         if (true) {
-            transferProduceContract(userId, null, null);
+            transferProduceContract(userId, null, orderType);
             return true;
         }
 
@@ -898,7 +899,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
     @Override
     @Async
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED, propagation = Propagation.REQUIRES_NEW)
-    public void transferProduceContract(Integer userId, String musicGroupId, CourseViewTypeEnum courseViewType) {
+    public void transferProduceContract(Integer userId, String musicGroupId, OrderTypeEnum orderType) {
         SysUser user = studentDao.lockUserReturnInfo(userId);
 
         if (user == null) {
@@ -943,14 +944,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
         params.put("isShowVisualSeal", false);
 
-        CourseViewTypeEnum ownershipType = CourseViewTypeEnum.COURSE_FEE;
-
         if (StringUtils.isBlank(musicGroupId)) {
             params.put("ownershipType", "OWN");
-            MusicGroup userLastNormalMusicGroup = studentRegistrationDao.getUserLastNormalMusicGroup(userId);
-            if (Objects.nonNull(userLastNormalMusicGroup)) {
-                ownershipType = userLastNormalMusicGroup.getCourseViewType();
-            }
+            //MusicGroup userLastNormalMusicGroup = studentRegistrationDao.getUserLastNormalMusicGroup(userId);
         } else {
             MusicGroup musicGroup = musicGroupService.get(musicGroupId);
             if (musicGroup == null) {
@@ -958,13 +954,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
                 return;
             }
             params.put("ownershipType", musicGroup.getOwnershipType().name());
-            ownershipType = musicGroup.getCourseViewType();
         }
 
-        if (Objects.nonNull(courseViewType)) {
-            ownershipType = courseViewType;
-        }
-		
         // 查询最新协议模板
 		TenantContractTemplate tenantContractTemplate = tenantContractTemplateService.queryLatestContractTemplate(user.getTenantId(), null, null);
 		if(tenantContractTemplate == null){
@@ -983,7 +974,10 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
         //如果分部有企业信息，就用分部上的企业信息，否则用机构上的企业信息
         String companyName = null;
         TenantInfo tenantInfo = tenantInfoService.get(studentInfo.getTenantId());;
-        Organization organizationDto = organizationService.get(user.getOrganId());
+        Organization organizationDto = null;
+        if(orderType != OrderTypeEnum.PRACTICE_GROUP_BUY && orderType != OrderTypeEnum.PRACTICE_GROUP_RENEW && orderType != OrderTypeEnum.SMALL_CLASS_TO_BUY){
+        	organizationDto = organizationService.get(studentInfo.getOrganId());
+        }
 		if (organizationDto == null || StringUtils.isBlank(organizationDto.getCorporateName()) || StringUtils.isBlank(organizationDto.getCorporateCode())) {
 			companyName = tenantInfo.getTsignName();
 		} else {
@@ -1011,7 +1005,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
             return;
         }
 
-        String organCode = StringUtils.isEmpty(organizationDto.getCorporateCode()) ? tenantInfo.getTsignCode() : organizationDto.getCorporateCode();
+        String organCode = StringUtils.equals(companyName, tenantInfo.getTsignName()) ? tenantInfo.getTsignCode() : organizationDto.getCorporateCode();
         
 		if (user.getTenantId() == 1) {
 			if (!OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
@@ -1049,7 +1043,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
     @Override
     @Transactional(isolation = Isolation.READ_COMMITTED)
-    public Map<String, Object> queryProductContract(Integer userId, String musicGroupId, CourseViewTypeEnum courseViewType) {
+    public Map<String, Object> queryProductContract(Integer userId, String musicGroupId, OrderTypeEnum orderType) {
         // 合成freemarker
         String srcPdfPath = contractBaseDir + "/product/" + userId + ".pdf";
 
@@ -1077,14 +1071,12 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
         Map<String, Object> result = new HashMap<>();
         result.put("courseViewType", CourseViewTypeEnum.COURSE_FEE);
-        CourseViewTypeEnum ownershipType = CourseViewTypeEnum.COURSE_FEE;
 		
         if (StringUtils.isBlank(musicGroupId)) {
             params.put("ownershipType", "OWN");
             MusicGroup userLastNormalMusicGroup = studentRegistrationDao.getUserLastNormalMusicGroup(userId);
             if (Objects.nonNull(userLastNormalMusicGroup)) {
                 result.put("courseViewType", userLastNormalMusicGroup.getCourseViewType());
-                ownershipType = userLastNormalMusicGroup.getCourseViewType();
             }
         } else {
             MusicGroup musicGroup = musicGroupService.get(musicGroupId);
@@ -1093,17 +1085,15 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
             }
             params.put("ownershipType", musicGroup.getOwnershipType().name());
             result.put("courseViewType", musicGroup.getCourseViewType());
-            ownershipType = musicGroup.getCourseViewType();
         }
 
-        if (Objects.nonNull(courseViewType)) {
-            ownershipType = courseViewType;
-        }
-        
         //如果分部有企业信息，就用分部上的企业信息，否则用机构上的企业信息
         String companyName = null, sealPicture = null;
         TenantInfo tenantInfo = null;
-        Organization organizationDto = organizationService.get(studentInfo.getOrganId());
+        Organization organizationDto = null;
+        if(orderType != OrderTypeEnum.PRACTICE_GROUP_BUY && orderType != OrderTypeEnum.PRACTICE_GROUP_RENEW && orderType != OrderTypeEnum.SMALL_CLASS_TO_BUY){
+        	organizationDto = organizationService.get(studentInfo.getOrganId());
+        }
 		if (organizationDto == null || StringUtils.isBlank(organizationDto.getCorporateName()) || StringUtils.isBlank(organizationDto.getCorporateCode())) {
 
 			tenantInfo = tenantInfoService.get(studentInfo.getTenantId());

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

@@ -944,7 +944,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         practiceGroupDao.update(practiceGroup);
 
         try {
-            contractService.transferPracticeCoursesContract(order.getUserId(),classGroup.getTotalClassTimes(),practiceGroup.getCoursesStartDate(),practiceGroup.getCoursesExpireDate(),order.getExpectAmount());
+            contractService.transferPracticeCoursesContract(order.getUserId(),classGroup.getTotalClassTimes(),practiceGroup.getCoursesStartDate(),practiceGroup.getCoursesExpireDate(),order.getExpectAmount(),order.getType());
         } catch (Exception e) {
             LOGGER.error(MessageFormatter.arrayFormat("网管课[{}]购买协议错误:{}",order.getMusicGroupId(),e.getMessage()),e);
         }

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

@@ -750,7 +750,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         // 插入交易明细
         sysUserCashAccountDetailService.saveSysUserCashAccountDetail(studentPaymentOrder, "直播购买云教练");
         try {
-            contractService.transferProduceContract(userId, null,null);
+            contractService.transferProduceContract(userId, null, studentPaymentOrder.getType());
         } catch (Exception e) {
             logger.error("产品协议生成失败", e);
         }
@@ -875,7 +875,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             // 插入交易明细
             sysUserCashAccountDetailService.saveSysUserCashAccountDetail(studentPaymentOrder, "购买会员");
             try {
-                contractService.transferProduceContract(userId, null, CourseViewTypeEnum.MEMBER_FEE);
+                contractService.transferProduceContract(userId, null, studentPaymentOrder.getType());
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -3033,7 +3033,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             sysUserCashAccountDetailService.insert(paymentDetail);
 
             try {
-                contractService.transferProduceContract(userId, musicGroupId, null);
+                contractService.transferProduceContract(userId, musicGroupId, studentPaymentOrder.getType());
             } catch (Exception e) {
                 logger.error("产品协议生成失败", e);
             }

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

@@ -3219,7 +3219,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
 
         try {
-            contractService.transferPracticeCoursesContract(order.getUserId(), classGroup.getTotalClassTimes(), practiceGroup.getCoursesStartDate(), practiceGroup.getCoursesExpireDate(), order.getExpectAmount());
+            contractService.transferPracticeCoursesContract(order.getUserId(), classGroup.getTotalClassTimes(), practiceGroup.getCoursesStartDate(), practiceGroup.getCoursesExpireDate(), order.getExpectAmount(), order.getType());
         } catch (Exception e) {
             LOGGER.error(MessageFormatter.arrayFormat("网管课[{}]购买协议错误:{}", order.getMusicGroupId(), e.getMessage()), e);
         }
@@ -4383,7 +4383,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             sysUserCashAccountDetailService.insert(sysUserExpendCashAccountDetail);
 
             try {
-                contractService.transferProduceContract(userId, null, CourseViewTypeEnum.COURSE_FEE);
+                contractService.transferProduceContract(userId, null, studentPaymentOrder.getType());
             } catch (Exception e) {
                 LOGGER.error("产品协议生成失败", e);
             }

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

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

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

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

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

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

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

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

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

@@ -1386,12 +1386,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             }
             try {
                 //生成课程协议
-                contractService.transferMusicGroupCoursesContract(studentRegistration.getUserId(), studentRegistration.getMusicGroupId());
+                contractService.transferMusicGroupCoursesContract(studentRegistration.getUserId(), studentRegistration.getMusicGroupId(), studentPaymentOrder.getType());
                 // 商品协议(租赁时候有)
                 StudentPaymentOrderDetail applyOrderMusical = studentPaymentOrderDetailService.findApplyOrderMusical(studentPaymentOrder.getId());
                 if (applyOrderMusical != null && applyOrderMusical.getKitGroupPurchaseType() != null && applyOrderMusical.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
                     contractService.transferGoodsContract(studentPaymentOrder.getUserId(), studentPaymentOrder.getMusicGroupId(),
-                            applyOrderMusical.getGoodsIdList(), applyOrderMusical.getKitGroupPurchaseType());
+                            applyOrderMusical.getGoodsIdList(), studentPaymentOrder.getType());
                 }
             } catch (Exception e) {
                 LOGGER.error("协议生成失败", e);

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

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

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

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

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

@@ -2484,7 +2484,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 vipGroup.setOrganIdList(organIdsString);
                 vipGroupDao.update(vipGroup);
                 try {
-                    contractService.transferVipGroupCoursesContract(userId, vipGroup.getId());
+                    contractService.transferVipGroupCoursesContract(userId, vipGroup.getId(), order.getType());
                 } catch (Exception e) {
                     LOGGER.error(MessageFormatter.arrayFormat("小课[{}]购买协议错误:{}", vipGroup.getId(), e.getMessage()), e);
                 }

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

@@ -20,6 +20,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.SysUserContracts;
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.SysUserContractsService;
 import com.ym.mec.common.controller.BaseController;
@@ -91,7 +92,7 @@ public class ContractsController extends BaseController {
 
 	@ApiOperation("查询产品协议")
 	@GetMapping(value = "queryProduceContract")
-	public Object queryProduceContract(Integer userId, String musicGroupId, CourseViewTypeEnum courseViewType) {
+	public Object queryProduceContract(Integer userId, String musicGroupId, String orderType) {
 		if(Objects.isNull(userId)){
 			SysUser sysUser = sysUserFeignService.queryUserInfo();
 			if (sysUser == null) {
@@ -99,7 +100,8 @@ public class ContractsController extends BaseController {
 			}
 			userId = sysUser.getId();
 		}
-		return succeed(contractService.queryProductContract(userId,musicGroupId, courseViewType));
+		OrderTypeEnum type = OrderTypeEnum.get(orderType);
+		return succeed(contractService.queryProductContract(userId,musicGroupId, type));
 	}
 
 	@ApiOperation(value = "查询学生最新协议")

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

@@ -38,6 +38,6 @@ public class EduContractsController extends BaseController {
             }
             userId = sysUser.getId();
         }
-        return succeed(contractService.queryProductContract(userId,musicGroupId, courseViewType));
+        return succeed(contractService.queryProductContract(userId,musicGroupId, null));
     }
 }

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

@@ -38,6 +38,6 @@ public class EduContractsController extends BaseController {
             }
             userId = sysUser.getId();
         }
-        return succeed(contractService.queryProductContract(userId,musicGroupId, courseViewType));
+        return succeed(contractService.queryProductContract(userId,musicGroupId, null));
     }
 }