Merge remote-tracking branch 'origin/test' into test

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

@@ -700,7 +700,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         //乐器保养
         if(registerPayDto.getBuyMaintenance()){
-            orderAmount = orderAmount.add(new BigDecimal(300));
+            BigDecimal maintenancePrice = new BigDecimal(sysConfigDao.findConfigValue("maintenance_price"));
+            orderAmount = orderAmount.add(maintenancePrice);
         }
 
         if (amount.compareTo(orderAmount) != 0) {
@@ -850,7 +851,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         if(registerPayDto.getBuyMaintenance()){
-            orderAmount = orderAmount.add(new BigDecimal(300));
+            BigDecimal maintenancePrice = new BigDecimal(sysConfigDao.findConfigValue("maintenance_price"));
+            orderAmount = orderAmount.add(maintenancePrice);
         }
 
         if (amount.compareTo(orderAmount) != 0) {

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

@@ -69,7 +69,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
             throw new BizException("所选乐器不存在，请核查");
         }
         Integer userId = studentInstrument.getStudentId();
-        BigDecimal orderAmount = new BigDecimal(300);
+        BigDecimal orderAmount = new BigDecimal(sysConfigDao.findConfigValue("maintenance_price"));
         BigDecimal amount = maintenancePayDto.getAmount(); //扣除余额之前的金额
         if (amount.compareTo(orderAmount) != 0) {
             throw new BizException("商品价格不符");
@@ -179,11 +179,11 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
                 logger.error("产品协议生成失败", e);
             }
             Date startTime = nowDate;
-            Date endTime = DateUtil.addDays(DateUtil.addYears(nowDate, 1), -1);
+            Date endTime = DateUtil.addYears(nowDate, 1);
             if (studentInstrument.getEndTime() != null &&
-                    DateUtil.getLastTimeWithDay(studentInstrument.getEndTime()).compareTo(nowDate) >= 0) {
+                    studentInstrument.getEndTime().compareTo(nowDate) >= 0) {
                 startTime = studentInstrument.getStartTime();
-                endTime = DateUtil.addDays(DateUtil.addYears(studentInstrument.getStartTime(), 1), -1);
+                endTime = DateUtil.addYears(studentInstrument.getEndTime(), 1);
             }
             studentInstrument.setStartTime(startTime);
             studentInstrument.setEndTime(endTime);
@@ -280,7 +280,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
             maintenanceDetail = orderDetails4Maintenance.get(0);
             maintenanceStatus = 1;
             startTime = new Date();
-            endTime = DateUtil.addDays(DateUtil.addYears(startTime, 1), -1);
+            endTime = DateUtil.addYears(startTime, 1);
         }
 
         Integer goodsId = Integer.valueOf(orderDetails4Instruments.get(0).getGoodsIdList());

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

@@ -423,9 +423,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             if ("".equals(maintenanceGoodsId)) {
                 throw new BizException("团购乐器才能购买乐保，请核查");
             }
+            BigDecimal maintenancePrice = new BigDecimal(sysConfigDao.findConfigValue("maintenance_price"));
             StudentPaymentOrderDetail maintenanceOrderDetail = new StudentPaymentOrderDetail();
             maintenanceOrderDetail.setType(OrderDetailTypeEnum.MAINTENANCE);
-            maintenanceOrderDetail.setPrice(new BigDecimal(300));
+            maintenanceOrderDetail.setPrice(maintenancePrice);
             maintenanceOrderDetail.setRemitFee(BigDecimal.ZERO);
             maintenanceOrderDetail.setCreateTime(date);
             maintenanceOrderDetail.setUpdateTime(date);
@@ -547,9 +548,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             if ("".equals(maintenanceGoodsId)) {
                 throw new BizException("团购乐器才能购买乐保，请核查");
             }
+            BigDecimal maintenancePrice = new BigDecimal(sysConfigDao.findConfigValue("maintenance_price"));
             StudentPaymentOrderDetail maintenanceOrderDetail = new StudentPaymentOrderDetail();
             maintenanceOrderDetail.setType(OrderDetailTypeEnum.MAINTENANCE);
-            maintenanceOrderDetail.setPrice(new BigDecimal(300));
+            maintenanceOrderDetail.setPrice(maintenancePrice);
             maintenanceOrderDetail.setRemitFee(BigDecimal.ZERO);
             maintenanceOrderDetail.setCreateTime(date);
             maintenanceOrderDetail.setUpdateTime(date);

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

@@ -21,12 +21,12 @@
         <result column="goods_img_" property="goodsImg"/>
     </resultMap>
 
-    <select id="get" parameterType="java.lang.Integer" resultMap="StudentInstrument">
+    <select id="get" parameterType="java.lang.Long" resultMap="StudentInstrument">
         <!--@mbg.generated-->
         SELECT * FROM student_instrument
         where id_ = #{id}
     </select>
-    <delete id="delete" parameterType="java.lang.Integer">
+    <delete id="delete" parameterType="java.lang.Long">
         <!--@mbg.generated-->
         delete from student_instrument
         where id_ = #{id}

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

@@ -119,23 +119,19 @@
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
-		<where>
-			sesa.del_flag_ = 0
-			<if test="subjectId != null">
-				AND sesa.subject_id_ = #{subjectId}
-			</if>
-			<if test="sysMusicScoreId != null">
-				AND sesa.exam_song_id_ = #{sysMusicScoreId}
-			</if>
-		</where>
+		<include refid="queryPageSql"/>
 		ORDER BY sesa.id_ DESC
 		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_music_score_accompaniment
+		SELECT COUNT(sesa.id_) FROM sys_music_score_accompaniment
+		FROM sys_music_score_accompaniment sesa
+		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		<include refid="queryPageSql"/>
 	</select>
+
 	<select id="findSubjectByMusicScoreId" resultType="java.lang.Integer">
 		SELECT subject_id_ FROM sys_music_score_accompaniment
 		<where>

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

@@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -53,6 +54,8 @@ public class StudentManageController extends BaseController {
     private SubjectService subjectService;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private StudentService studentService;
 
     private final static Logger LOGGER = LoggerFactory.getLogger(StudentManageController.class);
 
@@ -88,6 +91,17 @@ public class StudentManageController extends BaseController {
         return succeed();
     }
 
+
+    @ApiOperation(value = "获取学员基本信息")
+    @GetMapping("student/queryUserInfo")
+    public Object queryUserInfo() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(studentService.get(user.getId()));
+    }
+
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")
     public Object findGroupUsers(Integer groupId,String search) {

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

@@ -22,4 +22,11 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         queryInfo.setType("COMMON");
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPageLimit")
+    public Object queryPageLimit(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setType("COMMON");
+        return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
+    }
 }

mec-student/src/main/resources/bootstrap-test.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f9d46b0a-9847-48ae-8e4b-216c7a3eb466
+spring.cloud.nacos.config.namespace=f753d9d9-4bb2-4df6-a483-da9e169617c4
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -51,4 +51,11 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         queryInfo.setCreateUserId(sysUser.getId());
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPageLimit")
+    public Object queryPageLimit(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setType("COMMON");
+        return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
+    }
 }