|
@@ -306,6 +306,10 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
public void orderSend(Long sendOrderId, PreOrderModelDTO orderSendDO) {
|
|
public void orderSend(Long sendOrderId, PreOrderModelDTO orderSendDO) {
|
|
OrderSendDO aDo = orderSendManager.getById(sendOrderId);
|
|
OrderSendDO aDo = orderSendManager.getById(sendOrderId);
|
|
OrderDO orderDO = getById(aDo.getOrderId());
|
|
OrderDO orderDO = getById(aDo.getOrderId());
|
|
|
|
+ List<OrderItemDO> list2 = orderItemManager.list(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId,orderDO.getId()));
|
|
|
|
+ list2.forEach(item ->item.setHasReturn(false));
|
|
|
|
+ orderItemManager.updateBatchById(list2);
|
|
|
|
+
|
|
converter.copyProperties(aDo, orderSendDO, orderSendDO.getReceiver(), orderSendDO.getSender());
|
|
converter.copyProperties(aDo, orderSendDO, orderSendDO.getReceiver(), orderSendDO.getSender());
|
|
//根据订单查找到这个订单的所有货物扣减库存
|
|
//根据订单查找到这个订单的所有货物扣减库存
|
|
List<OrderSendItemVO> list = orderSendDO.getOrderItemVOS();
|
|
List<OrderSendItemVO> list = orderSendDO.getOrderItemVOS();
|
|
@@ -630,6 +634,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
aDo.setStatus(SaleOrderStatusEnum.REVOKE);
|
|
aDo.setStatus(SaleOrderStatusEnum.REVOKE);
|
|
updateById(aDo);
|
|
updateById(aDo);
|
|
orderSendManager.remove(new LambdaQueryWrapper<OrderSendDO>().eq(OrderSendDO::getOrderId, id));
|
|
orderSendManager.remove(new LambdaQueryWrapper<OrderSendDO>().eq(OrderSendDO::getOrderId, id));
|
|
|
|
+ orderItemManager.remove(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId,id));
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|