Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RegisterPayDto.java

@@ -1,11 +1,12 @@
 package com.ym.mec.biz.dal.dto;
 
-import java.util.Arrays;
+import java.math.BigDecimal;
 
 /**
  * 学团注册支付
  */
 public class RegisterPayDto {
+    private BigDecimal amount;
     private Integer registerId;
     private String goodsGroupIds;
     private String goodsIds;
@@ -33,4 +34,12 @@ public class RegisterPayDto {
     public void setGoodsIds(String goodsIds) {
         this.goodsIds = goodsIds;
     }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
 }

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

@@ -89,6 +89,9 @@ public class MusicGroup {
 
 	@ApiModelProperty(value = "乐团图片",required = false)
 	private String img;
+	
+	@ApiModelProperty(value = "教学主任",required = false)
+	private String directorUserId;
 
 	public String getImg() {
 		return img;
@@ -266,6 +269,14 @@ public class MusicGroup {
 		this.isExtraClass = isExtraClass;
 	}
 
+	public String getDirectorUserId() {
+		return directorUserId;
+	}
+
+	public void setDirectorUserId(String directorUserId) {
+		this.directorUserId = directorUserId;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -25,6 +25,7 @@
 		<result column="enlightenment_course_time_" property="enlightenmentCourseTime" />
 		<result column="parent_meeting_time_" property="parentMeetingTime" />
 		<result column="img_" property="img" />
+		<result column="director_user_id_" property="directorUserId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -44,10 +45,10 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group
 		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,
-		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_,img_)
+		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_,img_,director_user_id_)
 		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},now(),now(),
 		#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},
-		#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img})
+		#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -111,6 +112,9 @@
 			<if test="img != null">
 				img_ = #{img},
 			</if>
+			<if test="directorUserId != null">
+				director_user_id_ = #{directorUserId},
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>

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

@@ -2,15 +2,26 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
+import com.ym.mec.biz.dal.dto.RegisterPayDto;
 import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 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;
 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;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.xml.soap.Name;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 @RequestMapping("musicGroup")
 @Api(tags = "乐团服务")
 @RestController
@@ -20,12 +31,14 @@ public class MusicGroupController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private MusicGroupService musicGroupService;
+    @Autowired
+    private MusicGroupSubjectPlanService musicGroupSubjectPlanService;
 
     @ApiOperation("获取学生所在乐团列表")
     @GetMapping(value = "/queryUserMusicGroups")
-    public Object queryUserMusicGroups(){
+    public Object queryUserMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
+        if (sysUser == null) {
             return failed("获取用户信息失败");
         }
         return succeed(musicGroupService.queryUserMusicGroups(sysUser.getId()));
@@ -33,9 +46,9 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation("获取学生个人中心乐团信息")
     @GetMapping(value = "/queryPersonalMusicGroups")
-    public Object queryPersonalMusicGroups(){
+    public Object queryPersonalMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
+        if (sysUser == null) {
             return failed("获取用户信息失败");
         }
         return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
@@ -43,11 +56,38 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "根据学员编号，获取有关联的老师列表")
     @GetMapping("/findTeachersByStuId")
-    public Object findTeachersByStuId(){
+    public Object findTeachersByStuId() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
+        if (sysUser == null) {
             return failed("获取用户信息失败");
         }
         return succeed(musicGroupService.findTeachersByStuId(sysUser.getId()));
     }
+
+
+    @ApiOperation(value = "获取乐团声部费用信息及乐器和辅件")
+    @GetMapping("/getSubjectGoodsAndInfo")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "subjectId", value = "声部编号", required = true, dataType = "Integer")})
+    public HttpResponseResult getSubjectGoodsAndInfo(Integer musicGroupId, Integer subjectId) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId);
+        return succeed(subjectGoodsAndInfo);
+    }
+
+    @ApiOperation(value = "乐团报名支付")
+    @GetMapping("/pay")
+    @ApiImplicitParams({@ApiImplicitParam(name = "registerPayDto", value = "支付信息", required = true, dataType = "Integer")})
+    public HttpResponseResult pay(RegisterPayDto registerPayDto) {
+        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);
+    }
 }

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

@@ -55,30 +55,4 @@ public class RegisterController extends BaseController {
         return succeed(musicGroupSubjectPlanService.getMusicGroupRegInfo(musicGroupId));
     }
 
-
-    @ApiOperation(value = "获取乐团声部费用信息及乐器和辅件")
-    @GetMapping("/getSubjectGoodsAndInfo")
-    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public HttpResponseResult getSubjectGoodsAndInfo(Integer musicGroupId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, 1);
-        return succeed(subjectGoodsAndInfo);
-    }
-
-    @ApiOperation(value = "乐团报名支付")
-    @GetMapping("/pay")
-    @ApiImplicitParams({@ApiImplicitParam(name = "registerPayDto", value = "支付信息", required = true, dataType = "Integer")})
-    public HttpResponseResult pay(RegisterPayDto registerPayDto) {
-        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);
-    }
-
 }