update

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

@@ -24,6 +24,10 @@ public class MusicalListDetailDto {
     private BigDecimal accessoriesAmount;
 
     private BigDecimal courseAmount;
+    
+    private BigDecimal cloudTeacherAmount;
+    
+    private BigDecimal maintenanceAmount;
 
     private BigDecimal orderAmount;
 
@@ -113,7 +117,23 @@ public class MusicalListDetailDto {
         this.courseAmount = courseAmount;
     }
 
-    public BigDecimal getOrderAmount() {
+    public BigDecimal getCloudTeacherAmount() {
+		return cloudTeacherAmount;
+	}
+
+	public void setCloudTeacherAmount(BigDecimal cloudTeacherAmount) {
+		this.cloudTeacherAmount = cloudTeacherAmount;
+	}
+
+	public BigDecimal getMaintenanceAmount() {
+		return maintenanceAmount;
+	}
+
+	public void setMaintenanceAmount(BigDecimal maintenanceAmount) {
+		this.maintenanceAmount = maintenanceAmount;
+	}
+
+	public BigDecimal getOrderAmount() {
         return orderAmount;
     }
 

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

@@ -317,6 +317,10 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
 
 			List<Long> paymentOrderIdList = studentPaymentOrderList.stream().map(t -> t.getId()).collect(Collectors.toList());
 			
+			if(paymentOrderIdList == null || paymentOrderIdList.size() == 0){
+				continue;
+			}
+			
 			Long minPaymentOrderId = Collections.min(paymentOrderIdList);
 
 			List<StudentPaymentOrderDetail> orderDetailList = studentPaymentOrderDetailDao.getWithIds(paymentOrderIdList);
@@ -366,8 +370,11 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         		if(subjectChange.getChangeAccessoriesGoods() != null){
         			dto.setAccessoriesName(subjectChange.getChangeAccessoriesGoods().stream().map(Goods::getName).collect(Collectors.joining(",")));
         		}
-        		
+
         		dto.setCourseAmount(userOrderTypeMap.get(OrderDetailTypeEnum.COURSE));
+        		dto.setMaintenanceAmount(userOrderTypeMap.get(OrderDetailTypeEnum.MAINTENANCE));
+				dto.setCloudTeacherAmount(userOrderTypeMap.get(OrderDetailTypeEnum.CLOUD_TEACHER) == null ? userOrderTypeMap
+						.get(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS) : userOrderTypeMap.get(OrderDetailTypeEnum.CLOUD_TEACHER));
         		//dto.setGoodsNames(goodsNames);
         		dto.setKitGroupPurchaseTypeEnum(subjectChange.getKitGroupPurchaseType());
         		dto.setMusicalAmount(subjectChange.getChangeMusicalPrice());
@@ -389,6 +396,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         		dto.setAccessoriesAmount(userOrderTypeMap.get(OrderDetailTypeEnum.ACCESSORIES));
     			dto.setCourseAmount(userOrderTypeMap.get(OrderDetailTypeEnum.COURSE));
         		dto.setMusicalAmount(userOrderTypeMap.get(OrderDetailTypeEnum.MUSICAL));
+        		dto.setMaintenanceAmount(userOrderTypeMap.get(OrderDetailTypeEnum.MAINTENANCE));
+				dto.setCloudTeacherAmount(userOrderTypeMap.get(OrderDetailTypeEnum.CLOUD_TEACHER) == null ? userOrderTypeMap
+						.get(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS) : userOrderTypeMap.get(OrderDetailTypeEnum.CLOUD_TEACHER));
     		
         		//dto.setGoodsNames(goodsNames);
         		dto.setKitGroupPurchaseTypeEnum(kitGroupPurchaseType);

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

@@ -511,8 +511,8 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
             subjectChange.setOriginalAccessories(accessoriesId);
             List<Goods> accessoriesGoods = goodsDao.findGoodsByIds(accessoriesId);
             subjectChange.setOriginalAccessoriesGoods(accessoriesGoods);
-            BigDecimal price = accessoriesGoods.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
-            subjectChange.setOriginalAccessoriesPrice(price);
+            //BigDecimal price = accessoriesGoods.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+            subjectChange.setOriginalAccessoriesPrice(accessoriesPrice);
         }
         //2.2 计算销售成本
         BigDecimal orderSellCost = BigDecimal.ZERO;

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

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