|
@@ -201,6 +201,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
|
|
} else {
|
|
} else {
|
|
sellOrder.setType(SellTypeEnum.OTHER);
|
|
sellOrder.setType(SellTypeEnum.OTHER);
|
|
}
|
|
}
|
|
|
|
+ //租赁、免费的没有销售收入,有销售成本
|
|
if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) &&
|
|
if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) &&
|
|
(orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE) ||
|
|
(orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE) ||
|
|
orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.FREE)
|
|
orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.FREE)
|