Merge branch 'zouxuan_saas_order_export' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1942,6 +1942,9 @@ public class ExportServiceImpl implements ExportService {
                         //如果是淘器微信那么就是零售
                         if(Objects.equals("淘器微信",row.getMerNos()) && add.compareTo(BigDecimal.ZERO) > 0){
                             //如果有服务收入那么是课程学校采买
+                            row.setMusicalFee(BigDecimal.ZERO);
+                            row.setTeachingFee(BigDecimal.ZERO);
+                            row.setMaintenanceProductFee(BigDecimal.ZERO);
                             row.setOtherFee(subtract);
                             row.setRetailGoodsFee(add);
                             row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS);
@@ -2247,6 +2250,9 @@ public class ExportServiceImpl implements ExportService {
                         //如果是淘器微信那么就是零售
                         if(Objects.equals("淘器微信",row.getMerNos()) && add.compareTo(BigDecimal.ZERO) > 0){
                             //如果有服务收入那么是课程学校采买
+                            row.setMusicalFee(BigDecimal.ZERO);
+                            row.setTeachingFee(BigDecimal.ZERO);
+                            row.setMaintenanceProductFee(BigDecimal.ZERO);
                             row.setOtherFee(subtract);
                             row.setRetailGoodsFee(add);
                             row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS);