Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/ufo-platform into test6.9.12

@@ -3041,7 +3041,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 		BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(req.getOrderCode());
     	//寄存转现货
     	StorageDeposit deposit = storageDepositMapper.selectByOrderCode(req.getOrderCode());
-    	if(null != deposit && null != deposit.getOutType() && buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal())
+    	if(null != deposit && null != deposit.getOutType() && null != buyerOrder && buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal())
     			&& deposit.getOutType().equals(DepositOutTypeEnum.OUTTYPE_DEPOSIT_CHANGE_TO_IN_STOCK.getCode())) {
     		return getWaybillCodeForDeposit(req, deposit);
     	}

@@ -786,9 +786,12 @@ public class StorageDepositServiceImpl implements IStorageDepositService, IBusin
 				skupList.add(sd.getSkup());
 			}
 		}
+		Map<Integer, SellerOrderGoods> sellerOrderGoodsMap = new HashMap<>();
+		if (!skupList.isEmpty()) {
+			List<SellerOrderGoods> sellerOrderGoodsList = sellerOrderGoodsMapper.selectByIds(skupList);
+			sellerOrderGoodsMap = CollectionUtil.extractMap(sellerOrderGoodsList, SellerOrderGoods::getId);
+		}
 
-		List<SellerOrderGoods> sellerOrderGoodsList = sellerOrderGoodsMapper.selectByIds(skupList);
-		Map<Integer, SellerOrderGoods> sellerOrderGoodsMap = CollectionUtil.extractMap(sellerOrderGoodsList, SellerOrderGoods::getId);
 		List<BuyerOrder> buyerOrderList = buyerOrderMapper.selectBatchByOrderCode(orderCodeList);
 		Map<String, BuyerOrder> buyerOrderMap = CollectionUtil.extractMap(buyerOrderList, o -> o.getOrderCode().toString());
 		Map<String, AppraiseOrderStorage> storageMap = new HashMap<>();