修改bug

huanghongfa

2021-04-23 cf864019e28592c5468e8b992e3e3b9a156ea656

修改bug

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopUserAddressDAO.java

@@ -20,7 +20,7 @@

    @Select("select id,`name`,phone,province_code,province_name,city_code,city_name" +
            ",district_code,district_name,detail_address,is_default " +
            " from com_shop_user_address where user_id = #{userId} order by create_at desc")
            " from com_shop_user_address where delete_status = 2 and user_id = #{userId} order by create_at desc")
    List<ComShopUserAddressVO> pageUserAddressList(Page page, @Param("userId") Long userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java

@@ -81,6 +81,11 @@
    private Integer isDefault;

    /**
     * 是否已删除（1.是  2.否）
     */
    private Integer deleteStatus;

    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -217,7 +217,7 @@
//            ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
            BeanUtils.copyProperties(vo, comMngPopulationDO);
            if (comMngVillageDO == null) {
                throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
                throw new ServiceException("查无:" + vo.getRoad() + "小区/房租地址，请先新建地址");
            }
            List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
            comMngPopulationDO.setVillageId(comMngVillageDO.getVillageId());

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopUserAddressServiceImpl.java

@@ -110,7 +110,8 @@
        if(userAddressDO == null){
            return R.fail("未查询到用户收货地址信息");
        }
        if(this.baseMapper.deleteById(addressId) > 0){
        userAddressDO.setDeleteStatus(1);
        if(this.baseMapper.updateById(userAddressDO) > 0){
            return R.ok();
        }else{
            return R.fail("删除收货地址失败");