根据订单货仓 查询物流公司信息

@@ -3026,30 +3026,27 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 	 * @return
 	 */
 	public ExpressCompany orderQueryExpressCompanyId(BuyerOrderReq req) {
+		ExpressCompany expressCompany = new ExpressCompany();
+		expressCompany.setId(23);
+		expressCompany.setCompanyName("顺丰");
 		if (StringUtils.isEmpty(req.getOrderCode())) {
-			return null;
+			return expressCompany;
 		}
 		List<BuyerOrderGoods> buyerOrderGoodses = buyerOrderGoodsMapper.selectByOrderCode(Lists.newArrayList(req.getOrderCode()));
 		if (CollectionUtils.isEmpty(buyerOrderGoodses)) {
 			LOGGER.error("buyerOrderGoodsMapper.selectByOrderCode is empty req is {}", req);
-			return null;
+			return expressCompany;
 		}
 		Integer skup = buyerOrderGoodses.get(0).getSkup();
 		List<SellerOrderGoods> sellerOrderGoodses = sellerOrderGoodsMapper.selectByIds(Lists.newArrayList(skup));
 		if (CollectionUtils.isEmpty(sellerOrderGoodses)) {
 			LOGGER.error("sellerOrderGoodsMapper.selectByIds is empty req is {}", req);
-			return null;
+			return expressCompany;
 		}
 		Integer depotNo = sellerOrderGoodses.get(0).getDepotNo();
-
-
-		ExpressCompany expressCompany = new ExpressCompany();
 		if (Integer.valueOf(2).equals(depotNo)) {    // 香港仓的订单默认发中通  其他仓订单默认发顺丰
 			expressCompany.setId(47);
 			expressCompany.setCompanyName("中通");
-		} else {
-			expressCompany.setId(23);
-			expressCompany.setCompanyName("顺丰");
 		}
 		return expressCompany;
 	}