|
|
@@ -2166,10 +2166,10 @@ public class ExportController extends BaseController {
|
|
|
transferFee = row.getRouteAmount().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
row.setTransferFee(transferFee);
|
|
|
- BigDecimal musicalFee = BigDecimal.ZERO;
|
|
|
- BigDecimal teachingFee = BigDecimal.ZERO;
|
|
|
- BigDecimal courseFee = BigDecimal.ZERO;
|
|
|
- BigDecimal leaseFee = BigDecimal.ZERO;
|
|
|
+ BigDecimal musicalFee = BigDecimal.ZERO; //乐器费用
|
|
|
+ BigDecimal teachingFee = BigDecimal.ZERO; //教辅费用
|
|
|
+ BigDecimal courseFee = BigDecimal.ZERO; //课程费用
|
|
|
+ BigDecimal leaseFee = BigDecimal.ZERO; //押金费用
|
|
|
String goodsName = "";
|
|
|
if (row.getOrderDetailList() != null) {
|
|
|
for (StudentPaymentOrderDetail orderDetail : row.getOrderDetailList()) {
|
|
|
@@ -2264,7 +2264,7 @@ 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", "routeMerNo", "routeAmount", "routeBalance", "payTime", "musicGroupId",
|
|
|
"groupType.desc", "courseFee", "remitFee", "leaseFee", "musicalFee", "teachingFee","repairFee", "sporadicAmount", "sporadicType", "transferFee", "subjectName", "organName", "schoolName", "cooperationOrganName", "memo"};
|
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
|
周箭河