质检

@@ -515,7 +515,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 
     	//查询卖家已发货的订单
     	List<BuyerOrder> orderList = queryOrderByQueryStr(queryStr, null, Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal());
-
+        if(CollectionUtils.isEmpty(orderList)) {
+        	return null;
+        }
+    	
         List<BuyerOrderResp> respList = buildBuyerOrderRespForQc(orderList);
         if(CollectionUtils.isEmpty(respList)) {
         	return null;
@@ -2103,6 +2106,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     		}
     		Integer skup = buyerGoodsMap.get(item.getOrderCode()).getSkup();
     		BuyerOrderResp resp = new BuyerOrderResp();
+    		resp.setId(item.getId());
     		resp.setOrderCode(item.getOrderCode());
     		resp.setSellerWaybillCode(null == expressInfoMap.get(item.getOrderCode()) ? "" : expressInfoMap.get(item.getOrderCode()).getWaybillCode());
     		resp.setProductName(sellerGoodsMap.get(skup).getProductName());