xiaoyong931011
2021-11-19 ca390645fe6ffd99bbe2056fad48c09842022722
20211119
3 files modified
14 ■■■■ changed files
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java 6 ●●●● patch | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java 6 ●●●●● patch | view | raw | blame | history
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml 2 ●●●●● patch | view | raw | blame | history
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());
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;
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,