|
@@ -306,9 +306,6 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
|
public void orderSend(Long sendOrderId, PreOrderModelDTO orderSendDO) {
|
|
|
OrderSendDO aDo = orderSendManager.getById(sendOrderId);
|
|
|
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());
|
|
|
//根据订单查找到这个订单的所有货物扣减库存
|
|
@@ -349,6 +346,11 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
|
stockDO.setTransitStock(-dto.getNum());
|
|
|
}
|
|
|
}
|
|
|
+ if (OrderTypeEnum.TO_C.equals(aDo.getOrderType())) {
|
|
|
+ List<OrderItemDO> list2 = orderItemManager.list(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId,orderDO.getId()));
|
|
|
+ list2.forEach(item ->item.setHasReturn(false));
|
|
|
+ orderItemManager.updateBatchById(list2);
|
|
|
+ }
|
|
|
productStockManager.updateBatchById(list1);
|
|
|
// productStockManager.updateActualStock(arrayList, null);
|
|
|
// productStockManager.updateLockedStock(arrayList);
|