update 订单导出增加新生课程专享

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

@@ -99,21 +99,22 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         });
         //乐器更换的
         SubjectChange changeGoods = subjectChangeDao.getChangeGoods(musicGroupId);
+        if (changeGoods == null) {
+            return goodies;
+        }
         String originalGoodsIds = "";
         String changeGoodsIds = "";
-        if (changeGoods != null) {
-            if (StringUtils.isNotBlank(changeGoods.getMusicGroupName())) {
-                originalGoodsIds += StringUtils.isNotBlank(originalGoodsIds) ? "," + changeGoods.getMusicGroupName() : changeGoods.getMusicGroupName();
-            }
-            if (StringUtils.isNotBlank(changeGoods.getOriginalAccessories())) {
-                originalGoodsIds += StringUtils.isNotBlank(originalGoodsIds) ? "," + changeGoods.getOriginalAccessories() : changeGoods.getOriginalAccessories();
-            }
-            if (StringUtils.isNotBlank(changeGoods.getTransNo())) {
-                changeGoodsIds += StringUtils.isNotBlank(changeGoodsIds) ? "," + changeGoods.getTransNo() : changeGoods.getTransNo();
-            }
-            if (StringUtils.isNotBlank(changeGoods.getChangeAccessories())) {
-                changeGoodsIds += StringUtils.isNotBlank(changeGoodsIds) ? "," + changeGoods.getChangeAccessories() : changeGoods.getChangeAccessories();
-            }
+        if (StringUtils.isNotBlank(changeGoods.getMusicGroupName())) {
+            originalGoodsIds += StringUtils.isNotBlank(originalGoodsIds) ? "," + changeGoods.getMusicGroupName() : changeGoods.getMusicGroupName();
+        }
+        if (StringUtils.isNotBlank(changeGoods.getOriginalAccessories())) {
+            originalGoodsIds += StringUtils.isNotBlank(originalGoodsIds) ? "," + changeGoods.getOriginalAccessories() : changeGoods.getOriginalAccessories();
+        }
+        if (StringUtils.isNotBlank(changeGoods.getTransNo())) {
+            changeGoodsIds += StringUtils.isNotBlank(changeGoodsIds) ? "," + changeGoods.getTransNo() : changeGoods.getTransNo();
+        }
+        if (StringUtils.isNotBlank(changeGoods.getChangeAccessories())) {
+            changeGoodsIds += StringUtils.isNotBlank(changeGoodsIds) ? "," + changeGoods.getChangeAccessories() : changeGoods.getChangeAccessories();
         }
         if (StringUtils.isNotBlank(changeGoodsIds)) {
             String[] changGoodsIdsArr = changeGoodsIds.split(",");
@@ -286,7 +287,7 @@ 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());