yonge 2 years ago
parent
commit
341fee5b1c

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

@@ -3,10 +3,13 @@ package com.ym.mec.teacher.controller;
 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.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,7 +33,7 @@ public class EduContractsController 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) {
@@ -38,6 +41,6 @@ public class EduContractsController extends BaseController {
             }
             userId = sysUser.getId();
         }
-        return succeed(contractService.queryProductContract(userId,musicGroupId, null));
+        return succeed(contractService.queryProductContract(userId,musicGroupId, OrderTypeEnum.get(orderType)));
     }
 }

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

@@ -3,10 +3,13 @@ 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.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,7 +33,7 @@ public class EduContractsController 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) {
@@ -38,6 +41,6 @@ public class EduContractsController extends BaseController {
             }
             userId = sysUser.getId();
         }
-        return succeed(contractService.queryProductContract(userId,musicGroupId, null));
+        return succeed(contractService.queryProductContract(userId,musicGroupId, OrderTypeEnum.get(orderType)));
     }
 }