|
@@ -52,8 +52,6 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
|
|
|
@Resource
|
|
|
private IdGeneratorService idGeneratorService;
|
|
|
@Resource
|
|
|
- private SellOrderDao sellOrderDao;
|
|
|
- @Resource
|
|
|
private GoodsDao goodsDao;
|
|
|
@Resource
|
|
|
private SellOrderService sellOrderService;
|
|
@@ -297,7 +295,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
|
|
|
//归还库存
|
|
|
List<SellOrder> sellOrders = sellOrderService.getSellOrderByParentGoodsId(orderId, null);
|
|
|
if (CollectionUtils.isNotEmpty(sellOrders)) {
|
|
|
- sellOrderDao.deleteByOrderId(orderId);
|
|
|
+ sellOrderService.getDao().deleteByOrderId(orderId);
|
|
|
}
|
|
|
return true;
|
|
|
}
|
|
@@ -546,7 +544,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
|
|
|
outOrderInfoDto.setCoopName(cooperationOrgan.getName());
|
|
|
}
|
|
|
}
|
|
|
- List<SellOrder> sellOrders = sellOrderDao.getOrderSellOrder(orderId);
|
|
|
+ List<SellOrder> sellOrders = sellOrderService.getDao().getOrderSellOrder(orderId);
|
|
|
if(CollectionUtils.isNotEmpty(sellOrders)){
|
|
|
BigDecimal goodsAmount = sellOrders.stream().map(SellOrder::getActualAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
outOrderInfoDto.setSellOrders(sellOrders);
|