add 获取乐团报名相关信息

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -13,10 +13,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class StudentRegistration {
 
 	/**  */
+	@ApiModelProperty(value = "报名id",hidden = true)
 	private Long id;
 
 	/**  */
-	@ApiModelProperty(value = "学生编号",required = false)
+	@ApiModelProperty(value = "学生编号",hidden = true)
 	private Integer userId;
 
 	@ApiModelProperty(value = "学生姓名",required = true)
@@ -29,15 +30,15 @@ public class StudentRegistration {
 	private String idCardNo;
 
 	/** 所属乐团（对应 music_group 表id） */
-	@ApiModelProperty(value = "所属乐团（对应 music_group 表id）",required = false)
+	@ApiModelProperty(value = "所属乐团（对应 music_group 表id）",required = true)
 	private Integer musicGroupId;
 
 	/** 当前所在年级 */
-	@ApiModelProperty(value = "当前所在年级",required = false)
+	@ApiModelProperty(value = "当前所在年级",required = true)
 	private String currentGrade;
 
 	/** 当前所在班级 */
-	@ApiModelProperty(value = "当前所在班级",required = false)
+	@ApiModelProperty(value = "当前所在班级",required = true)
 	private String currentClass;
 
 	/** 报名科目 */
@@ -49,29 +50,31 @@ public class StudentRegistration {
 	private Integer actualSubjectId;
 
 	/** 是否允许调剂 */
-	@ApiModelProperty(value = "是否允许调剂",required = false)
+	@ApiModelProperty(value = "是否允许调剂",required = true)
 	private YesOrNoEnum isAllowAdjust;
 
 	/** 器材购买方式（团购、自备） */
-	@ApiModelProperty(value = "器材购买方式（团购、自备）",required = false)
+	@ApiModelProperty(value = "器材购买方式（GROUP:团购,OWNED:自备）",required = true)
 	private KitPurchaseMethodEnum kitPurchaseMethod;
 
 	/**  */
-	@ApiModelProperty(value = "备注",required = false)
+	@ApiModelProperty(value = "备注",hidden = false)
 	private String remark;
 
 	/**  */
+	@ApiModelProperty(value = "备注",hidden = true)
 	private java.util.Date createTime;
 
 	/**  */
+	@ApiModelProperty(value = "备注",hidden = true)
 	private java.util.Date updateTime;
 
 	/** 家长姓名 */
-	@ApiModelProperty(value = "家长姓名",required = false)
+	@ApiModelProperty(value = "家长姓名",required = true)
 	private String parentsName;
 
 	/** 家长姓名 */
-	@ApiModelProperty(value = "家长电话",required = false)
+	@ApiModelProperty(value = "家长电话",required = true)
 	private String parentsPhone;
 
 	/** 家长单位 */
@@ -79,18 +82,18 @@ public class StudentRegistration {
 	private String parentsCompany;
 
 	/** 缴费状态（1-已缴费 0-未交费） */
-	@ApiModelProperty(value = "缴费状态（1-已缴费 0-未交费）",required = false)
+	@ApiModelProperty(value = "缴费状态（1-已缴费 0-未交费）",hidden = true)
 	private YesOrNoEnum paymentStatus;
 
 	@ApiModelProperty(value = "班级id",hidden = true)
 	private Integer ClassGroupId;
 
 	/** 最后缴费日期 */
-	@ApiModelProperty(value = "最后缴费日期",required = false)
+	@ApiModelProperty(value = "最后缴费日期",hidden = true)
 	private java.util.Date lastPaymentDate;
 
 	/** 预计下次缴费日期 */
-	@ApiModelProperty(value = "预计下次缴费日期",required = false)
+	@ApiModelProperty(value = "预计下次缴费日期",hidden = true)
 	private java.util.Date nextPaymentDate;
 
 	public Integer getActualSubjectId() {

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

@@ -1,17 +1,16 @@
 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.entity.SysUser;
 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.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -20,7 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 @RequestMapping("register")
 @Api(tags = "乐团注册")
@@ -47,7 +49,7 @@ public class RegisterController extends BaseController {
     @ApiOperation(value = "通过乐团编号获取声部列表")
     @GetMapping("/findSubByMusicGroupId")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findSubByMusicGroupId(Integer musicGroupId) {
+    public HttpResponseResult findSubByMusicGroupId(Integer musicGroupId) {
         return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
     }
 
@@ -55,10 +57,26 @@ public class RegisterController extends BaseController {
     @ApiOperation(value = "获取乐团声部的乐器和辅件")
     @GetMapping("/findGoodsGroups")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findGoodsGroups(Integer musicGroupId) {
+    public HttpResponseResult findGoodsGroups(Integer musicGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         MusicGroupSubjectGoodsAndInfo subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, 1);
         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);
+    }
+
 }