|
@@ -2583,7 +2583,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
public void setServiceFee(StudentPaymentOrderExportDto basicOrder, StudentPaymentOrderDetail orderDetail,
|
|
|
Map<Integer, String> userFirstVipMap){
|
|
|
//分润订单可能多个,必须是指定账户。如果是内部库存转化部分收入为云教练收入
|
|
|
- if(basicOrder.getRouteMerNo().equals(goodsSellReceiptMerNo) && orderDetail.getIncome().compareTo(BigDecimal.ZERO) > 0){
|
|
|
+ if(orderDetail.getIncome().compareTo(BigDecimal.ZERO) > 0){
|
|
|
basicOrder.setCloudTeacherFee(basicOrder.getCloudTeacherFee().add(orderDetail.getIncome()));
|
|
|
}else {
|
|
|
//如果订单有余额,那么按比例排除掉订单详情中的余额,多的部分放在最后一条记录中
|