From 01eef3efb95945e47f0864253d96bfdc2a5e418a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 09 Nov 2021 17:09:58 +0800 Subject: [PATCH] 20211108 --- gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java index cdabb62..87fd537 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java @@ -69,27 +69,27 @@ 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)){ -- Gitblit v1.9.1