|
|
@@ -52,6 +52,7 @@ import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.ym.mec.biz.dal.enums.OrderTypeEnum.OUTORDER;
|
|
|
+import static com.ym.mec.biz.dal.enums.OrderTypeEnum.SPORADIC;
|
|
|
import static com.ym.mec.common.controller.BaseController.succeed;
|
|
|
|
|
|
@Service
|
|
|
@@ -2344,6 +2345,11 @@ public class ExportServiceImpl implements ExportService {
|
|
|
if(basicOrder.getRouteAmount().compareTo(BigDecimal.ZERO) == 0){
|
|
|
continue;
|
|
|
}
|
|
|
+ //如果是零星收费的账户充值，不管销售还是服务，统一放在其他收费项目中
|
|
|
+ if(basicOrder.getType() == OrderTypeEnum.TENANT_RECHARGE && basicOrder.getGroupType() == GroupType.SPORADIC){
|
|
|
+ basicOrder.setOtherFee(basicOrder.getRouteAmount());
|
|
|
+ continue;
|
|
|
+ }
|
|
|
//如果有订单详情
|
|
|
List<StudentPaymentOrderDetail> detailList = orderDetailMap.get(basicOrder.getId());
|
|
|
if (!CollectionUtils.isEmpty(detailList)) {
|
zouxuan