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

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

@@ -282,11 +282,12 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 }
                 if (studentGoods.getChangeAccessoriesGoods() != null) {
                     String accessoriesNames = studentGoods.getChangeAccessoriesGoods().stream().map(Goods::getName).collect(Collectors.joining(","));
-                    goodsNames = StringUtils.isNotBlank(goodsNames) ? "," + accessoriesNames : accessoriesNames;
+                    goodsNames += StringUtils.isNotBlank(goodsNames) ? "," + accessoriesNames : accessoriesNames;
                 }
                 musicalListDetailDto.setGoodsNames(goodsNames);
                 musicalListDetailDto.setMusicalAmount(studentGoods.getChangeMusicalPrice());
                 musicalListDetailDto.setAccessoriesAmount(studentGoods.getChangeAccessoriesPrice());
+                musicalListDetailDto.setCourseAmount(studentGoods.getChangeCourseFee());
             }
         }
         return musicalListDetailDtos;

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

@@ -206,13 +206,11 @@
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
-            LEFT JOIN class_group_student_mapper cgsm ON cssp.user_id_=cgsm.user_id_ AND cssp.class_group_id_=cgsm.class_group_id_
             LEFT JOIN student_registration sr ON sr.user_id_=cssp.user_id_ AND cssp.music_group_id_=sr.music_group_id_
             LEFT JOIN `subject` s ON sr.subject_id_=s.id_
         WHERE
             cssp.course_schedule_id_ =#{courseScheduleId}
             AND su.id_ IS NOT NULL
-            AND cgsm.status_!='QUIT' AND cgsm.status_!='QUIT_SCHOOL'
         ORDER BY cssp.user_id_
         <include refid="global.limit"/>
     </select>
@@ -224,11 +222,9 @@
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
-            LEFT JOIN class_group_student_mapper cgsm ON cssp.user_id_=cgsm.user_id_ AND cssp.class_group_id_=cgsm.class_group_id_
         WHERE
             cssp.course_schedule_id_ =#{courseScheduleId}
             AND su.id_ IS NOT NULL
-            AND cgsm.status_!='QUIT' AND cgsm.status_!='QUIT_SCHOOL'
     </select>
 
     <update id="deleteStudentByMusicGroupId" parameterType="map">

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

@@ -716,7 +716,7 @@ public class ExportController extends BaseController {
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "乐团", "学员编号", "学员姓名","声部", "购买商品", "采购方式", "乐器金额", "教辅金额", "课程金额", "订单总价"}, new String[]{
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "乐团", "学员编号", "学员姓名","声部", "购买商品", "乐器采购方式", "乐器金额", "教辅金额", "课程金额", "订单总价"}, new String[]{
                     "organName", "musicGroupName", "userId", "username","subjectName", "goodsNames", "kitGroupPurchaseTypeEnum.msg", "musicalAmount", "accessoriesAmount", "courseAmount", "orderAmount"}, musicalList);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");