|
@@ -1,17 +1,16 @@
|
|
package com.ym.mec.student.controller;
|
|
package com.ym.mec.student.controller;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
|
|
import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
|
|
-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;
|
|
|
|
|
|
+import com.ym.mec.biz.dal.entity.*;
|
|
import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
|
|
import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
|
|
import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
|
|
import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
|
|
import com.ym.mec.biz.service.StudentRegistrationService;
|
|
import com.ym.mec.biz.service.StudentRegistrationService;
|
|
import com.ym.mec.biz.service.SubjectService;
|
|
import com.ym.mec.biz.service.SubjectService;
|
|
import com.ym.mec.common.controller.BaseController;
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
|
+import com.ym.mec.common.entity.HttpResponseResult;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
@@ -20,7 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.LinkedHashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
@RequestMapping("register")
|
|
@RequestMapping("register")
|
|
@Api(tags = "乐团注册")
|
|
@Api(tags = "乐团注册")
|
|
@@ -47,7 +49,7 @@ public class RegisterController extends BaseController {
|
|
@ApiOperation(value = "通过乐团编号获取声部列表")
|
|
@ApiOperation(value = "通过乐团编号获取声部列表")
|
|
@GetMapping("/findSubByMusicGroupId")
|
|
@GetMapping("/findSubByMusicGroupId")
|
|
@ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
|
|
@ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
|
|
- public Object findSubByMusicGroupId(Integer musicGroupId) {
|
|
|
|
|
|
+ public HttpResponseResult findSubByMusicGroupId(Integer musicGroupId) {
|
|
return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
|
|
return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -55,10 +57,26 @@ public class RegisterController extends BaseController {
|
|
@ApiOperation(value = "获取乐团声部的乐器和辅件")
|
|
@ApiOperation(value = "获取乐团声部的乐器和辅件")
|
|
@GetMapping("/findGoodsGroups")
|
|
@GetMapping("/findGoodsGroups")
|
|
@ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
|
|
@ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
|
|
- public Object findGoodsGroups(Integer musicGroupId) {
|
|
|
|
|
|
+ public HttpResponseResult findGoodsGroups(Integer musicGroupId) {
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
MusicGroupSubjectGoodsAndInfo subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, 1);
|
|
MusicGroupSubjectGoodsAndInfo subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, 1);
|
|
return succeed(subjectGoodsAndInfo);
|
|
return succeed(subjectGoodsAndInfo);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @ApiOperation(value = "乐团报名支付")
|
|
|
|
+ @GetMapping("/pay")
|
|
|
|
+ @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
|
|
|
|
+ public HttpResponseResult Pay(StudentPaymentOrder studentPaymentOrder) {
|
|
|
|
+ Map<String, Object> rqMap = new LinkedHashMap<String, Object>();
|
|
|
|
+ rqMap.put("merNo", "07654478");
|
|
|
|
+ rqMap.put("version", "v1");
|
|
|
|
+ rqMap.put("notifyUrl", "https://notify.cpm");
|
|
|
|
+ rqMap.put("timestamp", new Date().getTime());
|
|
|
|
+ rqMap.put("apiContent", "ap");
|
|
|
|
+ rqMap.put("signType", "signType");
|
|
|
|
+ rqMap.put("sign", "sign");
|
|
|
|
+ rqMap.put("payUrl", "http://pay.url");
|
|
|
|
+ return succeed(rqMap);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|