财务导出

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

@@ -2408,7 +2408,7 @@ public class ExportServiceImpl implements ExportService {
                 }
             }
         }
-        List<StudentPaymentOrderDetail> details = detailList.stream().filter(e -> e.getIncome().compareTo(BigDecimal.ZERO) == 0).collect(Collectors.toList());
+        List<StudentPaymentOrderDetail> details = detailList.stream().filter(e -> e.getPrice().compareTo(e.getIncome()) > 0).collect(Collectors.toList());
         if(CollectionUtils.isEmpty(details)){
             return;
         }
@@ -2598,22 +2598,17 @@ public class ExportServiceImpl implements ExportService {
 
     public void setServiceFee(StudentPaymentOrderExportDto basicOrder, StudentPaymentOrderDetail orderDetail,
                               Map<Integer, String> userFirstVipMap){
-        //分润订单可能多个，必须是指定账户。如果是内部库存转化部分收入为云教练收入
-        if(orderDetail.getIncome().compareTo(BigDecimal.ZERO) > 0){
-            basicOrder.setCloudTeacherFee(basicOrder.getCloudTeacherFee().add(orderDetail.getIncome()));
-        }else {
-            //如果订单有余额，那么按比例排除掉订单详情中的余额，多的部分放在最后一条记录中
-            //比例 = 订单详情金额/订单总金额
-            //实际支付金额 = 订单详情金额 * 比例 保留两位小数，其余舍掉，如果是最后一笔订单详情，将剩余的金额直接赋值
-            Optional.ofNullable(orderDetailTypeServiceConsumerMap.get(orderDetail.getType())).ifPresent(consumer -> consumer.accept(basicOrder, orderDetail));
-            if (orderDetail.getType() == OrderDetailTypeEnum.VIP && basicOrder.getTypeDesc() == null) {
-                //学员没有历史VIP课程则导出为【VIP课新增】
-                //学员有历史VIP课程到导出为【VIP课续费】
-                if (Objects.equals(userFirstVipMap.get(basicOrder.getUserId()), basicOrder.getMusicGroupId())) {
-                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP);
-                } else {
-                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP);
-                }
+        //如果订单有余额，那么按比例排除掉订单详情中的余额，多的部分放在最后一条记录中
+        //比例 = 订单详情金额/订单总金额
+        //实际支付金额 = 订单详情金额 * 比例 保留两位小数，其余舍掉，如果是最后一笔订单详情，将剩余的金额直接赋值
+        Optional.ofNullable(orderDetailTypeServiceConsumerMap.get(orderDetail.getType())).ifPresent(consumer -> consumer.accept(basicOrder, orderDetail));
+        if (orderDetail.getType() == OrderDetailTypeEnum.VIP && basicOrder.getTypeDesc() == null) {
+            //学员没有历史VIP课程则导出为【VIP课新增】
+            //学员有历史VIP课程到导出为【VIP课续费】
+            if (Objects.equals(userFirstVipMap.get(basicOrder.getUserId()), basicOrder.getMusicGroupId())) {
+                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP);
+            } else {
+                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP);
             }
         }
     }