Merge branch 'repair_export_feature'

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

@@ -71,20 +71,20 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         if (applyOrder == null || applyOrder.size() == 0) {
             return null;
         }
-        String goodsIdsStr = "";
+        StringBuilder goodsIdsStr = new StringBuilder();
         for (StudentPaymentOrderDetail studentPaymentOrderDetail : applyOrder) {
-            if (studentPaymentOrderDetail.getGoodsIdList() != null && !studentPaymentOrderDetail.getGoodsIdList().isEmpty()) {
-                goodsIdsStr += studentPaymentOrderDetail.getGoodsIdList() + ",";
+            if (studentPaymentOrderDetail == null) continue;
+            if (StringUtils.isNotBlank(studentPaymentOrderDetail.getGoodsIdList())) {
+                goodsIdsStr.append(studentPaymentOrderDetail.getGoodsIdList()).append(",");
             }
         }
-        if (StringUtils.isBlank(goodsIdsStr)) {
+        if (StringUtils.isBlank(goodsIdsStr.toString())) {
             return null;
         }
-        goodsIdsStr = goodsIdsStr.substring(0, goodsIdsStr.length() - 1);
 
-        String[] goodSIdArr = goodsIdsStr.split(",");
+        String[] goodSIdArr = goodsIdsStr.toString().split(",");
 
-        List<Goods> goodies = goodsService.findGoodsByIds(goodsIdsStr);
+        List<Goods> goodies = goodsService.findGoodsByIds(goodsIdsStr.toString());
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         Organization organization = organizationDao.get(musicGroup.getOrganId());
         goodies.forEach(e -> {
@@ -231,7 +231,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     goods.setSellCount(goods.getSellCount() + 1);
                 }
             }
-            if(StringUtils.isBlank(goods.getComplementGoodsIdList())) continue;
+            if (StringUtils.isBlank(goods.getComplementGoodsIdList())) continue;
             goods.setGoodsList(goodsService.findGoodsByIds(goods.getComplementGoodsIdList()));
         }
         return goodies;
@@ -243,8 +243,8 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     }
 
     @Override
-    public List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId,Integer studentId) {
-        List<MusicalListDetailDto> musicalListDetailDtos = studentPaymentOrderDetailDao.getMusicalListDetail(musicGroupId,studentId);
+    public List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId, Integer studentId) {
+        List<MusicalListDetailDto> musicalListDetailDtos = studentPaymentOrderDetailDao.getMusicalListDetail(musicGroupId, studentId);
         if (musicalListDetailDtos.size() <= 0) {
             return musicalListDetailDtos;
         }
@@ -258,7 +258,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         Map<Long, BigDecimal> expectAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDao.queryExpectAmount(paymentOrderNo));
         Map<Long, BigDecimal> musicalAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo, "MUSICAL"));
         Map<Long, BigDecimal> accessoriesAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo, "ACCESSORIES"));
-        String courseTypes = Arrays.stream(CourseSchedule.CourseScheduleType.values()).map(CourseSchedule.CourseScheduleType::getCode).collect(Collectors.joining(","))+",COURSE";
+        String courseTypes = Arrays.stream(CourseSchedule.CourseScheduleType.values()).map(CourseSchedule.CourseScheduleType::getCode).collect(Collectors.joining(",")) + ",COURSE";
         Map<Long, BigDecimal> courseAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo, courseTypes));
         Map<Long, String> purchaseTypeMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryPurchaseTypeMap(paymentOrderNo));
         Map<Integer, String> userSubjectMap = subjectDao.getRegisterSubject(musicGroupId, userIds).stream().collect(Collectors.toMap(StudentRegistration::getUserId, StudentRegistration::getSubjectName));
@@ -279,7 +279,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(purchaseTypeMap.get(e.getPaymentOrderId())));
             }
             SubjectChange studentLastChange = subjectChangeDao.getStudentLastChange(e.getUserId(), musicGroupId);
-            if(studentLastChange != null){
+            if (studentLastChange != null) {
                 studentLastChange.setOriginalKitGroupPurchaseType(studentLastChange.getKitGroupPurchaseType());
             }