Merge branch 'hotfix_getWaybillCode_20190505' into hotfix_areacode

@@ -1719,10 +1719,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     		return null;
     	}
     	
-    	if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal())) {//平台已发货
-    		throw new CommonException(500, "状态异常,当前状态是"+Constant.convertOrderStatusStr(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal()));
-    	}
-    	
     	//查询buyer_order_goods
     	List<BuyerOrderGoods> goodsList = buyerOrderGoodsMapper.selectByOrderCode(Lists.newArrayList(buyerOrder.getOrderCode()));
     	if(CollectionUtils.isEmpty(goodsList)) {
@@ -1884,6 +1880,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
         	JSONObject sellerMetaValue = JSONObject.parseObject(sellerMeta.getMetaValue());
         	buildAddressInfo(sellerMetaValue, jsonObj, buyerOrder.getSellerUid());
         	jsonObj.put("receiverType", "seller");
+        }else {
+        	throw new CommonException(500, "状态异常,当前状态是"+Constant.convertOrderStatusStr(buyerOrder.getStatus()));
         }
         
         return jsonObj;