ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit e0bb6093c82cb61c3ec8e34262af50ec4ad33268 2 parents 628b936a 9d6e746e

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

Inline Side-by-side
Showing 1 changed file with 7 additions and 1 deletions
@@ -512,7 +512,13 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService { @@ -512,7 +512,13 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService {
512 //卖家信息 512 //卖家信息
513 resp.setSellerName(userProxyService.getUserNameByUid(order.getUid())); 513 resp.setSellerName(userProxyService.getUserNameByUid(order.getUid()));
514 AppraiseOrderMeta meta = appraiseOrderMetaMapper.selectByOrderCodeAndMetaKey(order.getOrderCode(), BUYER_ORDER_META_KEY_RECALL_ADDRESS); 514 AppraiseOrderMeta meta = appraiseOrderMetaMapper.selectByOrderCodeAndMetaKey(order.getOrderCode(), BUYER_ORDER_META_KEY_RECALL_ADDRESS);
515 - if(meta != null){ 515 + if(null == meta) {
  516 + //查询父订单地址
  517 + String parentOrderCode = order.getParentOrderCode();
  518 + meta = appraiseOrderMetaMapper.selectByOrderCodeAndMetaKey(parentOrderCode, BUYER_ORDER_META_KEY_RECALL_ADDRESS);
  519 + }
  520 +
  521 + if(null != meta){
516 JSONObject metaValue = JSONObject.parseObject(meta.getMetaValue()); 522 JSONObject metaValue = JSONObject.parseObject(meta.getMetaValue());
517 resp.setSellerRebackAddressDetail(metaValue.getString("address")); 523 resp.setSellerRebackAddressDetail(metaValue.getString("address"));
518 resp.setSellerRebackAddress(metaValue.getString("area")); 524 resp.setSellerRebackAddress(metaValue.getString("area"));