Merge remote-tracking branch 'origin/master'

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -263,7 +263,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
     public void add(OrderInfoDto orderDto) {
 
         List<OrderSkuDto> orderSkuList = orderDto.getOrderSkuList();
-        if (ObjectUtil.equal(orderDto.getStatus(), OrderStatusEnum.STOCK_PREPARATION.getKey())) {
+        if (ObjectUtil.equal(orderDto.getStatus(), OrderStatusEnum.STOCK_PREPARATION.getKey())
+                && ObjectUtil.notEqual(orderDto.getType(), 2)) {
             lockStorage(orderSkuList);
             orderDto.setLockStorage(StatusConstant.YES);
         } else {