update

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

@@ -2196,6 +2196,9 @@ public class ExportServiceImpl implements ExportService {
                     } else if (row.getGroupType().equals(OrderTypeEnum.REPAIR)) {
                         row.setRepairFee(feeByType.getActualAmount().subtract(feeByType.getMusicalFee()).subtract(feeByType.getTeachingFee()).subtract(feeByType.getOtherFee()));
                     } else if (row.getGroupType() == GroupType.OUTORDER) {
+                        if(row.getType() == RENEW){
+                            row.setMusicGroupCourseFee(row.getActualAmount());
+                        }
                         if (row.getType() != RENEW && row.getType() != APPLY) {
                             //销售收入
                             BigDecimal add = feeByType.getMusicalFee().add(row.getTeachingFee()).add(row.getMaintenanceProductFee()).add(feeByType.getOtherFee());
@@ -3162,7 +3165,7 @@ public class ExportServiceImpl implements ExportService {
         groupTypeConsumerMap.put(GroupType.MUSIC, (orderDto) -> orderDto.setMusicGroupCourseFee(orderDto.getMusicGroupCourseFee().add(orderDto.getActualAmount())));
         groupTypeConsumerMap.put(GroupType.PRACTICE, (orderDto) -> orderDto.setPracticeCourseFee(orderDto.getPracticeCourseFee().add(orderDto.getActualAmount())));
         groupTypeConsumerMap.put(GroupType.REPAIR, (orderDto) -> orderDto.setRepairFee(orderDto.getRepairFee().add(orderDto.getActualAmount())));
-        groupTypeConsumerMap.put(GroupType.OUTORDER, (orderDto) -> orderDto.setOtherFee(orderDto.getOtherFee().add(orderDto.getActualAmount())));
+        groupTypeConsumerMap.put(GroupType.OUTORDER, this::accept);
         groupTypeConsumerMap.put(GroupType.SPORADIC, this::accept);
         if (StringUtils.isEmpty(goodsSellReceiptMerNo)) {
             goodsSellReceiptMerNo = sysConfigDao.findConfigValue("goodsSellReceiptMerNo");
@@ -3379,6 +3382,8 @@ public class ExportServiceImpl implements ExportService {
     private void accept(StudentPaymentOrderExportDto orderDto) {
         if (orderDto.getType() == OrderTypeEnum.DEGREE_REGISTRATION) {
             orderDto.setDegreeFee(orderDto.getDegreeFee().add(orderDto.getActualAmount()));
+        } else if(orderDto.getType() == RENEW){
+            orderDto.setMusicGroupCourseFee(orderDto.getActualAmount());
         } else {
             Consumer<StudentPaymentOrderExportDto> dtoConsumer = chargeTypeConsumerMap.get(orderDto.getChargeType());
             if (dtoConsumer != null) {