From ca390645fe6ffd99bbe2056fad48c09842022722 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 19 Nov 2021 14:48:43 +0800 Subject: [PATCH] 20211119 --- gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 2 ++ gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java | 6 ++++++ gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) 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 dce33d3..e0d804d 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,9 +108,9 @@ } } - jhyOrder.setAddress(addressInfo.getDetailAddress()+addressInfo.getHouseName()); - jhyOrder.setUnitName(addressInfo.getUnitName()); - jhyOrder.setHouseNumber(addressInfo.getHouseNumber()); + jhyOrder.setAddress(addressInfo.getDetailAddress()+(StrUtil.isEmpty(addressInfo.getHouseName())?"":addressInfo.getHouseName())); + jhyOrder.setUnitName(StrUtil.isEmpty(addressInfo.getUnitName())?"":addressInfo.getUnitName()); + jhyOrder.setHouseNumber(StrUtil.isEmpty(addressInfo.getHouseNumber())?"":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/vo/ViewJhyOrderVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java index 360127a..4028961 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java @@ -26,6 +26,12 @@ @ApiModelProperty(value="地址") private String Address; + @ApiModelProperty(value="单元栋") + private String unitName; + + @ApiModelProperty(value="楼门牌号") + private String houseNumber; + @ApiModelProperty(value="预约年月日") private String reserveDate; diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml index e458de1..6ef8cc2 100644 --- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml +++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml @@ -75,6 +75,8 @@ b.mobile_phone mobilePhone, a.area area, a.address address, + a.unit_name unitName, + a.house_number houseNumber, date_format(a.reserve_date,'%Y-%m-%d') reserveDate, a.reserve_time reserveTime, a.status status, -- Gitblit v1.9.1