学生乐团增加退团时间

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

@@ -1,6 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.dto.musicalListDetailDto;
+import com.ym.mec.biz.dal.dto.MusicalListDetailDto;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.common.dal.BaseDAO;
@@ -53,7 +53,7 @@ public interface StudentPaymentOrderDetailDao extends BaseDAO<Long, StudentPayme
      * @param musicGroupId
      * @return
      */
-    List<musicalListDetailDto> getMusicalListDetail(String musicGroupId);
+    List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId);
 
     /**
      * 获取商品名称列表

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/musicalListDetailDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicalListDetailDto.java

@@ -4,7 +4,7 @@ import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 
 import java.math.BigDecimal;
 
-public class musicalListDetailDto {
+public class MusicalListDetailDto {
     private Long paymentOrderId;
 
     private Integer userId;

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderDetailService.java

@@ -1,12 +1,11 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.musicalListDetailDto;
+import com.ym.mec.biz.dal.dto.MusicalListDetailDto;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.BaseService;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -63,7 +62,7 @@ public interface StudentPaymentOrderDetailService extends BaseService<Long, Stud
      * @param musicGroupId
      * @return
      */
-    List<musicalListDetailDto> getMusicalListDetail(String musicGroupId);
+    List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId);
 
     /**
      * 获取订单的乐器信息

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

@@ -9,14 +9,12 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.dto.musicalListDetailDto;
+import com.ym.mec.biz.dal.dto.MusicalListDetailDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
-import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
@@ -174,11 +172,11 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     }
 
     @Override
-    public List<musicalListDetailDto> getMusicalListDetail(String musicGroupId) {
-        List<musicalListDetailDto> musicalListDetailDtos = studentPaymentOrderDetailDao.getMusicalListDetail(musicGroupId);
-        if(musicalListDetailDtos != null && musicalListDetailDtos.size() > 0){
-            List<Long> paymentOrderNo = musicalListDetailDtos.stream().map(e -> e.getPaymentOrderId()).collect(Collectors.toList());
-            List<Integer> userIds = musicalListDetailDtos.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+    public List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId) {
+        List<MusicalListDetailDto> MusicalListDetailDtos = studentPaymentOrderDetailDao.getMusicalListDetail(musicGroupId);
+        if(MusicalListDetailDtos != null && MusicalListDetailDtos.size() > 0){
+            List<Long> paymentOrderNo = MusicalListDetailDtos.stream().map(e -> e.getPaymentOrderId()).collect(Collectors.toList());
+            List<Integer> userIds = MusicalListDetailDtos.stream().map(e -> e.getUserId()).collect(Collectors.toList());
             //商品名称
             MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
             Organization organization = organizationDao.get(musicGroup.getOrganId());
@@ -190,7 +188,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             Map<Long, BigDecimal> courseAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo,"COURSE"));
             Map<Long, String> purchaseTypeMap = MapUtil.convertIntegerMap(studentRegistrationDao.queryPurchaseTypeMap(musicGroupId));
             Map<Integer,String> userSubjectMap = MapUtil.convertIntegerMap(subjectDao.findByMusicGroupAndUsers(musicGroupId, userIds));
-            musicalListDetailDtos.forEach(e->{
+            MusicalListDetailDtos.forEach(e->{
                 e.setGoodsNames(goodsNameMap.get(e.getPaymentOrderId()));
                 e.setMusicGroupName(musicGroup.getName());
                 e.setUsername(usernameMap.get(e.getUserId()));
@@ -200,13 +198,13 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 e.setOrderAmount(actualAmountMap.get(e.getPaymentOrderId()));
                 e.setCourseAmount(courseAmountMap.get(e.getPaymentOrderId()));
                 e.setSubjectName(userSubjectMap.get(e.getUserId()));
-                String s = purchaseTypeMap.get(e.getUserId());
+                String s = purchaseTypeMap.get(e.getUserId().longValue());
                 if(StringUtils.isNotEmpty(s)){
-                    e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(purchaseTypeMap.get(e.getUserId())));
+                    e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(purchaseTypeMap.get(e.getUserId().longValue())));
                 }
             });
         }
-        return musicalListDetailDtos;
+        return MusicalListDetailDtos;
     }
 
     @Override

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

@@ -121,7 +121,7 @@
         AND spo.status_=#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         AND spo.type_ = 'APPLY'
     </select>
-    <resultMap id="musicalListDetailDtoMap" type="com.ym.mec.biz.dal.dto.musicalListDetailDto">
+    <resultMap id="musicalListDetailDtoMap" type="com.ym.mec.biz.dal.dto.MusicalListDetailDto">
         <result property="paymentOrderId" column="payment_order_id_"/>
         <result property="username" column="username_"/>
         <result property="userId" column="user_id_"/>

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

@@ -708,7 +708,7 @@ public class ExportController extends BaseController {
     @PostMapping("order/musicalListDetailExport")
     @PreAuthorize("@pcs.hasPermissions('order/musicalListDetailExport')")
     public void musicalListDetailExport(HttpServletResponse response, String musicGroupId) throws IOException {
-        List<musicalListDetailDto> musicalList = studentPaymentOrderDetailService.getMusicalListDetail(musicGroupId);
+        List<MusicalListDetailDto> musicalList = studentPaymentOrderDetailService.getMusicalListDetail(musicGroupId);
         if (musicalList.size() > 50000) {
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }