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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/excel/UserWithdrawalExport.java

@@ -43,7 +43,7 @@ public class UserWithdrawalExport {
     private TradeStatusEnum status;
     /*@ExcelProperty(value = "审核原因", index = 9)
     private String verifyReason;*/
-    @ExcelProperty(value = "银行流水号", index = 10)
+    @ExcelProperty(value = "银行流水号", index = 9)
     private String bankFlowNo;
     /*@NotBlank(message = "签名不能为空")
     @ExcelProperty(value = "签名", index = 11)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -1666,6 +1666,12 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         List<CourseTimeEntity> timeList = arrangeCourseVo.getTimeList();//选课时间
         Integer consumeTime = arrangeCourseVo.getConsumeTime();
 
+        log.info("classNum:"+classNum);
+        log.info("singleClssTime:"+singleClssTime);
+        log.info("n:"+n);
+        log.info("消耗时长:"+consumTime);
+        log.info("传入时长:"+consumeTime);
+
         Integer configValue = Integer.valueOf(sysConfigService.findConfigValue(SysConfigConstant.PIANO_ROOM_MAX_STUDENTS));
         if (studentIds.size() > configValue) {
             throw new BizException("成课学员人数超过房间最大容量{}", configValue);

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SysConfigController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.student.controller;
 
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -55,6 +56,14 @@ public class SysConfigController extends BaseController {
 		return succeed(sysConfigService.findByParamName(paramName));
 	}
 
+	@GetMapping(value = "findConfigValue")
+	public HttpResponseResult<String> findConfigValue(String paramName) {
+		if(StringUtils.isBlank(paramName)){
+			return failed("参数不能为空");
+		}
+		return succeed(sysConfigService.findConfigValue(paramName));
+	}
+
 	@ApiOperation(value = "查询参数")
 	@GetMapping(value = "queryByParamNameList")
 	public Object queryByParamNameList(String paramNames) {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysConfigController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.teacher.controller;
 
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -55,6 +56,14 @@ public class SysConfigController extends BaseController {
 		return succeed(sysConfigService.findByParamName(paramName));
 	}
 
+	@GetMapping(value = "findConfigValue")
+	public HttpResponseResult<String> findConfigValue(String paramName) {
+		if(StringUtils.isBlank(paramName)){
+			return failed("参数不能为空");
+		}
+		return succeed(sysConfigService.findConfigValue(paramName));
+	}
+
 	@ApiOperation(value = "查询参数")
 	@GetMapping(value = "queryByParamNameList")
 	public Object queryByParamNameList(String paramNames) {

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/SysConfigController.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,4 +63,14 @@ public class SysConfigController extends BaseController {
 		}
 		return succeed(sysConfigService.findConfigValue(paramName));
 	}
+
+	@ApiOperation(value = "查询参数")
+	@GetMapping(value = "queryByParamNameList")
+	public Object queryByParamNameList(String paramNames) {
+		if(StringUtils.isBlank(paramNames)){
+			return failed("参数不能为空");
+		}
+		List<String> paramNameList = Arrays.asList(paramNames.split(","));
+		return succeed(sysConfigService.findByParamName(paramNameList));
+	}
 }