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/resources/mapper/shop/JhyOrderMapper.xml | 2 ++ gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java | 2 ++ gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 42 +++++++++++++++++++++--------------------- gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 5 +++-- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java index c0b3a2b..4856e1a 100644 --- a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java +++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java @@ -70,5 +70,7 @@ * 集物员ID */ private String jhyId; + private String unitName; + private String houseNumber; } diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java index 24719d6..18db30b 100644 --- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java +++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java @@ -108,8 +108,9 @@ } } - jhyOrder.setAddress(address.toString()); - + jhyOrder.setAddress(addressInfo.getDetailAddress()); + jhyOrder.setUnitName(addressInfo.getUnitName()); + jhyOrder.setHouseNumber(addressInfo.getHouseNumber()); jhyOrder.setUsername(addressInfo.getRelaName()); jhyOrder.setPhone(addressInfo.getMobilePhone()); jhyOrder.setLongitude(addressInfo.getLongitude()); 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)){ diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml index 9fb109c..e458de1 100644 --- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml +++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml @@ -12,6 +12,8 @@ a.reserve_time reserveTime, a.status status, a.remark remark, + a.unit_name unitName, + a.house_number houseNumber, a.username name, b.mobile_phone mobilePhone, d.mobile jhyMobilePhone, -- Gitblit v1.9.1