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

@@ -512,7 +512,13 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService {
     	//卖家信息
     	resp.setSellerName(userProxyService.getUserNameByUid(order.getUid()));
     	AppraiseOrderMeta meta = appraiseOrderMetaMapper.selectByOrderCodeAndMetaKey(order.getOrderCode(), BUYER_ORDER_META_KEY_RECALL_ADDRESS);
-    	if(meta != null){
+    	if(null == meta) {
+    		//查询父订单地址
+    		String parentOrderCode = order.getParentOrderCode();
+    		meta = appraiseOrderMetaMapper.selectByOrderCodeAndMetaKey(parentOrderCode, BUYER_ORDER_META_KEY_RECALL_ADDRESS);
+    	}
+    	
+    	if(null != meta){
 			JSONObject metaValue = JSONObject.parseObject(meta.getMetaValue());
 			resp.setSellerRebackAddressDetail(metaValue.getString("address"));
 			resp.setSellerRebackAddress(metaValue.getString("area"));