ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit 8aa7d95bfd6d7bbc75bf96634af2cc7dda7b544f 2 parents e3081ba8 c8bbba97

Merge branch 'hotfix_receiveAddress_1101'

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -297,7 +297,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -297,7 +297,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
297 BuyerOrderResp result = new BuyerOrderResp(); 297 BuyerOrderResp result = new BuyerOrderResp();
298 result.setReceiveName(metaValue.getString("consignee")); 298 result.setReceiveName(metaValue.getString("consignee"));
299 result.setReceiveMobile(metaValue.getString("mobile")); 299 result.setReceiveMobile(metaValue.getString("mobile"));
300 - result.setReceiveAddress(getAddressInfo(metaValue.getString("areaCode"))); 300 + result.setReceiveAddress(getAddressInfo(metaValue.getString("areaCode")) + metaValue.getString("address"));
301 ExpressRecord record = expressRecordMapper.selectByOrderCodeAndType(req.getOrderCode(), null, EXPRESS_TYPE_JUDGE_TO_BUYER); 301 ExpressRecord record = expressRecordMapper.selectByOrderCodeAndType(req.getOrderCode(), null, EXPRESS_TYPE_JUDGE_TO_BUYER);
302 if(null == record) { 302 if(null == record) {
303 return result; 303 return result;
@@ -318,7 +318,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -318,7 +318,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
318 BuyerOrderResp result = new BuyerOrderResp(); 318 BuyerOrderResp result = new BuyerOrderResp();
319 result.setReceiveName(metaValue.getString("consignee")); 319 result.setReceiveName(metaValue.getString("consignee"));
320 result.setReceiveMobile(metaValue.getString("mobile")); 320 result.setReceiveMobile(metaValue.getString("mobile"));
321 - result.setReceiveAddress(metaValue.getString("area") + metaValue.getString("address")); 321 + result.setReceiveAddress(getAddressInfo(metaValue.getString("areaCode")) + metaValue.getString("address"));
322 322
323 if(StringUtils.isEmpty(req.getOrderCode())) { 323 if(StringUtils.isEmpty(req.getOrderCode())) {
324 return result; 324 return result;