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

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

@@ -40,6 +40,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     @Override
     public List<Goods> getMusicalList(String musicGroupId) {
         List<StudentPaymentOrderDetail> applyOrder = findApplyOrderSuccess(musicGroupId, DealStatusEnum.SUCCESS);
+        if(applyOrder == null){
+            return null;
+        }
         String goodsIdsStr = "";
         for (StudentPaymentOrderDetail studentPaymentOrderDetail : applyOrder) {
             if (studentPaymentOrderDetail.getGoodsIdList() != null && !studentPaymentOrderDetail.getGoodsIdList().isEmpty()) {

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

@@ -29,7 +29,7 @@
         <result column="payment_status_" property="paymentStatus"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="music_group_status_" property="musicGroupStatus"/>
-        <result column="class_group_name_" property="classGroupName" />
+        <result column="class_group_name_" property="classGroupName"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentInfo" id="StudentInfo">
@@ -108,15 +108,21 @@
             <if test="currentClass!=null">#{currentClass},</if>
             <if test="subjectId!=null">#{subjectId},</if>
             <if test="actualSubjectId!=null">#{actualSubjectId},</if>
-            <if test="isAllowAdjust!=null">#{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
-            <if test="kitPurchaseMethod!=null">#{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="isAllowAdjust!=null">#{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="kitPurchaseMethod!=null">
+                #{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="remark!=null">#{remark},</if>
             <if test="parentsName!=null">#{parentsName},</if>
             <if test="parentsPhone!=null">#{parentsPhone},</if>
             <if test="parentsCompany!=null">#{parentsCompany},</if>
-            <if test="paymentStatus!=null">#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="paymentStatus!=null">#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="classGroupId!=null">#{classGroupId},</if>
-            <if test="musicGroupStatus!=null">#{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="musicGroupStatus!=null">
+                #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="createTime!=null">#{createTime},</if>
             <if test="updateTime!=null">#{updateTime},</if>
         </trim>
@@ -268,7 +274,8 @@
         </collection>
     </resultMap>
     <select id="queryFeeDetail" resultMap="queryFeeDetailMap">
-        SELECT spo.actual_amount_,spo.expect_amount_,spod.price_,GROUP_CONCAT(g.name_) goods_name_,MAX(g.type_) goods_type_
+        SELECT spo.actual_amount_,spo.expect_amount_,spod.price_,GROUP_CONCAT(g.name_) goods_name_,MAX(g.type_)
+        goods_type_
         FROM student_registration sr
         LEFT JOIN student_payment_order spo ON sr.music_group_id_ = spo.music_group_id_ AND spo.user_id_ = sr.user_id_
         LEFT JOIN student_payment_order_detail spod ON spod.payment_order_id_ = spo.id_
@@ -279,14 +286,10 @@
 
     <!-- 根据乐团和声部获取未分班的学生 -->
     <select id="getNoClassStuBySubjectId" resultMap="StudentRegistration">
-        SELECT sr.* FROM student_registration sr
-        WHERE sr.user_id_ NOT IN (
-        SELECT DISTINCT cgsm.user_id_ FROM class_group_student_mapper cgsm
-        LEFT JOIN class_group cg ON cg.id_ = cgsm.class_group_id_
-        WHERE cg.music_group_id_ = #{musicGroupId})
-        AND sr.music_group_id_ = #{musicGroupId}
+        SELECT * FROM student_registration
+        WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 AND class_group_id_=0
         <if test="actualSubjectId != null">
-            AND FIND_IN_SET(sr.actual_subject_id_,#{actualSubjectId})
+            AND FIND_IN_SET(actual_subject_id_,#{actualSubjectId})
         </if>
     </select>
 
@@ -373,7 +376,7 @@
 
     <!-- 获取乐团声部下的学生 -->
     <select id="findMusicGroupStudent" resultMap="StudentRegistration">
-        SELECT sr.*,cg.name_ class_group_name_  FROM student_registration sr
+        SELECT sr.*,cg.name_ class_group_name_ FROM student_registration sr
         LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
         WHERE sr.music_group_id_ = #{musicGroupId}
         <if test="actualSubjectId != null and actualSubjectId !=''">
@@ -412,4 +415,5 @@
     <update id="batchOpenPay">
         UPDATE student_registration SET payment_status_ = #{paymentStatus},update_time_ = now()
         WHERE FIND_IN_SET(id_,#{ids}) AND payment_status_ = 0
-    </update></mapper>
+    </update>
+</mapper>

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -35,7 +35,7 @@ public class StudentPaymentOrderController extends BaseController {
 
     @ApiOperation(value = "获取乐器采购清单")
     @GetMapping("/getMusicalList")
-    //@PreAuthorize("@pcs.hasPermissions('order/getMusicalList')")
+    @PreAuthorize("@pcs.hasPermissions('order/getMusicalList')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
     public Object getMusicalList(String musicGroupId){
         return succeed(studentPaymentOrderDetailService.getMusicalList(musicGroupId));