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

@@ -569,7 +569,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     	int result = 1;
     	BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(req.getOrderCode());
     	if(null == buyerOrder) {
-    		return result;
+    		return 0;
     	}
     	
     	int operateType = OPERATE_TYPE_UPDATE_SELLERWAYBILLCODE;
@@ -580,14 +580,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     		ExpressRecord sellerExpressRecord = expressRecordMapper.selectByOrderCodeAndType(buyerOrder.getOrderCode(), 
         			buyerOrder.getSellerUid(), EXPRESS_TYPE_SELLER_TO_JUDGE);
     		if(null == sellerExpressRecord) {
-    			return result;
+    			return 0;
     		}
     		JSONObject jo = new JSONObject();
     		jo.put("sellerWaybillCode", sellerExpressRecord.getWaybillCode());
     		oldInfo = jo.toJSONString();
     		result = expressRecordMapper.updateWaybillCode(buyerOrder.getOrderCode(), 
         			buyerOrder.getSellerUid(), EXPRESS_TYPE_SELLER_TO_JUDGE, req.getSellerWaybillCode());
-    	}else if(buyerOrder.getStatus().byteValue() < 2) {//卖家发货前，更新收货人信息
+    	}else if(buyerOrder.getStatus().byteValue() < 4) {//卖家发货前，更新收货人信息
     		operateType = OPERATE_TYPE_UPDATE_RECEIVE_INFO;
     		BuyerOrderMeta buyerMeta = buyerOrderMetaMapper.selectByOrderCodeAndKey(req.getOrderCode(), BUYER_ORDER_META_KEY_DELIVERY_ADDRESS);
         	if(null == buyerMeta) {