商城订单导出

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

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.common.enums.BaseEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.List;
 
-public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
+public class StudentPaymentOrderExportDto extends StudentPaymentOrderRouteDto {
     @ApiModelProperty(value = "分部",required = true)
     private String organName;
 
@@ -39,14 +38,6 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     @ApiModelProperty(value = "维修费用",required = true)
     private BigDecimal repairFee = BigDecimal.ZERO;
 
-    //汇付手续费
-    @ApiModelProperty(value = "汇付手续费",required = true)
-    private BigDecimal transferFee = BigDecimal.ZERO;
-    
-    //平台手续费
-    @ApiModelProperty(value = "平台手续费",required = true)
-    private BigDecimal platformFee = BigDecimal.ZERO;
-
     //乐团家长采买课程费用
     @ApiModelProperty(value = "乐团课程费用",required = true)
     private BigDecimal musicGroupCourseFee = BigDecimal.ZERO;
@@ -124,29 +115,6 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     @ApiModelProperty(value = "商品列表",required = true)
     private List<Goods> goodsList;
 
-    //收款账户
-    @ApiModelProperty(value = "收款账户",required = true)
-    private String routeMerNo;
-
-    //分润金额
-    @ApiModelProperty(value = "分润金额",required = true)
-    private BigDecimal routeAmount;
-
-    //分润余额
-    @ApiModelProperty(value = "分润余额",required = true)
-    private BigDecimal routeBalance;
-
-    //分润中的销售费用
-    @ApiModelProperty(value = "分润中的销售费用",required = true)
-    private BigDecimal saleAmount = BigDecimal.ZERO;
-
-    //分润中的服务费用
-    @ApiModelProperty(value = "分润中的服务费用",required = true)
-    private BigDecimal serviceAmount = BigDecimal.ZERO;
-
-    @ApiModelProperty(value = "服务费",required = true)
-    private BigDecimal serviceFee = BigDecimal.ZERO;
-
     @ApiModelProperty(value = "分部",required = true)
     private String feeFlag;
 
@@ -228,76 +196,20 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     @ApiModelProperty(value = "教学点",required = true)
     private String schoolName;
 
-    public String getUserOrganName() {
-        return userOrganName;
-    }
-
-    public void setUserOrganName(String userOrganName) {
-        this.userOrganName = userOrganName;
-    }
-
-    public BigDecimal getCourseSchoolBuyAmount() {
-        return courseSchoolBuyAmount;
-    }
-
-    public void setCourseSchoolBuyAmount(BigDecimal courseSchoolBuyAmount) {
-        this.courseSchoolBuyAmount = courseSchoolBuyAmount;
-    }
-
-    public BigDecimal getRetailGoodsFee() {
-        return retailGoodsFee;
-    }
-
-    public void setRetailGoodsFee(BigDecimal retailGoodsFee) {
-        this.retailGoodsFee = retailGoodsFee;
-    }
-
-    public BigDecimal getLargeMusicalFee() {
-        return largeMusicalFee;
-    }
-
-    public void setLargeMusicalFee(BigDecimal largeMusicalFee) {
-        this.largeMusicalFee = largeMusicalFee;
-    }
-
-    public String getSchoolName() {
-        return schoolName;
-    }
-
-    public void setSchoolName(String schoolName) {
-        this.schoolName = schoolName;
-    }
-
-    public String getFeeMusicGroupName() {
-        return feeMusicGroupName;
-    }
-
-    public void setFeeMusicGroupName(String feeMusicGroupName) {
-        this.feeMusicGroupName = feeMusicGroupName;
-    }
-
-    public String getFeeMusicGroupId() {
-        return feeMusicGroupId;
-    }
-
-    public void setFeeMusicGroupId(String feeMusicGroupId) {
-        this.feeMusicGroupId = feeMusicGroupId;
-    }
-
-    public String getTypeDesc() {
-        return typeDesc;
+    public String getOrganName() {
+        return organName;
     }
 
-    public void setTypeDesc(String typeDesc) {
-        this.typeDesc = typeDesc;
+    public void setOrganName(String organName) {
+        this.organName = organName;
     }
 
-    public BigDecimal getOrderAmount() {
-        return orderAmount;
+    public String getUserOrganName() {
+        return userOrganName;
     }
 
-    public void setOrderAmount(BigDecimal orderAmount) {
-        this.orderAmount = orderAmount;
+    public void setUserOrganName(String userOrganName) {
+        this.userOrganName = userOrganName;
     }
 
     public BigDecimal getSporadicAmount() {
@@ -308,54 +220,6 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.sporadicAmount = sporadicAmount;
     }
 
-    public BigDecimal getMusicalFee() {
-        return musicalFee;
-    }
-
-    public void setMusicalFee(BigDecimal musicalFee) {
-        this.musicalFee = musicalFee;
-    }
-
-    public BigDecimal getTeachingFee() {
-        return teachingFee;
-    }
-
-    public void setTeachingFee(BigDecimal teachingFee) {
-        this.teachingFee = teachingFee;
-    }
-
-    public BigDecimal getTransferFee() {
-        return transferFee;
-    }
-
-    public void setTransferFee(BigDecimal transferFee) {
-        this.transferFee = transferFee;
-    }
-
-    public BigDecimal getPlatformFee() {
-		return platformFee;
-	}
-
-	public void setPlatformFee(BigDecimal platformFee) {
-		this.platformFee = platformFee;
-	}
-
-	public String getOrganName() {
-        return organName;
-    }
-
-    public void setOrganName(String organName) {
-        this.organName = organName;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
     public String getSporadicType() {
         return sporadicType;
     }
@@ -364,68 +228,28 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.sporadicType = sporadicType;
     }
 
-    public BigDecimal getLeaseFee() {
-        return leaseFee;
-    }
-
-    public void setLeaseFee(BigDecimal leaseFee) {
-        this.leaseFee = leaseFee;
-    }
-
-    public List<StudentPaymentOrderDetail> getOrderDetailList() {
-        return orderDetailList;
-    }
-
-    public void setOrderDetailList(List<StudentPaymentOrderDetail> orderDetailList) {
-        this.orderDetailList = orderDetailList;
-    }
-
-    public Integer getChargeType() {
-        return chargeType;
-    }
-
-    public void setChargeType(Integer chargeType) {
-        this.chargeType = chargeType;
-    }
-
-    public List<Goods> getGoodsList() {
-        return goodsList;
-    }
-
-    public void setGoodsList(List<Goods> goodsList) {
-        this.goodsList = goodsList;
-    }
-
-    public String getCooperationOrganName() {
-        return cooperationOrganName;
-    }
-
-    public void setCooperationOrganName(String cooperationOrganName) {
-        this.cooperationOrganName = cooperationOrganName;
-    }
-
-    public String getRouteMerNo() {
-        return routeMerNo;
+    public BigDecimal getMusicalFee() {
+        return musicalFee;
     }
 
-    public void setRouteMerNo(String routeMerNo) {
-        this.routeMerNo = routeMerNo;
+    public void setMusicalFee(BigDecimal musicalFee) {
+        this.musicalFee = musicalFee;
     }
 
-    public BigDecimal getRouteAmount() {
-        return routeAmount;
+    public BigDecimal getLeaseFee() {
+        return leaseFee;
     }
 
-    public void setRouteAmount(BigDecimal routeAmount) {
-        this.routeAmount = routeAmount;
+    public void setLeaseFee(BigDecimal leaseFee) {
+        this.leaseFee = leaseFee;
     }
 
-    public BigDecimal getRouteBalance() {
-        return routeBalance;
+    public BigDecimal getTeachingFee() {
+        return teachingFee;
     }
 
-    public void setRouteBalance(BigDecimal routeBalance) {
-        this.routeBalance = routeBalance;
+    public void setTeachingFee(BigDecimal teachingFee) {
+        this.teachingFee = teachingFee;
     }
 
     public BigDecimal getRepairFee() {
@@ -444,6 +268,14 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.musicGroupCourseFee = musicGroupCourseFee;
     }
 
+    public BigDecimal getCourseSchoolBuyAmount() {
+        return courseSchoolBuyAmount;
+    }
+
+    public void setCourseSchoolBuyAmount(BigDecimal courseSchoolBuyAmount) {
+        this.courseSchoolBuyAmount = courseSchoolBuyAmount;
+    }
+
     public BigDecimal getHighCourseFee() {
         return highCourseFee;
     }
@@ -492,44 +324,28 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.otherFee = otherFee;
     }
 
-    public String getFeeFlag() {
-        return feeFlag;
-    }
-
-    public void setFeeFlag(String feeFlag) {
-        this.feeFlag = feeFlag;
-    }
-
-    public BigDecimal getSaleAmount() {
-        return saleAmount;
+    public BigDecimal getMaintenanceFee() {
+        return maintenanceFee;
     }
 
-    public void setSaleAmount(BigDecimal saleAmount) {
-        this.saleAmount = saleAmount;
+    public void setMaintenanceFee(BigDecimal maintenanceFee) {
+        this.maintenanceFee = maintenanceFee;
     }
 
-    public BigDecimal getServiceAmount() {
-        return serviceAmount;
+    public BigDecimal getRetailGoodsFee() {
+        return retailGoodsFee;
     }
 
-    public void setServiceAmount(BigDecimal serviceAmount) {
-        this.serviceAmount = serviceAmount;
+    public void setRetailGoodsFee(BigDecimal retailGoodsFee) {
+        this.retailGoodsFee = retailGoodsFee;
     }
 
-    public BigDecimal getServiceFee() {
-		return serviceFee;
-	}
-
-	public void setServiceFee(BigDecimal serviceFee) {
-		this.serviceFee = serviceFee;
-	}
-
-	public BigDecimal getMaintenanceFee() {
-        return maintenanceFee;
+    public BigDecimal getLargeMusicalFee() {
+        return largeMusicalFee;
     }
 
-    public void setMaintenanceFee(BigDecimal maintenanceFee) {
-        this.maintenanceFee = maintenanceFee;
+    public void setLargeMusicalFee(BigDecimal largeMusicalFee) {
+        this.largeMusicalFee = largeMusicalFee;
     }
 
     public BigDecimal getMaintenanceProductFee() {
@@ -540,14 +356,6 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.maintenanceProductFee = maintenanceProductFee;
     }
 
-    public String getEduTeacher() {
-        return eduTeacher;
-    }
-
-    public void setEduTeacher(String eduTeacher) {
-        this.eduTeacher = eduTeacher;
-    }
-
     public BigDecimal getCloudTeacherFee() {
         return cloudTeacherFee;
     }
@@ -572,6 +380,62 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.rechargeFee = rechargeFee;
     }
 
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getCooperationOrganName() {
+        return cooperationOrganName;
+    }
+
+    public void setCooperationOrganName(String cooperationOrganName) {
+        this.cooperationOrganName = cooperationOrganName;
+    }
+
+    public String getEduTeacher() {
+        return eduTeacher;
+    }
+
+    public void setEduTeacher(String eduTeacher) {
+        this.eduTeacher = eduTeacher;
+    }
+
+    public Integer getChargeType() {
+        return chargeType;
+    }
+
+    public void setChargeType(Integer chargeType) {
+        this.chargeType = chargeType;
+    }
+
+    public List<StudentPaymentOrderDetail> getOrderDetailList() {
+        return orderDetailList;
+    }
+
+    public void setOrderDetailList(List<StudentPaymentOrderDetail> orderDetailList) {
+        this.orderDetailList = orderDetailList;
+    }
+
+    public List<Goods> getGoodsList() {
+        return goodsList;
+    }
+
+    public void setGoodsList(List<Goods> goodsList) {
+        this.goodsList = goodsList;
+    }
+
+    public String getFeeFlag() {
+        return feeFlag;
+    }
+
+    public void setFeeFlag(String feeFlag) {
+        this.feeFlag = feeFlag;
+    }
+
     public Integer getPayingStatus() {
         return payingStatus;
     }
@@ -580,11 +444,51 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.payingStatus = payingStatus;
     }
 
-	public BigDecimal getTranslatedIncome() {
-		return translatedIncome;
-	}
+    public BigDecimal getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(BigDecimal orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    public BigDecimal getTranslatedIncome() {
+        return translatedIncome;
+    }
+
+    public void setTranslatedIncome(BigDecimal translatedIncome) {
+        this.translatedIncome = translatedIncome;
+    }
+
+    public String getTypeDesc() {
+        return typeDesc;
+    }
+
+    public void setTypeDesc(String typeDesc) {
+        this.typeDesc = typeDesc;
+    }
+
+    public String getFeeMusicGroupId() {
+        return feeMusicGroupId;
+    }
 
-	public void setTranslatedIncome(BigDecimal translatedIncome) {
-		this.translatedIncome = translatedIncome;
-	}
+    public void setFeeMusicGroupId(String feeMusicGroupId) {
+        this.feeMusicGroupId = feeMusicGroupId;
+    }
+
+    public String getFeeMusicGroupName() {
+        return feeMusicGroupName;
+    }
+
+    public void setFeeMusicGroupName(String feeMusicGroupName) {
+        this.feeMusicGroupName = feeMusicGroupName;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
 }

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

@@ -1,48 +1,16 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 
-public class StudentPaymentOrderMallExportDto extends StudentPaymentOrder {
+public class StudentPaymentOrderMallExportDto extends StudentPaymentOrderRouteDto {
     @ApiModelProperty(value = "分部",required = true)
     private String organName;
 
     @ApiModelProperty(value = "业务分部",required = true)
     private String userOrganName;
 
-    //汇付手续费
-    @ApiModelProperty(value = "汇付手续费",required = true)
-    private BigDecimal transferFee = BigDecimal.ZERO;
-
-    //平台手续费
-    @ApiModelProperty(value = "平台手续费",required = true)
-    private BigDecimal platformFee = BigDecimal.ZERO;
-
-    //收款账户
-    @ApiModelProperty(value = "收款账户",required = true)
-    private String routeMerNo;
-
-    //分润金额
-    @ApiModelProperty(value = "分润金额",required = true)
-    private BigDecimal routeAmount;
-
-    //分润余额
-    @ApiModelProperty(value = "分润余额",required = true)
-    private BigDecimal routeBalance;
-
-    //分润中的销售费用
-    @ApiModelProperty(value = "分润中的销售费用",required = true)
-    private BigDecimal saleAmount = BigDecimal.ZERO;
-
-    //分润中的服务费用
-    @ApiModelProperty(value = "分润中的服务费用",required = true)
-    private BigDecimal serviceAmount = BigDecimal.ZERO;
-
-    @ApiModelProperty(value = "服务费",required = true)
-    private BigDecimal serviceFee = BigDecimal.ZERO;
-
     @ApiModelProperty(value = "支付状态",required = true)
     private Integer payingStatus;
 
@@ -55,22 +23,6 @@ public class StudentPaymentOrderMallExportDto extends StudentPaymentOrder {
     @ApiModelProperty(value = "购买商品列表",required = true)
     private String goodsJson;
 
-    public String getGoodsJson() {
-        return goodsJson;
-    }
-
-    public void setGoodsJson(String goodsJson) {
-        this.goodsJson = goodsJson;
-    }
-
-    public String getGoodsNames() {
-        return goodsNames;
-    }
-
-    public void setGoodsNames(String goodsNames) {
-        this.goodsNames = goodsNames;
-    }
-
     public String getOrganName() {
         return organName;
     }
@@ -87,70 +39,6 @@ public class StudentPaymentOrderMallExportDto extends StudentPaymentOrder {
         this.userOrganName = userOrganName;
     }
 
-    public BigDecimal getTransferFee() {
-        return transferFee;
-    }
-
-    public void setTransferFee(BigDecimal transferFee) {
-        this.transferFee = transferFee;
-    }
-
-    public BigDecimal getPlatformFee() {
-        return platformFee;
-    }
-
-    public void setPlatformFee(BigDecimal platformFee) {
-        this.platformFee = platformFee;
-    }
-
-    public String getRouteMerNo() {
-        return routeMerNo;
-    }
-
-    public void setRouteMerNo(String routeMerNo) {
-        this.routeMerNo = routeMerNo;
-    }
-
-    public BigDecimal getRouteAmount() {
-        return routeAmount;
-    }
-
-    public void setRouteAmount(BigDecimal routeAmount) {
-        this.routeAmount = routeAmount;
-    }
-
-    public BigDecimal getRouteBalance() {
-        return routeBalance;
-    }
-
-    public void setRouteBalance(BigDecimal routeBalance) {
-        this.routeBalance = routeBalance;
-    }
-
-    public BigDecimal getSaleAmount() {
-        return saleAmount;
-    }
-
-    public void setSaleAmount(BigDecimal saleAmount) {
-        this.saleAmount = saleAmount;
-    }
-
-    public BigDecimal getServiceAmount() {
-        return serviceAmount;
-    }
-
-    public void setServiceAmount(BigDecimal serviceAmount) {
-        this.serviceAmount = serviceAmount;
-    }
-
-    public BigDecimal getServiceFee() {
-        return serviceFee;
-    }
-
-    public void setServiceFee(BigDecimal serviceFee) {
-        this.serviceFee = serviceFee;
-    }
-
     public Integer getPayingStatus() {
         return payingStatus;
     }
@@ -166,4 +54,20 @@ public class StudentPaymentOrderMallExportDto extends StudentPaymentOrder {
     public void setOrderAmount(BigDecimal orderAmount) {
         this.orderAmount = orderAmount;
     }
+
+    public String getGoodsNames() {
+        return goodsNames;
+    }
+
+    public void setGoodsNames(String goodsNames) {
+        this.goodsNames = goodsNames;
+    }
+
+    public String getGoodsJson() {
+        return goodsJson;
+    }
+
+    public void setGoodsJson(String goodsJson) {
+        this.goodsJson = goodsJson;
+    }
 }

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

@@ -0,0 +1,103 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class StudentPaymentOrderRouteDto extends StudentPaymentOrder {
+    //汇付手续费
+    @ApiModelProperty(value = "汇付手续费",required = true)
+    private BigDecimal transferFee = BigDecimal.ZERO;
+
+    //平台手续费
+    @ApiModelProperty(value = "平台手续费",required = true)
+    private BigDecimal platformFee = BigDecimal.ZERO;
+
+    //收款账户
+    @ApiModelProperty(value = "收款账户",required = true)
+    private String routeMerNo;
+
+    //分润金额
+    @ApiModelProperty(value = "分润金额",required = true)
+    private BigDecimal routeAmount;
+
+    //分润余额
+    @ApiModelProperty(value = "分润余额",required = true)
+    private BigDecimal routeBalance;
+
+    //分润中的销售费用
+    @ApiModelProperty(value = "分润中的销售费用",required = true)
+    private BigDecimal saleAmount = BigDecimal.ZERO;
+
+    //分润中的服务费用
+    @ApiModelProperty(value = "分润中的服务费用",required = true)
+    private BigDecimal serviceAmount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "服务费",required = true)
+    private BigDecimal serviceFee = BigDecimal.ZERO;
+
+    public BigDecimal getTransferFee() {
+        return transferFee;
+    }
+
+    public void setTransferFee(BigDecimal transferFee) {
+        this.transferFee = transferFee;
+    }
+
+    public BigDecimal getPlatformFee() {
+        return platformFee;
+    }
+
+    public void setPlatformFee(BigDecimal platformFee) {
+        this.platformFee = platformFee;
+    }
+
+    public String getRouteMerNo() {
+        return routeMerNo;
+    }
+
+    public void setRouteMerNo(String routeMerNo) {
+        this.routeMerNo = routeMerNo;
+    }
+
+    public BigDecimal getRouteAmount() {
+        return routeAmount;
+    }
+
+    public void setRouteAmount(BigDecimal routeAmount) {
+        this.routeAmount = routeAmount;
+    }
+
+    public BigDecimal getRouteBalance() {
+        return routeBalance;
+    }
+
+    public void setRouteBalance(BigDecimal routeBalance) {
+        this.routeBalance = routeBalance;
+    }
+
+    public BigDecimal getSaleAmount() {
+        return saleAmount;
+    }
+
+    public void setSaleAmount(BigDecimal saleAmount) {
+        this.saleAmount = saleAmount;
+    }
+
+    public BigDecimal getServiceAmount() {
+        return serviceAmount;
+    }
+
+    public void setServiceAmount(BigDecimal serviceAmount) {
+        this.serviceAmount = serviceAmount;
+    }
+
+    public BigDecimal getServiceFee() {
+        return serviceFee;
+    }
+
+    public void setServiceFee(BigDecimal serviceFee) {
+        this.serviceFee = serviceFee;
+    }
+}

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

@@ -354,7 +354,7 @@ public class ExportServiceImpl implements ExportService {
         //导出到报表中心
 //        exportManageFuncMap.put(ExportEnum.SUPER_FIND_COURSE_SCHEDULES, (info,headColumns) -> this.superFindCourseSchedules(info,headColumns));
         //针对不同的用户有不同的模板
-        exportManageFuncMap.put(ExportEnum.MALL_ROUTE_ORDER_LIST, (info) -> routeOrderList(info));
+        exportManageFuncMap.put(ExportEnum.MALL_ROUTE_ORDER_LIST, (info) -> routeMallOrderList(info));
         exportManageFuncMap.put(ExportEnum.ROUTE_ORDER_LIST1, (info) -> routeOrderList(info));
         exportManageFuncMap.put(ExportEnum.ROUTE_ORDER_LIST2, (info) -> routeOrderList(info));
         exportManageFuncMap.put(ExportEnum.MALL_ORDER_LIST, (info) -> mallOrderList(info));
@@ -1466,7 +1466,7 @@ public class ExportServiceImpl implements ExportService {
             return BaseController.failed("数据集太大，不能导出.最大数据集不能超过50000");
         }
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.MALL_ROUTE_ORDER, sysUser.getId());
-        return this.asyncExport(() -> this.routeOrderList(params, managerDownload),
+        return this.asyncExport(() -> this.mallRouteOrderList(params, managerDownload),
                 managerDownload.getName());
     }
 
@@ -2431,8 +2431,6 @@ public class ExportServiceImpl implements ExportService {
         if (CollectionUtils.isEmpty(studentPaymentOrderExportDtos)) {
             return;
         }
-        Set<Long> paymentOrderIds = studentPaymentOrderExportDtos.stream().map(e -> e.getId()).collect(Collectors.toSet());
-
         //计算手续费
         Map<String, BigDecimal> serviceChargeMap = new HashMap<>();
         Map<String, Integer> orderCountMap = new HashMap<>();
@@ -2457,28 +2455,8 @@ public class ExportServiceImpl implements ExportService {
         for (StudentPaymentOrderMallExportDto basicOrder : studentPaymentOrderExportDtos) {
             basicOrder.getUser().setUsername(studentNameMap.get(basicOrder.getUserId()));
             basicOrder.setUserOrganName(userOrganNameMap.get(basicOrder.getOrganId()));
-            //填充业务数据
             //计算手续费
             this.calcPlatformFee(basicOrder, serviceChargeMap, orderCountMap, tenantConfig, feeFlagMap);
-            //获取乐团信息
-            this.initMusicGroupInfo(basicOrder, musicGroupNameMap, firstMusicMap, userLastMusicIdMap, userLastMusicNameMap, calenderCooperationMap);
-            //填充备注信息
-            if (basicOrder.getGoodsList() != null) {
-                String goodsName = basicOrder.getGoodsList().stream().map(Goods::getName).collect(Collectors.joining("|"));
-                basicOrder.setMemo(goodsName);
-            }
-            if (basicOrder.getType() == OUTORDER && StringUtils.isNotEmpty(basicOrder.getMusicGroupId())) {
-                if (cooperationOrganMap.containsKey(Integer.valueOf(basicOrder.getMusicGroupId()))) {
-                    basicOrder.setCooperationOrganName(cooperationOrganMap.get(Integer.valueOf(basicOrder.getMusicGroupId())));
-                    CooperationOrgan cooperationOrganEduTeacher = musicGroupDao.findCooperationOrganEduTeacher(Integer.valueOf(basicOrder.getMusicGroupId()));
-                    if (cooperationOrganEduTeacher != null) {
-                        basicOrder.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
-                    }
-                }
-            }
-            //根据订单类型初始化业务数据
-            Optional.ofNullable(groupTypeConsumerMap1.get(basicOrder.getGroupType())).ifPresent(consumer -> consumer.accept(basicOrder));
-            this.setSubTypeDesc(basicOrder, userFirstVipMap, userFirstPracticeMap);
 
             String paymentChannel = "";
             if (basicOrder.getPaymentChannel() == null) {
@@ -2490,40 +2468,9 @@ public class ExportServiceImpl implements ExportService {
                 paymentChannel = "余额";
             }
             basicOrder.setPaymentChannel(paymentChannel);
-            if(StringUtils.isNotEmpty(basicOrder.getSporadicType()) && !basicOrder.getSporadicType().equals("其他")){
-                basicOrder.setTypeDesc(basicOrder.getSporadicType());
-            }
             if (basicOrder.getRouteAmount().compareTo(BigDecimal.ZERO) == 0) {
                 continue;
             }
-            //如果是零星收费的账户充值，不管销售还是服务，统一放在其他收费项目中
-            if (basicOrder.getType() == OrderTypeEnum.SPORADIC
-                    && basicOrder.getGroupType() == GroupType.SPORADIC
-                    && basicOrder.getServiceAmount().compareTo(BigDecimal.ZERO) == 0
-                    && basicOrder.getSaleAmount().compareTo(BigDecimal.ZERO) == 0) {
-                basicOrder.setOtherFee(basicOrder.getRouteAmount());
-                continue;
-            }
-            //如果有订单详情
-            List<StudentPaymentOrderDetail> detailList = orderDetailMap.get(basicOrder.getId());
-            if (!CollectionUtils.isEmpty(detailList)) {
-                this.calcOrderDetail(basicOrder, detailList, userFirstVipMap);
-                continue;
-            }
-            //如果没有订单详情，则计算商品收入
-            List<SellOrder> sellOrderList = sellOrderMap.get(basicOrder.getId());
-            if (!CollectionUtils.isEmpty(sellOrderList)) {
-                this.calcSellOrder(basicOrder, sellOrderList, goodsMap);
-                continue;
-            }
-            //如果只有订单，那么按分类统计
-            if (basicOrder.getServiceAmount().compareTo(BigDecimal.ZERO) > 0) {
-                //计算服务收入
-                Optional.ofNullable(groupTypeConsumerMap.get(basicOrder.getGroupType())).ifPresent(c -> c.accept(basicOrder));
-            } else if (basicOrder.getSaleAmount().compareTo(BigDecimal.ZERO) > 0) {
-                //计算销售收入
-                this.setSaleFee(basicOrder);
-            }
         }
         HSSFWorkbook workbook = getHSSFWorkbook(studentPaymentOrderExportDtos, ExportEnum.ROUTE_ORDER_LIST1);
         exportManagerDownload(workbook, managerDownload);
@@ -3181,7 +3128,7 @@ public class ExportServiceImpl implements ExportService {
     }
 
     //计算汇付手续费和平台手续费
-    public void calcPlatformFee(StudentPaymentOrderExportDto row, Map<String, BigDecimal> serviceChargeMap,
+    public void calcPlatformFee(StudentPaymentOrderRouteDto row, Map<String, BigDecimal> serviceChargeMap,
                                 Map<String, Integer> orderCountMap, TenantConfig tenantConfig, Map<String, FeeFlagNumDto> feeFlagMap) {
         BigDecimal currentFee = BigDecimal.ZERO;
         if (row.getPaymentChannel() != null && row.getPaymentChannel().equals("ADAPAY")) {

mec-web/src/main/resources/exportColumnMapper.ini

@@ -110,6 +110,10 @@ fieldColumns = ["studentName", "parentsName", "currentGrade", "currentClass", "g
 headColumns = ["用户编号", "用户名", "手机号", "课程类型", "实际薪水", "补助", "结算时间", "教师角色"]
 fieldColumns = ["userId", "username", "phone", "type.msg", "name", "actualSalary", "subsidy", "settlementTime", "teacherRole.msg"]
 
+[商城订单列表导出]
+headColumns = ["序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "优惠金额", "汇付手续费","平台手续费", "到账时间", "分部", "商品列表", "备注"]
+fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount","balancePaymentAmount","couponRemitFee", "transferFee", "platformFee", "payTime", "organName", "goodsNames","memo"]
+
 [订单列表导出1]
 headColumns = ["序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "优惠金额", "课程家长采买","课程学校采买", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费","账户充值", "零售乐器","大件乐器", "其它", "汇付手续费","平台手续费", "到账时间","关联乐团ID/VIP课ID","课程形态","类型","收费乐团编号","收费乐团","零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"]
 fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount","balancePaymentAmount","couponRemitFee","musicGroupCourseFee","courseSchoolBuyAmount", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee","leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee","retailGoodsFee","largeMusicalFee", "otherFee", "transferFee", "platformFee", "payTime", "musicGroupId","groupType.desc","typeDesc","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
@@ -170,6 +174,10 @@ fieldColumns = ["name", "gender == 1?'男':'女'", "idcard", "city", "school", "
 headColumns = ["分部", "单位编号", "单位名称", "是否启用","乐团主管","状态栏"]
 fieldColumns = ["organization.name", "id", "name", "isEnable == true ? '是':'否'", "realName", "isEnable == true ? '开启' : '未开启'"]
 
+[商城财务管理导出]
+headColumns = ["序号", "业务分部",  "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "分润账户", "分润金额", "分配余额", "优惠金额", "汇付手续费", "平台手续费", "到账时间", "分部", "备注"]
+fieldColumns = ["id", "userOrganName", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee", "transferFee", "platformFee", "payTime", "organName", "memo"]
+
 [财务管理导出1]
 headColumns = ["序号", "业务分部",  "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "分润账户", "分润金额", "分配余额", "优惠金额", "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费", "账户充值", "其它", "汇付手续费", "平台手续费", "到账时间", "关联乐团ID/VIP课ID", "课程形态","类型","收费乐团编号","收费乐团", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"]
 fieldColumns = ["id", "userOrganName", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee",     "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee", "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee", "otherFee", "transferFee", "platformFee", "payTime", "musicGroupId", "groupType.desc","typeDesc","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]