yanghui
2022-11-28 a079b14c8a2b9af9deeb7ccf3f91565ebd53f4f8
Merge branch 'local_20221104' into huacheng_test
5个文件已修改
1个文件已添加
39 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOStr.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOStr.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOStr.java
@@ -17,6 +17,6 @@
    private String id;
    @ApiModelProperty("下属街道列表")
    private List<StreetVOS> childList;
    private List<StreetVOStr> childList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOStr.java
New file
@@ -0,0 +1,20 @@
package com.panzhihua.common.model.vos.user;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel
public class StreetVOStr {
    @ApiModelProperty("街道id")
    private String id;
    @ApiModelProperty("街道名")
    private String name;
    @ApiModelProperty("下属社区列表")
    private List<CommunityVO> childList;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -245,6 +246,9 @@
        ComShopFlowerGoodsDO shopGoodsDO = new ComShopFlowerGoodsDO();
        BeanUtils.copyProperties(addShopFlowerGoodsVO, shopGoodsDO);
        shopGoodsDO.setOriginalPrice(addShopFlowerGoodsVO.getPrice());
        if (StrUtil.isEmpty(addShopFlowerGoodsVO.getImages())){
            shopGoodsDO.setImages("");
        }
        int update = this.baseMapper.update(shopGoodsDO, query);
        if (update < 1) {
            throw new ServiceException("修改失败");
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -383,6 +383,8 @@
    List<StreetVOS> selectStreetByAreaCode(Integer code);
    List<StreetVOStr> selectStreetByAreaCodeStr(Integer code);
    List<StreetVO> selectStreetsByAreaCode(Integer code);
    ComActAcidCheckRecordVO selectComActAcidCheckRecordById(Long id);
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3773,11 +3773,11 @@
            AreaVOStr areaVO = new AreaVOStr();
            areaVO.setId(code+"");
            areaVO.setName(areaCodeToName(code.longValue()));
            List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
            Iterator<StreetVOS> iterator = streetVOS.listIterator();
            List<StreetVOStr> streetVOS = userDao.selectStreetByAreaCodeStr(code);
            Iterator<StreetVOStr> iterator = streetVOS.listIterator();
            while (iterator.hasNext()) {
                StreetVOS vo = iterator.next();
                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
                StreetVOStr vo = iterator.next();
                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(Long.parseLong(vo.getId()), 3);
                vo.setChildList(communityVOS);
            }
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml
@@ -117,5 +117,8 @@
    <select id="selectStoreIdIdByUserId" resultType="java.lang.Long">
        select id from com_convenient_merchants where user_id  = #{userId} and is_del = 0
    </select>
    <select id="selectStreetByAreaCodeStr" resultType="com.panzhihua.common.model.vos.user.StreetVOStr">
        select street_id as id,name as name from com_street where area_code=#{code} and app_id ='wx118de8a734d269f0'
    </select>
</mapper>