|
@@ -2346,7 +2346,10 @@ public class ExportServiceImpl implements ExportService {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
//如果是零星收费的账户充值,不管销售还是服务,统一放在其他收费项目中
|
|
//如果是零星收费的账户充值,不管销售还是服务,统一放在其他收费项目中
|
|
- if(basicOrder.getType() == OrderTypeEnum.TENANT_RECHARGE && basicOrder.getGroupType() == GroupType.SPORADIC){
|
|
|
|
|
|
+ if(basicOrder.getType() == OrderTypeEnum.SPORADIC
|
|
|
|
+ && basicOrder.getGroupType() == GroupType.SPORADIC
|
|
|
|
+ && basicOrder.getServiceAmount().compareTo(BigDecimal.ZERO) == 0
|
|
|
|
+ && basicOrder.getSaleAmount().compareTo(BigDecimal.ZERO) == 0){
|
|
basicOrder.setOtherFee(basicOrder.getRouteAmount());
|
|
basicOrder.setOtherFee(basicOrder.getRouteAmount());
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|