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 {
BuyerOrderResp result = new BuyerOrderResp();
result.setReceiveName(metaValue.getString("consignee"));
result.setReceiveMobile(metaValue.getString("mobile"));
result.setReceiveAddress(getAddressInfo(metaValue.getString("areaCode")));
result.setReceiveAddress(getAddressInfo(metaValue.getString("areaCode")) + metaValue.getString("address"));
ExpressRecord record = expressRecordMapper.selectByOrderCodeAndType(req.getOrderCode(), null, EXPRESS_TYPE_JUDGE_TO_BUYER);
if(null == record) {
return result;
... ... @@ -318,7 +318,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
BuyerOrderResp result = new BuyerOrderResp();
result.setReceiveName(metaValue.getString("consignee"));
result.setReceiveMobile(metaValue.getString("mobile"));
result.setReceiveAddress(metaValue.getString("area") + metaValue.getString("address"));
result.setReceiveAddress(getAddressInfo(metaValue.getString("areaCode")) + metaValue.getString("address"));
if(StringUtils.isEmpty(req.getOrderCode())) {
return result;
... ...