Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderDao.java

@@ -123,7 +123,7 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
 
     List<MusicGroupPaymentCalender> queryByIds(@Param("calenderId") Set<Long> calenderId);
 
-    List<Long> queryEndIds(@Param("configValue1") String configValue1, @Param("format") String format);
+    List<Long> queryEndIds(@Param("configValue") String configValue, @Param("format") String format);
 
     List<CalenderPushDto> getCalenderPushDto(@Param("calenderIds") Collection<Long> calenderIds);
 

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

@@ -17,6 +17,9 @@ public class StudentGoodsSell {
 	
 	@ApiModelProperty(value = "用户编号",required = true)
 	private Integer userId;
+
+	@ApiModelProperty(value = "学生名称",required = true)
+	private String userName;
 	
 	@ApiModelProperty(value = "教师编号",required = true)
 	private Integer teacherId;
@@ -52,6 +55,14 @@ public class StudentGoodsSell {
 	@ApiModelProperty(value = "分部编号", required = false)
 	private Integer organId;
 
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
 	public Integer getOrganId() {
 		return organId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CoursesGroupServiceImpl.java

@@ -154,21 +154,6 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             newCourse.setName(courseGroup.getName());
             newCourse.setOrganId(courseGroup.getOrganId());
         }
-        try {
-            courseScheduleService.checkNewCourseSchedules(newCourses, false);
-        } catch (Exception e) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            String errMessage;
-            String courseName = e.getMessage().substring(e.getMessage().indexOf(")-") + 2);
-            courseName = courseName.substring(0, courseName.indexOf("("));
-            String courseTime = e.getMessage().substring(e.getMessage().indexOf("在") + 1);
-            courseTime = courseTime.substring(0, courseTime.indexOf("至"));
-            errMessage = "现在课程：";
-            errMessage += courseName;
-            errMessage += "<br/>冲突时间：";
-            errMessage += courseTime;
-            return BaseController.failed(HttpStatus.FOUND, errMessage);
-        }
 
         CourseSchedule firstCourseSchedule = newCourses.stream().min(Comparator.comparing(CourseSchedule::getStartClassTime)).get();
         if (firstCourseSchedule.getStartClassTime().before(now)) {
@@ -221,6 +206,22 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             courseSchedule.setCreateTime(now);
             courseSchedule.setUpdateTime(now);
         }
+
+        try {
+            courseScheduleService.checkNewCourseSchedules(newCourses, false);
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            String errMessage;
+            String courseName = e.getMessage().substring(e.getMessage().indexOf(")-") + 2);
+            courseName = courseName.substring(0, courseName.indexOf("("));
+            String courseTime = e.getMessage().substring(e.getMessage().indexOf("在") + 1);
+            courseTime = courseTime.substring(0, courseTime.indexOf("至"));
+            errMessage = "现在课程：";
+            errMessage += courseName;
+            errMessage += "<br/>冲突时间：";
+            errMessage += courseTime;
+            return BaseController.failed(HttpStatus.FOUND, errMessage);
+        }
         courseScheduleDao.batchAddCourseSchedules(newCourses);
 
         for (CourseSchedule courseSchedule : newCourses) {

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

@@ -612,6 +612,6 @@
     <select id="getFirstEduTeacherId" resultType="java.lang.Integer">
         SELECT mg.educational_teacher_id_ FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        WHERE user_id_ = #{userId} AND mg.status_ != 'CANCELED' AND sr.music_group_status_ != 'QUIT' LIMIT 1
+        WHERE user_id_ = #{userId} AND mg.status_ != 'CANCELED' AND sr.music_group_status_ != 'QUIT' AND mg.educational_teacher_id_ IS NOT NULL LIMIT 1
     </select>
 </mapper>

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

@@ -240,7 +240,7 @@
         FROM music_group_payment_calender_detail mgpcd
         WHERE mgpcd.music_group_payment_calender_id_ IN
         (SELECT id_ FROM music_group_payment_calender WHERE payment_status_ != 0
-        AND DATEDIFF(start_payment_date_,#{format}) = #{configValue})
+        AND DATEDIFF(#{format},DATE_FORMAT(start_payment_date_,'%Y-%m-%d')) = #{configValue})
         AND mgpcd.payment_status_ = 'NON_PAYMENT'
         GROUP BY mgpcd.music_group_payment_calender_id_
     </select>
@@ -252,7 +252,7 @@
     </select>
     <select id="queryEndIds" resultType="java.lang.Long">
         SELECT DISTINCT mgpc.id_ FROM music_group_payment_calender mgpc
-        WHERE mgpc.payment_status_ = 2 AND DATEDIFF(#{format},DATE_FORMAT(mgpc.payment_valid_end_date_,'%Y-%m-%d')) = #{configValue1};
+        WHERE mgpc.payment_valid_end_date_ IS NOT NULL AND DATEDIFF(mgpc.payment_valid_end_date_,#{format}) = #{configValue};
     </select>
     <resultMap id="CalenderPushDto" type="com.ym.mec.biz.dal.dto.CalenderPushDto">
         <result property="paymentValidEndDate" column="payment_valid_end_date_"/>

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

@@ -14,6 +14,7 @@
 		<result column="total_amount_" property="totalAmount" />
 		<result column="market_amount_" property="marketAmount" />
 		<result column="order_no_" property="orderNo" />
+		<result column="username_" property="userName" />
 		<result column="organ_id_" property="organId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -21,7 +22,9 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="StudentGoodsSell" >
-		SELECT * FROM student_goods_sell WHERE id_ = #{id} 
+		SELECT sgs.*,su.username_ FROM student_goods_sell sgs
+		LEFT JOIN sys_user su ON su.id_ = sgs.user_id_
+		WHERE sgs.id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->

mec-student/src/main/java/com/ym/mec/student/config/ResourceServerConfig.java

@@ -36,8 +36,10 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 				"/degree/*",
 				"/practiceGroup/queryOrderInfo",
 				"/systemDate/query",
-				"/organization/getOrgans," +
-				"/repair/addGoodsSellOrder").permitAll().anyRequest().authenticated().and().httpBasic();
+				"/organization/getOrgans",
+				"/repair/addGoodsSellOrder",
+				"/repair/getStudentGoodsOrder",
+				"/contracts/queryProduceContract").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

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

@@ -81,11 +81,14 @@ public class ContractsController extends BaseController {
 
 	@ApiOperation("查询产品协议")
 	@GetMapping(value = "queryProduceContract")
-	public Object queryProduceContract(String musicGroupId) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("获取用户信息失败");
+	public Object queryProduceContract(Integer userId, String musicGroupId) {
+		if(Objects.isNull(userId)){
+			SysUser sysUser = sysUserFeignService.queryUserInfo();
+			if (sysUser == null) {
+				return failed("获取用户信息失败");
+			}
+			userId = sysUser.getId();
 		}
-		return succeed(contractService.queryProductContract(sysUser.getId(),musicGroupId));
+		return succeed(contractService.queryProductContract(userId,musicGroupId));
 	}
 }

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

@@ -17,7 +17,6 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -34,7 +34,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 				.antMatchers("/task/**")
 				.hasIpAddress("0.0.0.0/0")
 				.antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform", "/eduDegree/*",
-						"/uploadFile").permitAll().anyRequest().authenticated().and().httpBasic();
+						"/uploadFile", "/eduContracts/queryProduceContract").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override