20211108

xiaoyong931011

2021-11-09 01eef3efb95945e47f0864253d96bfdc2a5e418a

20211108

 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;

}

 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());

 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)){

 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,