Merge branch 'online1'

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

@@ -16,6 +16,8 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
 
     private BigDecimal courseFee;
 
+    private BigDecimal highOnlineCourseFee;
+
     //乐器费用
     private BigDecimal musicalFee;
 
@@ -183,4 +185,12 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     public void setRouteBalance(BigDecimal routeBalance) {
         this.routeBalance = routeBalance;
     }
+
+    public BigDecimal getHighOnlineCourseFee() {
+        return highOnlineCourseFee;
+    }
+
+    public void setHighOnlineCourseFee(BigDecimal highOnlineCourseFee) {
+        this.highOnlineCourseFee = highOnlineCourseFee;
+    }
 }

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

@@ -851,6 +851,7 @@ public class ExportController extends BaseController {
             BigDecimal teachingFee = BigDecimal.ZERO;
             BigDecimal courseFee = BigDecimal.ZERO;
             BigDecimal leaseFee = BigDecimal.ZERO;
+            BigDecimal highOnlineCourseFee = BigDecimal.ZERO;
             String goodsName = "";
             if (row.getOrderDetailList() != null) {
                 for (StudentPaymentOrderDetail orderDetail : row.getOrderDetailList()) {
@@ -864,6 +865,8 @@ public class ExportController extends BaseController {
                         courseFee = courseFee.add(orderDetail.getPrice());
                     } else if (orderDetail.getType().equals(OrderDetailTypeEnum.ACCESSORIES) || orderDetail.getType().equals(OrderDetailTypeEnum.TEACHING) || orderDetail.getType().equals(OrderDetailTypeEnum.OTHER)) {
                         teachingFee = teachingFee.add(orderDetail.getPrice());
+                    }else if (orderDetail.getType().equals(OrderDetailTypeEnum.HIGH_ONLINE_COURSE)) {
+                        highOnlineCourseFee = highOnlineCourseFee.add(orderDetail.getPrice());
                     }
                 }
             }
@@ -875,6 +878,7 @@ public class ExportController extends BaseController {
             row.setTeachingFee(teachingFee);
             row.setLeaseFee(leaseFee);
             row.setMemo(goodsName);
+            row.setHighOnlineCourseFee(highOnlineCourseFee);
             //专业
             if (row.getGroupType().equals(GroupType.MUSIC)) {
                 StudentRegistration studentRegistration = studentRegistrationDao.findStudentByMusicGroupIdAndUserId(row.getMusicGroupId(), row.getUserId());
@@ -950,9 +954,9 @@ public class ExportController extends BaseController {
 
         try {
             String[] header = {"序号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "应付金额", "现金支付", "余额支付", "到账时间",
-                    "关联乐团ID/VIP课ID", "课程形态", "课程费用", "乐器减免费用","课程减免费用", "押金", "乐器", "教辅费用", "零星收款费用", "零星收款类别", "手续费", "专业", "分部", "单位/学校", "合作机构", "备注"};
+                    "关联乐团ID/VIP课ID", "课程形态", "课程费用","新生专享课程费用", "乐器减免费用","课程减免费用", "押金", "乐器", "教辅费用", "零星收款费用", "零星收款类别", "手续费", "专业", "分部", "单位/学校", "合作机构", "备注"};
             String[] body = {"id", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "expectAmount", "actualAmount", "balancePaymentAmount", "payTime", "musicGroupId",
-                    "groupType.desc", "courseFee", "remitFee","courseRemitFee", "leaseFee", "musicalFee", "teachingFee", "sporadicAmount", "sporadicType", "transferFee", "subjectName", "organName", "schoolName", "cooperationOrganName", "memo"};
+                    "groupType.desc", "courseFee","highOnlineCourseFee", "remitFee","courseRemitFee", "leaseFee", "musicalFee", "teachingFee", "sporadicAmount", "sporadicType", "transferFee", "subjectName", "organName", "schoolName", "cooperationOrganName", "memo"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");