|
|
@@ -2569,8 +2569,6 @@ public class ExportServiceImpl implements ExportService {
|
|
|
BigDecimal actualAmount = subTotalAmount;
|
|
|
for (int i = 0; i < detailList.size(); i++) {
|
|
|
StudentPaymentOrderDetail detail = detailList.get(i);
|
|
|
- //扣去内部库存分润出去的金额
|
|
|
- detail.setPrice(detail.getPrice().subtract(detail.getIncome()));
|
|
|
BigDecimal ratio = detail.getPrice().divide(expectAmount,8,BigDecimal.ROUND_DOWN);
|
|
|
BigDecimal price = actualAmount.multiply(ratio).setScale(2,BigDecimal.ROUND_DOWN);
|
|
|
if(i == detailList.size() - 1){
|
|
|
@@ -2604,16 +2602,16 @@ public class ExportServiceImpl implements ExportService {
|
|
|
}
|
|
|
}
|
|
|
public void setSaleFee(StudentPaymentOrderExportDto basicOrder,StudentPaymentOrderDetail orderDetail){
|
|
|
- BigDecimal price = orderDetail.getPrice();
|
|
|
+ BigDecimal price = orderDetail.getPrice().subtract(orderDetail.getIncome());
|
|
|
switch (orderDetail.getType()) {
|
|
|
case OTHER:
|
|
|
basicOrder.setOtherFee(basicOrder.getOtherFee().add(price));
|
|
|
break;
|
|
|
case MUSICAL:
|
|
|
if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
|
|
|
- basicOrder.setLeaseFee(price);
|
|
|
+ basicOrder.setLeaseFee(basicOrder.getLeaseFee().add(price));
|
|
|
} else {
|
|
|
- basicOrder.setMusicalFee(this.subtract(price,orderDetail.getIncome()));
|
|
|
+ basicOrder.setMusicalFee(basicOrder.getMusicalFee().add(price));
|
|
|
}
|
|
|
break;
|
|
|
case TEACHING:
|
zouxuan