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

# Conflicts:
#	pom.xml

pom.xml

@@ -179,34 +179,11 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>2.2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>2.2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>2.7.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>2.7.0</version>
-		</dependency>
-		
-		<dependency>
 		    <groupId>net.sf.json-lib</groupId>
 		    <artifactId>json-lib</artifactId>
 		    <version>2.4</version>
 		    <classifier>jdk15</classifier>
 	    </dependency>
-		
 	</dependencies>
 
 	<build>

src/main/java/com/ym/mec/collectfee/CollectFeeServerApplication.java

@@ -8,7 +8,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
 @MapperScan("com.ym.mec.collectfee.dao")
@@ -16,7 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @ServletComponentScan//filter才能生效
 @Configuration
 @EnableFeignClients
-@EnableSwagger2
+//@EnableSwagger2
 @EnableScheduling
 public class CollectFeeServerApplication {
 

src/main/java/com/ym/mec/collectfee/controller/OrderController.java

@@ -3,10 +3,6 @@ package com.ym.mec.collectfee.controller;
 import com.ym.mec.collectfee.common.web.BaseController;
 import com.ym.mec.collectfee.service.OrderService;
 import com.ym.mec.collectfee.utils.Constants;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,7 +11,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController()
 @RequestMapping("order")
-@Api("乐团、订单服务")
 public class OrderController extends BaseController {
 
     @Autowired
@@ -27,8 +22,8 @@ public class OrderController extends BaseController {
      * @return
      */
     @PostMapping("/getOrderList")
-    @ApiOperation(value = "根据学生编号，获取订单列表")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "学生编号", required = true, dataType = "Integer")})
+//    @ApiOperation(value = "根据学生编号，获取订单列表")
+//    @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "学生编号", required = true, dataType = "Integer")})
     public Object getOrders(Integer userId){
         if(userId == null){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
@@ -43,9 +38,9 @@ public class OrderController extends BaseController {
      * @return
      */
     @PostMapping("/applyNum")
-    @ApiOperation(value = "根据乐团名称、声部名称，查询报名人数")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "poName", value = "乐团名称", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "voicePart", value = "声部名称", required = true, dataType = "String")})
+//    @ApiOperation(value = "根据乐团名称、声部名称，查询报名人数")
+//    @ApiImplicitParams({ @ApiImplicitParam(name = "poName", value = "乐团名称", required = true, dataType = "String"),
+//            @ApiImplicitParam(name = "voicePart", value = "声部名称", required = true, dataType = "String")})
     public Object queryNum(String poName,String voicePart){
         if(StringUtils.isEmpty(voicePart) || StringUtils.isEmpty(poName)){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);

src/main/java/com/ym/mec/collectfee/controller/UserController.java

@@ -11,10 +11,6 @@ import com.ym.mec.collectfee.service.CourseGroupInfoService;
 import com.ym.mec.collectfee.service.OrderService;
 import com.ym.mec.collectfee.service.SchoolService;
 import com.ym.mec.collectfee.utils.Constants;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
@@ -24,7 +20,7 @@ import java.util.Date;
 
 @RestController()
 @RequestMapping("user")
-@Api("用户服务")
+//@Api("用户服务")
 public class UserController extends BaseController {
 
     @Autowired
@@ -44,9 +40,9 @@ public class UserController extends BaseController {
      * @return
      */
     @GetMapping("/getUserDetailByPhone")
-    @ApiOperation(value = "根据乐团编号、用户手机，查询用户详情")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "用户手机", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")})
+//    @ApiOperation(value = "根据乐团编号、用户手机，查询用户详情")
+//    @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "用户手机", required = true, dataType = "String"),
+//            @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")})
     public Object getUserDetailByPhone(String phone,Integer clazzId){
         if(StringUtils.isEmpty(phone) || clazzId == null){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
@@ -70,7 +66,7 @@ public class UserController extends BaseController {
      * @param applyInfo
      * @return
      */
-    @ApiOperation(value = "学生报名乐团")
+//    @ApiOperation(value = "学生报名乐团")
     @PostMapping("/userApply")
     public Object userApply(ApplyInfo applyInfo){
         if(applyInfo != null){
@@ -96,10 +92,10 @@ public class UserController extends BaseController {
      * @param clazzId
      * @return
      */
-    @ApiOperation(value = "根据乐团编号获取乐团详情，查询乐团状态也通过该接口")
+//    @ApiOperation(value = "根据乐团编号获取乐团详情，查询乐团状态也通过该接口")
     @PostMapping("/getClassDetail")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "schoolId", value = "学校编号", required = true, dataType = "Integer")})
+//    @ApiImplicitParams({ @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer"),
+//            @ApiImplicitParam(name = "schoolId", value = "学校编号", required = true, dataType = "Integer")})
     public Object getSchoolDetail(Integer schoolId,Integer clazzId){
         if(schoolId == null || clazzId == null){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
@@ -112,7 +108,7 @@ public class UserController extends BaseController {
      * @param stuId
      * @return
      */
-    @ApiOperation(value = "根据学生编号获取乐团注册页面数据")
+//    @ApiOperation(value = "根据学生编号获取乐团注册页面数据")
     @PostMapping("/getUserRegisterViewDetail")
     public Object getUserRegisterViewDetail(Integer stuId){
         if(stuId == null){
@@ -135,8 +131,8 @@ public class UserController extends BaseController {
      * @return
      */
     @PostMapping("/getCourses")
-    @ApiOperation(value = "根据乐团编号，获取乐团课程组列表")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")})
+//    @ApiOperation(value = "根据乐团编号，获取乐团课程组列表")
+//    @ApiImplicitParams({ @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")})
     public Object getCourses(Integer clazzId){
         if(clazzId == null){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
@@ -144,25 +140,25 @@ public class UserController extends BaseController {
         return succeed(courseGroupInfoService.getCourses(clazzId));
     }
 
-    @ApiOperation(value = "获取所有乐团列表")
+//    @ApiOperation(value = "获取所有乐团列表")
     @PostMapping("/getMusicTeams")
     public Object getMusicTeams(MusicTeamsPageInfo pageInfo){
         return succeed(schoolService.queryPage(pageInfo));
     }
 
-    @ApiOperation(value = "根据乐团编号，获取学员列表")
+//    @ApiOperation(value = "根据乐团编号，获取学员列表")
     @PostMapping("/getMusicTeamStu")
     public Object getMusicTeamStu(StudentsQueryInfo queryInfo){
         return succeed(applyInfoService.queryUserPage(queryInfo));
     }
 
-    @ApiOperation(value = "获取所有分部列表")
+//    @ApiOperation(value = "获取所有分部列表")
     @GetMapping("/getBranches")
     public Object getBranches(){
         return succeed(applyInfoService.getBranches());
     }
 
-    @ApiOperation(value = "获取学校详情")
+//    @ApiOperation(value = "获取学校详情")
     @GetMapping("/getSchool")
     public Object getSchool(Integer schoolId){
         if(schoolId == null){
@@ -185,7 +181,7 @@ public class UserController extends BaseController {
      * 修改乐团信息
      * @return
      */
-    @ApiOperation(value = "修改乐团信息")
+//    @ApiOperation(value = "修改乐团信息")
     @PostMapping("/updateClass")
     public Object updateClass(School school){
         school.setUpdateTime(new Date());
@@ -197,7 +193,7 @@ public class UserController extends BaseController {
      * 开启乐团缴费功能
      * @return
      */
-    @ApiOperation(value = "开启乐团缴费功能")
+//    @ApiOperation(value = "开启乐团缴费功能")
     @PostMapping("/openClassPay")
     public Object openClassPay(Integer id){
         if(id == null){
@@ -212,7 +208,7 @@ public class UserController extends BaseController {
      * 修改学生信息
      * @return
      */
-    @ApiOperation(value = "修改学生信息")
+//    @ApiOperation(value = "修改学生信息")
     @PostMapping("/updateUser")
     public Object updateUser(@ModelAttribute ApplyInfo applyInfo){
         applyInfo.setUpdateTime(new Date());
@@ -224,7 +220,7 @@ public class UserController extends BaseController {
      * 修改学生信息
      * @return
      */
-    @ApiOperation(value = "批量调剂学员专业")
+//    @ApiOperation(value = "批量调剂学员专业")
     @PostMapping("/updateUserSub")
     public Object updateUserSub(String userId,Integer subId,Integer courseId){
         if(StringUtils.isEmpty(userId) || subId == null || courseId == null){
@@ -234,9 +230,9 @@ public class UserController extends BaseController {
         return succeed("修改成功");
     }
 
-    @ApiOperation(value = "学员课程班查询,本接口用于查询指定学员报名的课程班（小课或乐团）列表")
+//    @ApiOperation(value = "学员课程班查询,本接口用于查询指定学员报名的课程班（小课或乐团）列表")
     @PostMapping("/queryUserCourse")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer")})
+//    @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer")})
     public Object queryUserCourse(Integer userId){
         if(userId == null){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -6,13 +6,13 @@ import com.ym.mec.collectfee.common.web.BaseController;
 import com.ym.mec.collectfee.entity.*;
 import com.ym.mec.collectfee.service.*;
 import com.ym.mec.collectfee.utils.GenerateNum;
-import com.ym.mec.collectfee.utils.yqpay.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.ym.mec.collectfee.utils.yqpay.Intfc;
+import com.ym.mec.collectfee.utils.yqpay.Msg;
+import com.ym.mec.collectfee.utils.yqpay.NotifyMsg;
+import com.ym.mec.collectfee.utils.yqpay.YqPayUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -28,7 +28,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 
-@Api("支付")
+//@Api("支付")
 @Slf4j
 @RestController
 @RequestMapping("yqpay")
@@ -36,10 +36,8 @@ import java.util.*;
 public class YqPayController extends BaseController {
 
     @Autowired
-    @Lazy
     private YqPayService yqPayService;
     @Autowired
-    @Lazy
     private YqQueryService yqQueryService;
     @Autowired
     private OrderService orderService;
@@ -61,7 +59,7 @@ public class YqPayController extends BaseController {
      * @return String
      * @throws Exception
      */
-    @ApiOperation(value = "提交支付", notes = "易乾支付统一下单")
+//    @ApiOperation(value = "提交支付", notes = "易乾支付统一下单")
     @PostMapping("/toPay")
     @Transactional
     public Object toPay(@ModelAttribute @Validated Order order) throws Exception {
@@ -196,17 +194,20 @@ public class YqPayController extends BaseController {
      * @return String
      * @throws Exception
      */
-    @ApiOperation(value = "续费支付", notes = "续费支付")
+//    @ApiOperation(value = "续费支付", notes = "续费支付")
     @PostMapping("/renewalsPay")
 
     public Object renewalsPay(@ModelAttribute @Validated Renewals renewals) throws Exception {
         MecUser mecUser = applyInfoService.findMecUser(renewals.getUserId());
+        if (mecUser == null) {
+            return failed("续费用户不存在");
+        }
         renewals.setBranchId(mecUser.getBranchId());
 
         //课程组价格
         List<MecCourse> courses = applyInfoService.queryUserCourse(renewals.getUserId());//获取续费课程
-        if(courses == null){
-            return failed("您没有要学费的课程");
+        if (courses == null) {
+            return failed("您没有续费的课程");
         }
         MecCourse mecCourse4json = JSON.parseObject(renewals.getCourses(), MecCourse.class);
         if (mecCourse4json == null) {

src/main/java/com/ym/mec/collectfee/controller/YqRegController.java

@@ -5,21 +5,16 @@ import com.ym.mec.collectfee.entity.Order;
 import com.ym.mec.collectfee.service.OrderService;
 import com.ym.mec.collectfee.utils.GenerateNum;
 import com.ym.mec.collectfee.utils.yqpay.YqPayUtil;
-import org.apache.http.impl.auth.GGSSchemeBase;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.math.BigDecimal;
 import java.util.*;
 
-@ApiIgnore
+//@ApiIgnore
 @Controller
 @RequestMapping("yqreg")
 public class YqRegController {

src/main/java/com/ym/mec/collectfee/entity/Order.java

@@ -1,7 +1,6 @@
 package com.ym.mec.collectfee.entity;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
@@ -14,119 +13,119 @@ import java.util.Date;
 public class Order {
 
 	/**  */
-	@ApiModelProperty(name = "id", value = "主键", hidden = true)
+//	@ApiModelProperty(name = "id", value = "主键", hidden = true)
 	private Integer id;
 
 	/** 订单号。订单流水号 */
-	@ApiModelProperty(name = "oid", value = "mec订单号（废弃）", hidden = true)
+//	@ApiModelProperty(name = "oid", value = "mec订单号（废弃）", hidden = true)
 	private Integer oid;
 
 	/** 订单号。订单流水号 */
-	@ApiModelProperty(name = "branchId", value = "分部id",required = true)
+//	@ApiModelProperty(name = "branchId", value = "分部id",required = true)
 	private Integer branchId;
 
 	/** 订单号。订单流水号 */
-	@ApiModelProperty(name = "group_id", value = "分部id",hidden = true)
+//	@ApiModelProperty(name = "group_id", value = "分部id",hidden = true)
 	private Integer groupId;
 
 	/**自己系统订单号 */
-	@ApiModelProperty(name = "orderNo", value = "系统订单号", hidden = true)
+//	@ApiModelProperty(name = "orderNo", value = "系统订单号", hidden = true)
 	private String orderNo;
 
 	/** 学员的用户编号 */
-	@ApiModelProperty(name = "userId", value = "学员编号",required = true)
+//	@ApiModelProperty(name = "userId", value = "学员编号",required = true)
 	private Integer userId;
 
 	/** 订单总金额（分） */
-	@ApiModelProperty(name = "amount", value = "订单总金额",required = true)
+//	@ApiModelProperty(name = "amount", value = "订单总金额",required = true)
 	private BigDecimal amount;
 
 	/** 支付成功金额（分）。本次在线支付（充值）的金额，该金额通常应该等于订单总金额；如果该金额少于订单总金额，则自动使用学员账户余额补足订单总金额；该金额不能大于订单总金额 */
-	@ApiModelProperty(name = "pay", value = "支付成功金额",hidden = true)
+//	@ApiModelProperty(name = "pay", value = "支付成功金额",hidden = true)
 	private BigDecimal pay;
 
 	/** 在线支付平台 */
-	@ApiModelProperty(name = "bank", value = "支付平台",hidden = true)
+//	@ApiModelProperty(name = "bank", value = "支付平台",hidden = true)
 	private String bank;
 
 	/** 公司收款帐号。本次接收学员款项的公司在线支付平台（支付宝、微信等）账户号 */
-	@ApiModelProperty(name = "account", value = "公司收款账号",hidden = true)
+//	@ApiModelProperty(name = "account", value = "公司收款账号",hidden = true)
 	private String account;
 
 	/** 学员付款帐号。本次在线支付学员使用的支付宝或微信账户号。银行卡支付可为空。 */
-	@ApiModelProperty(name = "uAccount", value = "学院付款账号",hidden = true)
+//	@ApiModelProperty(name = "uAccount", value = "学院付款账号",hidden = true)
 	private String uAccount;
 
 	/** 支付流水号或代理商订单号。银行/在线支付平台生成的支付流水号或代理商生成的订单号（必须唯一不重复） */
-	@ApiModelProperty(name = "payId", value = "支付平台流水号",hidden = true)
+//	@ApiModelProperty(name = "payId", value = "支付平台流水号",hidden = true)
 	private String payId;
 
 	/** 支付到帐时间 */
-	@ApiModelProperty(name = "payTime", value = "支付到账时间",hidden = true)
+//	@ApiModelProperty(name = "payTime", value = "支付到账时间",hidden = true)
 	private Date payTime;
 
 	/** 交易订单明细 */
-	@ApiModelProperty(name = "remark", value = "订单明细",hidden = true)
+//	@ApiModelProperty(name = "remark", value = "订单明细",hidden = true)
 	private String remark;
 
 	/** 小课编号 */
-	@ApiModelProperty(name = "classId", value = "小课编号")
+//	@ApiModelProperty(name = "classId", value = "小课编号")
 	private Integer classId;
 
 	/** 支付状态，0成功，1支付中，2失败 */
-	@ApiModelProperty(name = "status", value = "支付状态",hidden = true)
+//	@ApiModelProperty(name = "status", value = "支付状态",hidden = true)
 	private Integer status;
 
 	/** 创建时间 */
-	@ApiModelProperty(name = "createTime", value = "创建时间",hidden = true)
+//	@ApiModelProperty(name = "createTime", value = "创建时间",hidden = true)
 	private Date createTime;
 
 	/** 乐团名称 */
-	@ApiModelProperty(name = "poName", value = "乐团名称")
+//	@ApiModelProperty(name = "poName", value = "乐团名称")
 	private String poName;
 
 	/** 课程组信息 */
-	@ApiModelProperty(name = "courseId", value = "课程组id",required = true)
+//	@ApiModelProperty(name = "courseId", value = "课程组id",required = true)
 	private Integer courseId;
 
 	/** 声部 */
-	@ApiModelProperty(name = "voicyPart", value = "声部")
+//	@ApiModelProperty(name = "voicyPart", value = "声部")
 	private String voicyPart;
 
 	/** 账户扣款金额 */
-	@ApiModelProperty(name = "balance", value = "账号扣款金额",hidden = true)
+//	@ApiModelProperty(name = "balance", value = "账号扣款金额",hidden = true)
 	private BigDecimal balance;
 
 	/** 批次号 */
-	@ApiModelProperty(name = "batchNum", value = "批次号",hidden = true)
+//	@ApiModelProperty(name = "batchNum", value = "批次号",hidden = true)
 	private String batchNum;
 
 	/** 乐器 */
-	@ApiModelProperty(name = "instrument", value = "乐器")
+//	@ApiModelProperty(name = "instrument", value = "乐器")
 	private String instrument;
 
 	/** 辅件 */
-	@ApiModelProperty(name = "adjunct", value = "辅件")
+//	@ApiModelProperty(name = "adjunct", value = "辅件")
 	private String adjunct;
 
 	/** 其他 */
-	@ApiModelProperty(name = "other", value = "其他")
+//	@ApiModelProperty(name = "other", value = "其他")
 	private String other;
 
 	//学费金额（元）。本次缴纳的学费金额。
-	@ApiModelProperty(name = "tuiFee", value = "学费金额",hidden = true)
+//	@ApiModelProperty(name = "tuiFee", value = "学费金额",hidden = true)
 	private BigDecimal tuiFee;
 
 	//乐器费用（元）
-	@ApiModelProperty(name = "goodsFee", value = "乐器费用",hidden = true)
+//	@ApiModelProperty(name = "goodsFee", value = "乐器费用",hidden = true)
 	private BigDecimal goodsFee;
 
 	//杂费金额（元）
-	@ApiModelProperty(name = "goodsFee", value = "杂费金额",hidden = true)
+//	@ApiModelProperty(name = "goodsFee", value = "杂费金额",hidden = true)
 	private BigDecimal sdFee;
 
 	//杂费名称，如：乐保、教谱等。
-	@ApiModelProperty(name = "goodsFee", value = "杂费名称",hidden = true)
+//	@ApiModelProperty(name = "goodsFee", value = "杂费名称",hidden = true)
 	private String sdName;
 
 	public BigDecimal getTuiFee() {

src/main/java/com/ym/mec/collectfee/entity/Renewals.java

@@ -1,6 +1,5 @@
 package com.ym.mec.collectfee.entity;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -9,51 +8,51 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class Renewals {
 
 	/** id */
-	@ApiModelProperty(name = "id", value = "主键", hidden = true)
+//	@ApiModelProperty(name = "id", value = "主键", hidden = true)
 	private Integer id;
 	
 	/** 用户id */
-	@ApiModelProperty(name = "userId", value = "用户id",required = true)
+//	@ApiModelProperty(name = "userId", value = "用户id",required = true)
 	private Integer userId;
 	
 	/** 乐团id */
-	@ApiModelProperty(name = "classId", value = "乐团id",hidden = true)
+//	@ApiModelProperty(name = "classId", value = "乐团id",hidden = true)
 	private Integer classId;
 
 	/** 分部id */
-	@ApiModelProperty(name = "branchId", value = "分部id",hidden = true)
+//	@ApiModelProperty(name = "branchId", value = "分部id",hidden = true)
 	private Integer branchId;
 	
 	/** 支付方式 */
-	@ApiModelProperty(name = "way", value = "支付方式",hidden = true)
+//	@ApiModelProperty(name = "way", value = "支付方式",hidden = true)
 	private Integer way;
 	
 	/** 支付金额 */
-	@ApiModelProperty(name = "pay", value = "支付金额",hidden = true)
+//	@ApiModelProperty(name = "pay", value = "支付金额",hidden = true)
 	private java.math.BigDecimal pay;
 	
 	/** 收费方式 */
-	@ApiModelProperty(name = "changeMode", value = "收费方式",hidden = true)
+//	@ApiModelProperty(name = "changeMode", value = "收费方式",hidden = true)
 	private Integer changeMode;
 	
 	/** 学费单价 */
-	@ApiModelProperty(name = "price", value = "学费单价",hidden = true)
+//	@ApiModelProperty(name = "price", value = "学费单价",hidden = true)
 	private java.math.BigDecimal price;
 
 	/** 课程id */
-	@ApiModelProperty(name = "courseId", value = "课程id",hidden = true)
+//	@ApiModelProperty(name = "courseId", value = "课程id",hidden = true)
 	private Integer courseId;
 
 	/** 购买数量 */
-	@ApiModelProperty(name = "buy", value = "购买数量",hidden = true)
+//	@ApiModelProperty(name = "buy", value = "购买数量",hidden = true)
 	private Integer buy;
 	
 	/** 订单号 */
-	@ApiModelProperty(name = "orderId", value = "订单号",hidden = true)
+//	@ApiModelProperty(name = "orderId", value = "订单号",hidden = true)
 	private Integer orderId;
 
 	/** 购买课程 */
-	@ApiModelProperty(name = "courses", value = "购买课程，json格式({\"courseId\":\"100012\",\"buyCount\":\"3\",\"price\":\"300\"})",required = true)
+//	@ApiModelProperty(name = "courses", value = "购买课程，json格式({\"courseId\":\"100012\",\"buyCount\":\"3\",\"price\":\"300\"})",required = true)
 	private String courses;
 	
 	public void setId(Integer id){

src/main/resources/application.yml

@@ -69,5 +69,5 @@ common:
     key: e99a18c428cb38d5f260853678922e03
     sms-appId: EUCP-EMY-SMS1-1AIHP
     sms-secretKey: CBA790799C876DAD
-    sms-host-dev: http://ip:port
+    sms-host-dev: http://bjksmtn.b2m.cn
 

src/main/resources/config/mybatis/RenewalsMapper.xml

@@ -69,6 +69,6 @@
 
 	<!-- 根据order_id获取小课信息 -->
 	<select id="getRenewalsByOrderId" resultMap="Renewals">
-		SELECT * FROM `renewals` WHERE order_id = #{orderId}
+		SELECT * FROM `renewals` WHERE order_id = #{orderId} limit 1
 	</select>
 </mapper>