add 订单导出，零星收费增加学校

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
@@ -182,6 +183,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     /**
      * 获取乐团信息
+     *
      * @param list
      * @return
      */
@@ -189,9 +191,16 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     /**
      * 获取乐团名称
+     *
      * @param musicGroupIds
      * @return
      */
     List<Map<String, String>> queryMusicGroupNameMap(@Param("musicGroupIds") Set<String> musicGroupIds);
 
+    /**
+     * 查询用户的学校
+     * @param userId
+     * @return
+     */
+    School findUserSchool(@Param("userId") Integer userId);
 }

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

@@ -403,4 +403,11 @@
 		</foreach>
 		AND name_ IS NOT NULL
 	</select>
+
+	<select id="findUserSchool" resultMap="com.ym.mec.biz.dal.dao.SchoolDao.School">
+		SELECT s.* FROM music_group mg
+		LEFT JOIN student_registration sr on sr.music_group_id_ = mg.id_
+		LEFT JOIN school s on mg.school_id_ = s.id_
+		WHERE sr.user_id_ = #{UserId} ORDER BY sr.id_ DESC LIMIT 1
+	</select>
 </mapper>

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dao.VipGroupDao;
 import com.ym.mec.biz.dal.dto.*;
@@ -62,6 +63,8 @@ public class ExportController extends BaseController {
     private StudentRegistrationDao studentRegistrationDao;
     @Autowired
     private VipGroupDao vipGroupDao;
+    @Autowired
+    private MusicGroupDao musicGroupDao;
 
     @ApiOperation(value = "导出学员是否有课")
     @PostMapping("export/studentHasCourse")
@@ -235,7 +238,6 @@ public class ExportController extends BaseController {
                 row.setSporadicAmount(row.getActualAmount());
                 row.setMusicalFee(BigDecimal.ZERO);
                 row.setTeachingFee(BigDecimal.ZERO);
-                row.setTeachingFee(BigDecimal.ZERO);
                 if (row.getChargeType() != null) {
                     if (row.getChargeType().equals(1)) {
                         row.setSporadicType("考级");
@@ -251,6 +253,10 @@ public class ExportController extends BaseController {
                         row.setSporadicType("福袋活动");
                     }
                 }
+                School userSchool = musicGroupDao.findUserSchool(row.getUserId());
+                if(userSchool!= null){
+                    row.setSchoolName(userSchool.getName());
+                }
             }
             String paymentChannel = "";
             if (row.getPaymentChannel() == null) {