update 订单导出增加新生课程专享

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

@@ -148,10 +148,6 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
             detailRouteBalance = detailRouteBalance.add(detailBalance);
             i++;
 
-            if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
-                continue;
-            }
-
             BigDecimal goodsTotalPrice = orderDetail.getGoodsList().stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
             BigDecimal routePrice = BigDecimal.ZERO;
             BigDecimal routeBalance = BigDecimal.ZERO;
@@ -205,6 +201,14 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 } else {
                     sellOrder.setType(SellTypeEnum.OTHER);
                 }
+                if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) &&
+                        (orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE) ||
+                                orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.FREE)
+                        )) {
+                    sellOrder.setActualAmount(BigDecimal.ZERO);
+                    sellOrder.setBalanceAmount(BigDecimal.ZERO);
+                    sellOrder.setExpectAmount(BigDecimal.ZERO);
+                }
                 sellOrders.add(sellOrder);
             }
         }