| | |
|---|
| | | Long id = queryJhyOrderListVo.getId(); |
|---|
| | | List<JhyOrderItemsVo> jhyOrderItemsVos = jhyOrderItemsMapper.selectByOrderId(id); |
|---|
| | | queryJhyOrderListVo.setJhyOrderItemsVos(jhyOrderItemsVos); |
|---|
| | | |
|---|
| | | String orderAddr = queryJhyOrderListVo.getArea() + queryJhyOrderListVo.getAddress(); |
|---|
| | | Long userId = queryJhyOrderListVo.getUserId(); |
|---|
| | | List<AddressInfo> addressInfos = jhyOrderMapper.selectAddRessInfoByUserId(userId); |
|---|
| | | if(CollUtil.isNotEmpty(addressInfos)){ |
|---|
| | | for(AddressInfo addressInfo : addressInfos){ |
|---|
| | | StringBuffer address = new StringBuffer(); |
|---|
| | | address.append(addressInfo.getDetailAddress()); |
|---|
| | | if (StrUtil.isNotBlank(addressInfo.getTagName())) { |
|---|
| | | address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : ""); |
|---|
| | | if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) { |
|---|
| | | address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : ""); |
|---|
| | | address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : ""); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (orderAddr.equals(addressInfo.getAddressArea() + address)) { |
|---|
| | | queryJhyOrderListVo.setUnitName(addressInfo.getUnitName()); |
|---|
| | | queryJhyOrderListVo.setHouseNumber(addressInfo.getHouseNumber()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | // |
|---|
| | | // String orderAddr = queryJhyOrderListVo.getArea() + queryJhyOrderListVo.getAddress(); |
|---|
| | | // Long userId = queryJhyOrderListVo.getUserId(); |
|---|
| | | // List<AddressInfo> addressInfos = jhyOrderMapper.selectAddRessInfoByUserId(userId); |
|---|
| | | // if(CollUtil.isNotEmpty(addressInfos)){ |
|---|
| | | // for(AddressInfo addressInfo : addressInfos){ |
|---|
| | | // StringBuffer address = new StringBuffer(); |
|---|
| | | // address.append(addressInfo.getDetailAddress()); |
|---|
| | | // if (StrUtil.isNotBlank(addressInfo.getTagName())) { |
|---|
| | | // address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : ""); |
|---|
| | | // if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) { |
|---|
| | | // address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : ""); |
|---|
| | | // address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : ""); |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | // if (orderAddr.equals(addressInfo.getAddressArea() + address)) { |
|---|
| | | // queryJhyOrderListVo.setUnitName(addressInfo.getUnitName()); |
|---|
| | | // queryJhyOrderListVo.setHouseNumber(addressInfo.getHouseNumber()); |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | // if(CollUtil.isNotEmpty(maps)){ |
|---|
