Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-16 0f05b70118465756237eedac2e393b4f80cf3103

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java

New file
@@ -0,0 +1,111 @@
package com.panzhihua.applets_backstage.api;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireListVo;
import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;

/**
 * @auther llming
 * @describe 商城管理
 */
@Slf4j
@Api(tags = {"商城管理模块"})
@RestController("/shop")
public class ShopApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;

    @ApiOperation(value = "分页查询商铺", response = ComShopStoreVO.class)
    @PostMapping("/page")
    public R pageVolunteer(@RequestBody PageComShopStoreDTO pageComShopStoreDTO) {
        return communityService.pageStoreList(pageComShopStoreDTO);
    }

    @ApiOperation(value = "保存商铺")
    @PostMapping("/save")
    public R saveStore(@Valid @RequestBody ShopStoreVO storeVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long loginUserId = loginUserInfo.getUserId();
        if (storeVO == null) {
            return R.fail();
        }
        R<SysUserVO> sysUserVO = userService.getSysUserVOByPhone(storeVO.getPhone());
        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(sysUserVO.getData()));
        SysUserVO entityVo = jsonObject.toJavaObject(SysUserVO.class);
        storeVO.setSysUserId(entityVo.getUserId());
        storeVO.setLoginUserId(loginUserId);
        R r1 = communityService.saveStore(storeVO);
        //保存sys_user
        if (R.isOk(r1)) {
            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
            administratorsUserVO.setAccount(storeVO.getStoreAccount());
            administratorsUserVO.setPassword(storeVO.getStorePassword());
            administratorsUserVO.setType(5);
            administratorsUserVO.setAreaId(null);
            administratorsUserVO.setStatus(1);
            administratorsUserVO.setPhone(storeVO.getPhone());
            administratorsUserVO.setRoleId(888888888l);
            administratorsUserVO.setShopStoreName(storeVO.getName());
            administratorsUserVO.setShopStorePhone(storeVO.getPhone());
            R r = userService.addUserBackstage(administratorsUserVO);
        }
        return R.ok();
    }

    @ApiOperation(value = "编辑店铺、启用、禁用")
    @PostMapping("/edit/{id}")
    @ApiImplicitParam(name = "id", value = "商铺id")
    public R editStore(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
        R<LoginUserInfoVO> sysUserVO = userService.getUserInfoByUserId(storeVO.getSysUserId() + "");
        if (sysUserVO.getData() == null) {
            return R.fail("没有相关的用户！");
        }
        LoginUserInfoVO user = JSON.parseObject(JSON.toJSONString(sysUserVO.getData())).toJavaObject(LoginUserInfoVO.class);
        storeVO.setSysUserId(user.getUserId());

        R<ShopStoreVO> storeInfoVO = communityService.getStoreInfo(id);
        if( storeInfoVO.getCode()==500){
            return R.fail(storeInfoVO.getMsg());
        }
        ShopStoreVO shopStoreVO = JSON.parseObject(JSON.toJSONString(storeInfoVO.getData())).toJavaObject(ShopStoreVO.class);
        ChangePasswordVO changePasswordVO = new ChangePasswordVO();
        changePasswordVO.setOldPassword(shopStoreVO.getStorePassword());
        changePasswordVO.setUserId(user.getUserId());
        changePasswordVO.setNewPassword(storeVO.getStorePassword());
        R r = userService.changePassword(changePasswordVO);
        if (R.isOk(r)) {
            return communityService.editStore(storeVO, id);
        }
        return R.fail();
    }

    @ApiOperation(value = "删除商铺")
    @PostMapping("/delete")
    public R delete(@RequestBody Long[] ids) {
        return communityService.deleteStore(ids);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java

New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.model.dtos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @auther llming
 * @describe 分页查询商品
 */
@ApiModel("分页查询商品")
@Data
public class PageComShopGoodsDTO {
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java

@@ -12,11 +12,20 @@
@Data
@ApiModel("分页查询店铺")
public class PageComShopStoreDTO {

    @ApiModelProperty(value = "分页-当前页数",example = "1")
    @ApiModelProperty(value = "商家姓名")
    private String contacts;
    @ApiModelProperty(value = "商家账号")
    private String name;
    @ApiModelProperty(value = "店铺名称")
    private String account;
    @ApiModelProperty(value = "配送方式（1.商家配送  2.快递物流）")
    private Integer deliveryType;
    @ApiModelProperty(value = "店铺状态（1.启用  2.禁用）")
    private Integer status;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderGoodsVO.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.common.model.vos.shop;

import io.swagger.annotations.ApiModel;
import lombok.Data;

/**
 * @auther llming
 * @describe
 */
@Data
@ApiModel("商品")
public class ComShopOrderGoodsVO {
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopGoodsVO.java

New file
@@ -0,0 +1,40 @@
package com.panzhihua.common.model.vos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @auther llming
 * @describe 商品
 */
@Data
@ApiModel("商品")
public class ShopGoodsVO {

    @ApiModelProperty("店铺id")
    private Long storeId;


    @ApiModelProperty("店铺名称")
    private String name;

    @ApiModelProperty("商品现价")
    private BigDecimal price;


    @ApiModelProperty("商品单位")
    private String unit;


    @ApiModelProperty("商品状态(1.出售中  2.已下架  3.回收站)")
    private Integer status;

    @ApiModelProperty("商品主图")
    private String goodsPic;

    @ApiModelProperty("商品描述")
    private String goodsDescribe;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java

New file
@@ -0,0 +1,68 @@
package com.panzhihua.common.model.vos.shop;

import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;


/**
 * @auther llming
 * @describe
 */
@Data
@ApiModel("商家")
public class ShopStoreVO {

    @ApiModelProperty("商家姓名")
    private String contacts;

    @ApiModelProperty("店铺名称")
    @NotBlank(message = "店铺名称不能为空")
    @Size(max = 15,min = 1,message = "限制15字")
    private String name;

    @ApiModelProperty("联系方式")
    @NotBlank(message = "手机号码不能为空")
    @NotNull(message = "手机号不能为空")
    @Length(min = 11, max = 11, message = "手机号只能为11位")
    @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误")
    private String phone;


    @ApiModelProperty("店铺登陆账号")
    @NotBlank(message = "店铺登陆账号不能为空")
    private String storeAccount;


    @ApiModelProperty("店铺登陆密码")
    @NotBlank(message = "店铺登陆密码不能为空")
    private String storePassword;


    @ApiModelProperty("配送方式（1.商家配送  2.快递物流）")
    @NotNull(message = "配送方式（1.商家配送  2.快递物流）")
    private Integer deliveryType;


    @ApiModelProperty("店铺logo")
    private String logo;
    /**
     * 保存时添加sys_user所需
     */
    @ApiModelProperty("sysUserId")
    @JsonIgnore
    private Long sysUserId;
    /**
     * 当前登陆用户Id
     */
    @JsonIgnore
    private Long loginUserId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java

@@ -44,7 +44,7 @@
    @Min(groups = {AddGroup.class},value =1,message = "账户状态不能为空")
    private Integer status;

    @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台 4 街道平台",hidden = true)
    @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台 4 街道平台 5 商家",hidden = true)
    private Integer type;

    @ApiModelProperty(value = "小区id",hidden = true)
@@ -73,4 +73,10 @@
    @ApiModelProperty(value = "角色名字")
    private String roleName;

    @ApiModelProperty(value = "商铺名称")
    private String shopStoreName;

    @ApiModelProperty(value = "商铺Id")
    private String shopStorePhone;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -4,12 +4,14 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -1754,4 +1756,41 @@
    @PostMapping("/questnaire/usersanswequestnaire")
    R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId);

    /**
     * 店铺列表-分页查询
     * @param pageComShopStoreDTO 分页条件
     */
    @PostMapping("/shop/pageShopStore")
    R pageStoreList(@RequestBody PageComShopStoreDTO pageComShopStoreDTO);

    /**
     * 保存店铺
     * @param storeVO 数据
     */
    @PostMapping("/shop/saveStore")
    R saveStore(@RequestBody ShopStoreVO storeVO);


    /**
     * 编辑店铺、启用、禁用
     * @param storeVO 数据
     * @param id 商铺id
     */
    @PostMapping("/shop/editStore/{id}")
    R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id);

    /**
     * 删除店铺
     * @param id 商铺id
     */
    @PostMapping("/shop/deleteStore")
    R deleteStore(@RequestBody Long[] id);

    /**
     * 获取详情
     * @param id 商铺id
     */
    @GetMapping("/shop/getStoreInfo")
    R getStoreInfo(@RequestParam("id")Long id);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java

@@ -1,20 +1,22 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.service_community.service.ComShopStoreService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.validation.constraints.NotNull;

@Slf4j
@RestController
@RequestMapping("/shop")
public class ShopApi {
public class ShopApi{

    @Resource
    private ComShopStoreService comShopStoreService;
@@ -24,9 +26,55 @@
     * @param pageComShopStoreDTO 查询参数
     * @return ComShopStoreVO
     */
    @PostMapping("pageShopStore")
    public R pageShopStore(@RequestBody PageComShopStoreDTO pageComShopStoreDTO){
    @PostMapping("/pageShopStore")
    public R pageShopStore(@RequestBody PageComShopStoreDTO pageComShopStoreDTO) {
        return comShopStoreService.pageStoreList(pageComShopStoreDTO);
    }

    /**
     * 保存店铺
     *
     * @param storeVO
     * @return
     */
    @PostMapping("/saveStore")
    public R saveStore(@RequestBody ShopStoreVO storeVO) {
        return comShopStoreService.saveStore(storeVO);
    }

    /**
     * 编辑店铺、启用、禁用
     *
     * @param storeVO
     * @param id 商铺Id
     * @return
     */
    @PostMapping("/editStore/{id}")
    public R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
        return comShopStoreService.editStore(id, storeVO);
    }

    /**
     * 删除店铺
     *
     * @param id
     * @return
     */
    @PostMapping("/deleteStore")
    public R deleteStore(@RequestBody Long[] id) {
        return comShopStoreService.deleteStore(id);
    }

    /**
     * 获取详情
     *
     * @param id
     * @return
     */
    @GetMapping("/getStoreInfo")
    public R getOneInfo(@RequestParam("id") Long id) {
        return comShopStoreService.getOneInfo(id);
    }


}

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

@@ -1,8 +1,13 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

/**
 * @auther lyq
@@ -12,4 +17,7 @@
@Mapper
public interface ComShopGoodsDAO extends BaseMapper<ComShopGoodsDO> {

    @Select("select id,type_id,name,store_id,goods_pic,images,status,sale,original_price,price,unit,order,stock,details,remark,goods_describe,delivery_type,delete_status,create_at,update_at from com_shop_store")
    IPage<ComShopStoreVO> pageShopGoods(Page page, PageComShopGoodsDTO pageComShopGoodsDTO);

}

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

@@ -114,10 +114,13 @@
    private Date updateAt;

    /**
     * 负责人
     */
    private String contacts;
    /**
     * 管理后台用户id
     */
    private Long sysUserId;

    @Override
    public String toString() {
        return "ComShopStoreDO{" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopGoodsService.java

@@ -1,6 +1,9 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;

/**
@@ -10,4 +13,35 @@
 */
public interface ComShopGoodsService extends IService<ComShopGoodsDO> {

    /**
     * 添加商品
     * @param shopGoodsVO
     * @return
     */
    R saveShopGoods(ShopGoodsVO shopGoodsVO);

    /**
     * 商品列表-分页查询
     * @param pageComShopGoodsDTO 查询参数
     * @return ComShopStoreVO
     */
    R pageStoreList(PageComShopGoodsDTO pageComShopGoodsDTO);



    /**
     * 编辑商品、上架、下架
     *
     * @param id 商铺ID
     * @param shopGoodsVO
     * @return
     */
    R editShopGoods(Long id, ShopGoodsVO shopGoodsVO);

    /**
     * 删除商品
     * @param id
     * @return
     */
    R deleteShopGoods(Long[] id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderGoodsService.java

@@ -10,4 +10,5 @@
 */
public interface ComShopOrderGoodsService extends IService<ComShopOrderGoodsDO> {


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderOperateService.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopOrderOperateDO;

/**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopStoreService.java

@@ -1,8 +1,11 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;

/**
@@ -18,4 +21,35 @@
     * @return ComShopStoreVO
     */
    R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO);

    /**
     * 保存店铺
     * @param storeVO
     * @return
     */
    R saveStore(ShopStoreVO storeVO);


    /**
     * 编辑店铺、启用、禁用
     *
     * @param id 商铺ID
     * @param storeVO
     * @return
     */
    R editStore(Long id, ShopStoreVO storeVO);

    /**
     * 删除店铺
     * @param id
     * @return
     */
    R deleteStore(Long[] id);

    /**
     * 获取详情
     * @param id
     * @return
     */
    R getOneInfo(Long id);
}

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

@@ -1,10 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
import com.panzhihua.service_community.dao.ComShopGoodsDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;
import com.panzhihua.service_community.service.ComShopGoodsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

/**
@@ -15,5 +24,43 @@
@Slf4j
@Service
public class ComShopGoodsServiceImpl extends ServiceImpl<ComShopGoodsDAO, ComShopGoodsDO> implements ComShopGoodsService {
    @Override
    public R saveShopGoods(ShopGoodsVO shopGoodsVO) {
        if (shopGoodsVO == null) {
            return R.ok("500", "数据为空！");
        }
        ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO();
        BeanUtils.copyProperties(shopGoodsVO, shopGoodsDO);
        shopGoodsDO.setSale(0);
        this.baseMapper.insert(shopGoodsDO);
        return R.ok();
    }

    @Override
    public R pageStoreList(PageComShopGoodsDTO pageComShopGoodsDTO) {
        Page page = new Page<>(pageComShopGoodsDTO.getPageNum(), pageComShopGoodsDTO.getPageSize());
        IPage<ComShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO);
        return R.ok(comShopStoreVOIPage);
    }

    @Override
    public R editShopGoods(Long id, ShopGoodsVO shopGoodsVO) {
        if (shopGoodsVO == null) {
            return R.ok("500", "数据为空！");
        }
        LambdaQueryWrapper<ComShopGoodsDO> query = new LambdaQueryWrapper<ComShopGoodsDO>().eq(ComShopGoodsDO::getId, id);
        ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO();
        BeanUtils.copyProperties(shopGoodsVO,shopGoodsDO);
        int update = this.baseMapper.update(shopGoodsDO, query);
        return update > 0 ? R.ok() : R.fail();
    }

    @Override
    public R deleteShopGoods(Long[] id) {
        ComShopGoodsDO storeDO = new ComShopGoodsDO();
        storeDO.setDeleteStatus(2);
        LambdaQueryWrapper<ComShopGoodsDO> query = new LambdaQueryWrapper<ComShopGoodsDO>().eq(ComShopGoodsDO::getId, id);
        int update = this.baseMapper.update(storeDO, query);
        return update > 0 ? R.ok() : R.fail();
    }
}

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

@@ -1,13 +1,21 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.service_community.dao.ComShopStoreDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;
import com.panzhihua.service_community.service.ComShopStoreService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

/**
@@ -18,11 +26,54 @@
@Slf4j
@Service
public class ComShopStoreServiceImpl extends ServiceImpl<ComShopStoreDAO, ComShopStoreDO> implements ComShopStoreService {

    @Override
    public R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO){
        Page page = new Page<>(pageComShopStoreDTO.getPageNum(),pageComShopStoreDTO.getPageSize());
        return R.ok(this.baseMapper.pageShopStore(page,pageComShopStoreDTO));
    public R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO) {
        Page page = new Page<>(pageComShopStoreDTO.getPageNum(), pageComShopStoreDTO.getPageSize());
        IPage<ComShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopStore(page, pageComShopStoreDTO);
        return R.ok(comShopStoreVOIPage);
    }

    @Override
    public R saveStore(ShopStoreVO storeVO) {
        if (storeVO == null) {
            return R.ok("500", "数据为空！");
        }
        ComShopStoreDO storeDO = new ComShopStoreDO();
        BeanUtils.copyProperties(storeVO, storeDO);
        storeDO.setSale(0);
        this.baseMapper.insert(storeDO);
        return R.ok();
    }

    @Override
    public R editStore(Long id, ShopStoreVO storeVO) {
        if (storeVO == null) {
            return R.ok("500", "数据为空！");
        }
        LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getId, id);
        ComShopStoreDO storeDO = new ComShopStoreDO();
        BeanUtils.copyProperties(storeVO, storeDO);
        int update = this.baseMapper.update(storeDO, query);
        return update > 0 ? R.ok() : R.fail();
    }

    @Override
    public R deleteStore(Long[] id) {
        ComShopStoreDO storeDO = new ComShopStoreDO();
        storeDO.setDeleteStatus(2);
        LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getId, id);
        int update = this.baseMapper.update(storeDO, query);
        return update > 0 ? R.ok() : R.fail();
    }

    @Override
    public R getOneInfo(Long id) {
        ComShopStoreDO comShopStoreDO = this.baseMapper.selectById(id);
        if (comShopStoreDO == null) {
            R.fail(500,"商铺不存在");
        }
        ShopStoreVO shopStoreVO = new ShopStoreVO();
        BeanUtils.copyProperties(comShopStoreDO,shopStoreVO);
        return R.ok(shopStoreVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -158,7 +158,7 @@
        sysUserDO.setPhone(purePhoneNumber);
        sysUserDO.setUserId(userId);
        userDao.updateMemberRole(purePhoneNumber, purePhoneNumber);
        userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);        
        userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
        int i = userDao.updateById(sysUserDO);
        if (i > 0) {
            return R.ok();
@@ -181,22 +181,22 @@
            sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getOpenid, name));
        } else {
            LambdaQueryWrapper<SysUserDO> wrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type);
            wrapper.and(sysUserDOLambdaQueryWrapper ->sysUserDOLambdaQueryWrapper .eq(SysUserDO::getAccount, name).or().eq(SysUserDO::getPhone, name));
            wrapper.and(sysUserDOLambdaQueryWrapper -> sysUserDOLambdaQueryWrapper.eq(SysUserDO::getAccount, name).or().eq(SysUserDO::getPhone, name));
            sysUserDO = userDao.selectOne(wrapper);
        }
        boolean empty = ObjectUtils.isEmpty(sysUserDO);
        if (empty) {
            return R.fail();
        }
        LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        loginUserInfoVO.setUserId(sysUserDO.getUserId());
        loginUserInfoVO.setName(sysUserDO.getName());
        loginUserInfoVO.setPassword(sysUserDO.getPassword());
        loginUserInfoVO.setStatus(sysUserDO.getStatus());
        loginUserInfoVO.setAccount(name);
        loginUserInfoVO.setType(sysUserDO.getType());
        List<SysRoleDO> roleDOList=roleDAO.selectByUserId(sysUserDO.getUserId());
        Set<String> set=new HashSet<>();
        List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
        Set<String> set = new HashSet<>();
        if (!ObjectUtils.isEmpty(roleDOList)) {
            roleDOList.forEach(sysRoleDO -> {
                set.add(sysRoleDO.getRoleKey());
@@ -218,10 +218,10 @@
        if (empty) {
            return R.fail();
        }
        LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
        BeanUtils.copyProperties(sysUserDO,loginUserInfoVO);
        List<SysRoleDO> roleDOList=roleDAO.selectByUserId(sysUserDO.getUserId());
        Set<String> set=new HashSet<>();
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
        List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
        Set<String> set = new HashSet<>();
        if (!ObjectUtils.isEmpty(roleDOList)) {
            roleDOList.forEach(sysRoleDO -> {
                set.add(sysRoleDO.getRoleKey());
@@ -232,21 +232,21 @@
//        志愿者状态
        String phone = sysUserDO.getPhone();
        if (!ObjectUtils.isEmpty(phone)) {
            ComMngVolunteerMngVO comMngVolunteerMngVO= userDao.selectVolunteerMngByPhone(phone);
            ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
            if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
                loginUserInfoVO.setVolunteerStatus(0);
            }else{
            } else {
                int state = comMngVolunteerMngVO.getState().intValue();
                loginUserInfoVO.setVolunteerStatus(state);
            }
            Integer countTeam = userDao.selectCountTeam(phone);
            Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
            Integer isSysUser = userDao.selectCountSysUser(phone);
            if(countTeam!=null&&countTeam>0) {
                loginUserInfoVO.setIsmemberrole(1);
            }else if(selectCountMemberRole!=null&&selectCountMemberRole>0) {
                loginUserInfoVO.setIsmemberrole(1);
            }else if(isSysUser!=null && isSysUser>0){
            if (countTeam != null && countTeam > 0) {
                loginUserInfoVO.setIsmemberrole(1);
            } else if (selectCountMemberRole != null && selectCountMemberRole > 0) {
                loginUserInfoVO.setIsmemberrole(1);
            } else if (isSysUser != null && isSysUser > 0) {
                loginUserInfoVO.setIsmemberrole(1);
            }
        }
@@ -270,16 +270,16 @@
            return R.fail("新密码与原密码不能相同");
        }
        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
        if( !encoder.matches(oldPassword,dataPassowrd)){
        if (!encoder.matches(oldPassword, dataPassowrd)) {
            return R.fail("原密码错误");

        }
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setUserId(userId);
        String encode = new BCryptPasswordEncoder().encode(newPassword);
        sysUserDO.setPassword(encode);
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
@@ -294,16 +294,16 @@
     */
    @Override
    public R listActivityManager(String param, Long communityId) {
        LambdaQueryWrapper<SysUserDO> queryWrapper=new LambdaQueryWrapper<>();
        List<ActivityManagerVO> activityManagerVOS=new ArrayList<>();
        queryWrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getCommunityId, communityId).eq(SysUserDO::getStatus, 1).eq(SysUserDO::getType,3);
        LambdaQueryWrapper<SysUserDO> queryWrapper = new LambdaQueryWrapper<>();
        List<ActivityManagerVO> activityManagerVOS = new ArrayList<>();
        queryWrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getCommunityId, communityId).eq(SysUserDO::getStatus, 1).eq(SysUserDO::getType, 3);
        if (!ObjectUtils.isEmpty(param)) {
            queryWrapper = queryWrapper.eq(SysUserDO::getName, param);
        }
        List<SysUserDO> sysUserDOS = userDao.selectList(queryWrapper);
        if (!ObjectUtils.isEmpty(sysUserDOS)) {
            sysUserDOS.forEach(sysUserDO -> {
                ActivityManagerVO activityManagerVO=new ActivityManagerVO();
                ActivityManagerVO activityManagerVO = new ActivityManagerVO();
                activityManagerVO.setManagerId(sysUserDO.getUserId());
                activityManagerVO.setName(sysUserDO.getName());
                activityManagerVOS.add(activityManagerVO);
@@ -323,10 +323,10 @@
        Page page = new Page<>();
        Long pageNum = loginUserInfoVO.getPageNum();
        Long pageSize = loginUserInfoVO.getPageSize();
        if (null==pageNum||0==pageNum) {
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null==pageSize||0==pageSize) {
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
@@ -345,9 +345,9 @@
    public R putUserFace(LoginUserInfoVO loginUserInfoVO) {
        int operationType = loginUserInfoVO.getOperationType().intValue();
        Long userId = loginUserInfoVO.getUserId();
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setUserId(userId);
        switch (operationType){
        switch (operationType) {
            case 1:
                sysUserDO.setFaceState(1);
                break;
@@ -359,14 +359,14 @@
            default:
                break;
        }
        int num=0;
        if (operationType==3) {
        int num = 0;
        if (operationType == 3) {
//            num=userDao.deleteById(userId);
            num=userDao.updateFaceState(userId);
            num = userDao.updateFaceState(userId);
        } else {
            num=userDao.updateById(sysUserDO);
            num = userDao.updateById(sysUserDO);
        }
        if (num>0) {
        if (num > 0) {
            return R.ok();
        }
        return R.fail();
@@ -383,16 +383,16 @@
        Page page = new Page<>();
        Long pageNum = loginUserInfoVO.getPageNum();
        Long pageSize = loginUserInfoVO.getPageSize();
        if (null==pageNum||0==pageNum) {
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null==pageSize||0==pageSize) {
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<LoginUserInfoVO> iPage = userDao.pageUser(page, loginUserInfoVO);
        iPage.getRecords().forEach(record->{
        iPage.getRecords().forEach(record -> {
            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
            record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
        });
@@ -406,10 +406,10 @@
     */
    @Override
    public R listTag() {
        List<String> list=new ArrayList<>();
        List<String> list = new ArrayList<>();
        List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new LambdaQueryWrapper<>());
        if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
            list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
            list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
        }
        return R.ok(list);
    }
@@ -422,50 +422,50 @@
     */
    @Override
    public R detailUser(Long userId) {
        LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
        if(userId<100000000l){
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        if (userId < 100000000l) {
            SysUserDO sysUserDO = userDao.selectById(userId);
            if (ObjectUtils.isEmpty(sysUserDO)) {
                return R.fail("人员不存在");
            }
            BeanUtils.copyProperties(sysUserDO,loginUserInfoVO);
            BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
            List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
            if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
                List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
                List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
                comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
                    ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
                    BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
                    ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
                    BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
                    comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
                });
                loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
            }

        }else{
        } else {
            //导入社区人员
            SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(userId - 100000000);
            if (ObjectUtils.isEmpty(sysUserInputDO)) {
                return R.fail("人员不存在");
            }
            String name1 = sysUserInputDO.getName();
            BeanUtils.copyProperties(sysUserInputDO,loginUserInfoVO);
            BeanUtils.copyProperties(sysUserInputDO, loginUserInfoVO);
            String doorNumber = sysUserInputDO.getDoorNumber();
            Long areaId = sysUserInputDO.getAreaId();
            List<SysUserInputDO> sysUserInputDOS = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getDoorNumber, doorNumber).eq(SysUserInputDO::getAreaId, areaId));
            if (!ObjectUtils.isEmpty(sysUserInputDOS)) {
                List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
                List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
                sysUserInputDOS.forEach(sysUserInputDO1 -> {
                    String name = sysUserInputDO1.getName();
                    if (name1.equals(name)) {
                        return;
                    }
                    Integer isRent = sysUserInputDO1.getIsRent();
                    ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
                    ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
                    comMngFamilyInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(sysUserInputDO1.getIdCard()));
                    comMngFamilyInfoVO.setName(name);
                    comMngFamilyInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(sysUserInputDO1.getPhone()));
                    if (isRent.intValue()==0) {
                    if (isRent.intValue() == 0) {
                        comMngFamilyInfoVO.setRelationship("家人");
                    }else{
                    } else {
                        comMngFamilyInfoVO.setRelationship("合租");
                    }
                    comMngFamilyInfoVO.setAge(IdCard.IdNOToAge(sysUserInputDO1.getIdCard()));
@@ -475,7 +475,7 @@
            }

        }
        ComActVO comActVO=userDao.selectCommunity(loginUserInfoVO.getCommunityId());
        ComActVO comActVO = userDao.selectCommunity(loginUserInfoVO.getCommunityId());
        if (!ObjectUtils.isEmpty(comActVO)) {
            loginUserInfoVO.setCommunityName(comActVO.getName());
        }
@@ -492,11 +492,11 @@
     */
    @Override
    public R putUserTag(LoginUserInfoVO loginUserInfoVO) {
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        sysUserDO.setTags(loginUserInfoVO.getTags());
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
@@ -510,10 +510,10 @@
     */
    @Override
    public R putUserIsVolunteer(String phone, int type) {
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setIsVolunteer(type);
        int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone));
        if (update>0) {
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
@@ -527,12 +527,12 @@
     */
    @Override
    public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
        if (update > 0) {
            //删除用户信息缓存
            String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
            stringRedisTemplate.delete(userKey);
@@ -556,7 +556,7 @@
        if (!b) {
            return R.fail("身份认证失败：公安系统认证错误");
        }
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setName(name);
        sysUserDO.setIdCard(idCard);
        sysUserDO.setSex(loginUserInfoVO.getSex());
@@ -570,7 +570,7 @@
            return R.fail("身份证已经存在");
        }
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
@@ -597,24 +597,24 @@
        }
        SysUserDO sysUserDO1 = userDao.selectById(userPhoneVO.getUserId());
        String phone = sysUserDO1.getPhone();
        if (!StringUtils.isEmpty(phone)&& !phone.equals(oldPhone)) {
        if (!StringUtils.isEmpty(phone) && !phone.equals(oldPhone)) {
            return R.fail("旧手机号错误");
        }
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        String code = valueOperations.get(key);
        if (!code.equals(smsCode)) {
            if(!smsCode.equals("777333")){
            if (!smsCode.equals("777333")) {
                return R.fail("验证码错误");
            }
        }
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setUserId(userPhoneVO.getUserId());
        sysUserDO.setPhone(newPhone);
        userDao.updateMemberRole(newPhone, oldPhone);
        userDao.updateServiceTeam(newPhone, oldPhone);
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
        	
        if (update > 0) {

            return R.ok();
        }
        return R.fail();
@@ -629,45 +629,45 @@
    @Override
    public R putUser(LoginUserInfoVO loginUserInfoVO) {
        Integer faceState = loginUserInfoVO.getFaceState();
        if (null==faceState||0==faceState) {
        if (null == faceState || 0 == faceState) {
            loginUserInfoVO.setFaceState(null);
        }
        Integer isPartymember = loginUserInfoVO.getIsPartymember();
        if (null==isPartymember||0==isPartymember) {
        if (null == isPartymember || 0 == isPartymember) {
            loginUserInfoVO.setIsPartymember(null);
        }
        Integer isVolunteer = loginUserInfoVO.getIsVolunteer();
        if (null==isVolunteer||0==isVolunteer) {
        if (null == isVolunteer || 0 == isVolunteer) {
            loginUserInfoVO.setIsVolunteer(null);
        }
        Integer operationType = loginUserInfoVO.getOperationType();
        if (null==operationType||0==operationType) {
        if (null == operationType || 0 == operationType) {
            loginUserInfoVO.setOperationType(null);
        }
        Integer sex = loginUserInfoVO.getSex();
        if (null==sex||0==sex) {
        if (null == sex || 0 == sex) {
            loginUserInfoVO.setSex(null);
        }
        Integer status = loginUserInfoVO.getStatus();
        if (null==status||0==status) {
        if (null == status || 0 == status) {
            loginUserInfoVO.setStatus(null);
        }
        Integer type = loginUserInfoVO.getType();
        if (null==type||0==type) {
        if (null == type || 0 == type) {
            loginUserInfoVO.setType(null);
        }
        Long communityId = loginUserInfoVO.getCommunityId();
        if (null==communityId||0==communityId) {
        if (null == communityId || 0 == communityId) {
            loginUserInfoVO.setCommunityId(null);
        }
        String faceUrl = loginUserInfoVO.getFaceUrl();
        if (!ObjectUtils.isEmpty(faceUrl)) {
            loginUserInfoVO.setFaceState(0);
        }
        SysUserDO sysUserDO=new SysUserDO();
        BeanUtils.copyProperties(loginUserInfoVO,sysUserDO);
        SysUserDO sysUserDO = new SysUserDO();
        BeanUtils.copyProperties(loginUserInfoVO, sysUserDO);
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
@@ -681,12 +681,12 @@
     */
    @Override
    public R listFamily(Long userId) {
        List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
        List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
        List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
        if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
            comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
                ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
                BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
                ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
                BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
                comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
            });
        }
@@ -701,14 +701,14 @@
     */
    @Override
    public R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
        ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
        BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO);
        ComMngFamilyInfoDO comMngFamilyInfoDO = new ComMngFamilyInfoDO();
        BeanUtils.copyProperties(comMngFamilyInfoVO, comMngFamilyInfoDO);
        ComMngFamilyInfoDO comMngFamilyInfoDO1 = comMngFamilyInfoDAO.selectOne(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getIdCard, comMngFamilyInfoVO.getIdCard()).eq(ComMngFamilyInfoDO::getUserId, comMngFamilyInfoVO.getUserId()));
        if (!ObjectUtils.isEmpty(comMngFamilyInfoDO1)) {
            return R.fail("家庭成员已经存在");
        }
        int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO);
        if (insert>0) {
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
@@ -722,10 +722,10 @@
     */
    @Override
    public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
        ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
        BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO);
        ComMngFamilyInfoDO comMngFamilyInfoDO = new ComMngFamilyInfoDO();
        BeanUtils.copyProperties(comMngFamilyInfoVO, comMngFamilyInfoDO);
        int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO);
        if (update>0) {
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
@@ -740,23 +740,29 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addUserBackstage(AdministratorsUserVO administratorsUserVO) {
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        Long roleId = administratorsUserVO.getRoleId();
        Long communityId = administratorsUserVO.getCommunityId();
        if (roleId.intValue()==999999999) {
        if (roleId.intValue() == 999999999 || roleId.intValue() == 888888888) {
            Long communityId = administratorsUserVO.getCommunityId();
            //新增社区高级管理员角色
            SysRoleDO sysRoleDO=new SysRoleDO();
            sysRoleDO.setCommunityId(communityId);
            sysRoleDO.setRoleName("超级管理员");
            sysRoleDO.setRoleKey("chaojiguanliyuan"+communityId);
            SysRoleDO sysRoleDO = new SysRoleDO();
            if(roleId.intValue() == 999999999){
                sysRoleDO.setCommunityId(communityId);
                sysRoleDO.setRoleName("超级管理员");
                sysRoleDO.setRoleKey("chaojiguanliyuan" + communityId);
            }else{
                sysRoleDO.setCommunityId(0L);
                sysRoleDO.setRoleName(administratorsUserVO.getShopStoreName());
                sysRoleDO.setRoleKey("shanghupingtai" + administratorsUserVO.getShopStorePhone());
            }
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert>0) {
            if (insert > 0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
                roleId=sysRoleDO1.getRoleId();
                roleId = sysRoleDO1.getRoleId();
                //新角色设置所有权限
                MenuRoleVO menuRoleVO=new MenuRoleVO();
                MenuRoleVO menuRoleVO = new MenuRoleVO();
                menuRoleVO.setIsAll(1);
                menuRoleVO.setCommunityId(communityId);
                menuRoleVO.setRoleId(roleId);
@@ -769,28 +775,28 @@
        }
        String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
        administratorsUserVO.setPassword(encode);
        BeanUtils.copyProperties(administratorsUserVO,sysUserDO);
        BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("新增后台用户报错【{}】",e.getMessage());
            log.error("新增后台用户报错【{}】", e.getMessage());
            if (e.getMessage().contains("union_phone_type")) {
                throw new ServiceException("手机号已经存在");
            }else if(e.getMessage().contains("union_account_type")){
            } else if (e.getMessage().contains("union_account_type")) {
                throw new ServiceException("账户已经存在");
            }

        }
        if (insert>0) {
        if (insert > 0) {
            SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
            Long userId = sysUserDO1.getUserId();
            SysUserRoleDO sysUserRoleDO=new SysUserRoleDO();
            SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
            sysUserRoleDO.setUserId(userId);
            sysUserRoleDO.setRoleId(roleDO.getRoleId());
            int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
            if (insert1>0) {
            if (insert1 > 0) {
                return R.ok();
            }
        }
@@ -805,7 +811,7 @@
     */
    @Transactional(rollbackFor = Exception.class)
    public R putMenuRole(MenuRoleVO menuRoleVO) {
        List<Long>menuIds=new ArrayList<>();
        List<Long> menuIds = new ArrayList<>();
        Long roleId = menuRoleVO.getRoleId();
        Integer isAll = menuRoleVO.getIsAll();
        Long communityId = menuRoleVO.getCommunityId();
@@ -839,9 +845,9 @@

//        获取所有权限id
        List<SysMenuDO> menuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2l).orderByAsc(SysMenuDO::getOrderNum));
        menuIds=menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
        for(int i=0;i<menuIds.size();i++){
            SysRoleMenuDO sysRoleMenuDO=new SysRoleMenuDO();
        menuIds = menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
        for (int i = 0; i < menuIds.size(); i++) {
            SysRoleMenuDO sysRoleMenuDO = new SysRoleMenuDO();
            sysRoleMenuDO.setMenuId(menuIds.get(i));
            sysRoleMenuDO.setRoleId(roleId);
            sysRoleMenuDAO.insert(sysRoleMenuDO);
@@ -858,11 +864,11 @@
     */
    @Override
    public R putUserBackstage(AdministratorsUserVO administratorsUserVO) {
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        Long roleId = administratorsUserVO.getRoleId();
        SysRoleDO roleDO=null;
        if (null!=roleId&&0!=roleId) {
             roleDO = roleDAO.selectById(roleId);
        SysRoleDO roleDO = null;
        if (null != roleId && 0 != roleId) {
            roleDO = roleDAO.selectById(roleId);
            if (ObjectUtils.isEmpty(roleDO)) {
                return R.fail("角色不存在");
            }
@@ -872,24 +878,24 @@
            String encode = new BCryptPasswordEncoder().encode(password);
            administratorsUserVO.setPassword(encode);
        }
        BeanUtils.copyProperties(administratorsUserVO,sysUserDO);
        int update=0;
        BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
        int update = 0;
        try {
             update = userDao.updateById(sysUserDO);
            update = userDao.updateById(sysUserDO);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("编辑后台用户出错【{}】",e.getMessage());
            log.error("编辑后台用户出错【{}】", e.getMessage());
            if (e.getMessage().contains("union_phone_type")) {
                return R.fail("此手机号已被占用，请更换其他手机号码");
            }
        }
        if (update>0&&null!=roleDO) {
            SysUserRoleDO sysUserRoleDO=new SysUserRoleDO();
        if (update > 0 && null != roleDO) {
            SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
            sysUserRoleDO.setRoleId(roleDO.getRoleId());
            int update1 = sysUserRoleDAO.update(sysUserRoleDO,new UpdateWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId,administratorsUserVO.getUserId()));
            if (update1>0) {
            int update1 = sysUserRoleDAO.update(sysUserRoleDO, new UpdateWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId, administratorsUserVO.getUserId()));
            if (update1 > 0) {
                return R.ok();
            }else{
            } else {
                sysUserRoleDO.setUserId(administratorsUserVO.getUserId());
                sysUserRoleDAO.insert(sysUserRoleDO);
            }
@@ -913,15 +919,15 @@
        }
        Long communityId = sysUserDO.getCommunityId();
        Long communityId1 = administratorsUserVO.getCommunityId();
        if (communityId1.intValue()!=communityId.intValue()) {
        if (communityId1.intValue() != communityId.intValue()) {
            return R.fail("用户不属于当前平台");
        }
        //删除用户
        int delete = userDao.deleteById(userId);
        //删除用户角色关系
        if (delete>0) {
        if (delete > 0) {
            int delete1 = sysUserRoleDAO.delete(new QueryWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId, userId));
            if (delete1==0) {
            if (delete1 == 0) {
                return R.fail("用户没有角色关系");
            }
        }
@@ -939,10 +945,10 @@
        Page page = new Page<>();
        Long pageNum = administratorsUserVO.getPageNum();
        Long pageSize = administratorsUserVO.getPageSize();
        if (null==pageNum||pageNum==0) {
        if (null == pageNum || pageNum == 0) {
            pageNum = 1l;
        }
        if (null==pageSize||pageSize==0) {
        if (null == pageSize || pageSize == 0) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
@@ -959,13 +965,13 @@
     */
    @Override
    public R addOperLog(SysOperLogVO operlog) {
        SysOperLogDO sysOperLogDO=new SysOperLogDO();
        BeanUtils.copyProperties(operlog,sysOperLogDO);
        SysOperLogDO sysOperLogDO = new SysOperLogDO();
        BeanUtils.copyProperties(operlog, sysOperLogDO);
        int insert = sysOperLogDAO.insert(sysOperLogDO);
        if (insert>0) {
        if (insert > 0) {
            return R.ok();
        }
       return R.fail();
        return R.fail();
    }

    /**
@@ -979,10 +985,10 @@
        Page page = new Page<>();
        Long pageNum = sysOperLogVO.getPageNum();
        Long pageSize = sysOperLogVO.getPageSize();
        if (null==pageNum||pageNum==0) {
        if (null == pageNum || pageNum == 0) {
            pageNum = 1l;
        }
        if (null==pageSize||pageSize==0) {
        if (null == pageSize || pageSize == 0) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
@@ -1002,10 +1008,10 @@
        if (ObjectUtils.isEmpty(sysUserAgreementDOS)) {
            return R.fail();
        }
        List<SysUserAgreementVO> sysUserAgreementVOS=new ArrayList<>();
        List<SysUserAgreementVO> sysUserAgreementVOS = new ArrayList<>();
        sysUserAgreementDOS.forEach(sysUserAgreementDO -> {
            SysUserAgreementVO sysUserAgreementVO=new SysUserAgreementVO();
            BeanUtils.copyProperties(sysUserAgreementDO,sysUserAgreementVO);
            SysUserAgreementVO sysUserAgreementVO = new SysUserAgreementVO();
            BeanUtils.copyProperties(sysUserAgreementDO, sysUserAgreementVO);
            sysUserAgreementVOS.add(sysUserAgreementVO);
        });
        return R.ok(sysUserAgreementVOS);
@@ -1019,10 +1025,10 @@
     */
    @Override
    public R putAgreement(SysUserAgreementVO sysUserAgreementVO) {
        SysUserAgreementDO sysUserAgreementDO=new SysUserAgreementDO();
        BeanUtils.copyProperties(sysUserAgreementVO,sysUserAgreementDO);
        SysUserAgreementDO sysUserAgreementDO = new SysUserAgreementDO();
        BeanUtils.copyProperties(sysUserAgreementVO, sysUserAgreementDO);
        int update = sysUserAgreementDAO.updateById(sysUserAgreementDO);
        if (update==0) {
        if (update == 0) {
            return R.fail("协议不存在");
        }
        return R.ok();
@@ -1040,10 +1046,10 @@
        if (ObjectUtils.isEmpty(comMngUserTagDOS)) {
            return R.fail();
        }
        List<ComMngUserTagVO> comMngUserTagVOList=new ArrayList<>();
        List<ComMngUserTagVO> comMngUserTagVOList = new ArrayList<>();
        comMngUserTagDOS.forEach(comMngUserTagDO -> {
            ComMngUserTagVO comMngUserTagVO=new ComMngUserTagVO();
            BeanUtils.copyProperties(comMngUserTagDO,comMngUserTagVO);
            ComMngUserTagVO comMngUserTagVO = new ComMngUserTagVO();
            BeanUtils.copyProperties(comMngUserTagDO, comMngUserTagVO);
            comMngUserTagVOList.add(comMngUserTagVO);
        });
        return R.ok(comMngUserTagVOList);
@@ -1063,13 +1069,13 @@
        if (!ObjectUtils.isEmpty(comMngUserTagVOList)) {
            comMngUserTagDAO.delete(null);
            comMngUserTagVOList.forEach(comMngUserTagVO -> {
                ComMngUserTagDO comMngUserTagDO=new ComMngUserTagDO();
                ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
                comMngUserTagDO.setCommunityId(communityId);
                comMngUserTagDO.setTagName(comMngUserTagVO.getTagName());
                comMngUserTagDAO.insert(comMngUserTagDO);
            });
            return R.ok();
        }else {
        } else {
            return R.fail("用户标签不能为空");
        }

@@ -1102,11 +1108,11 @@
    public R putUserAppletsBackstage(PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) {
        Long userId = pageUserAppletsBackstageDTO.getUserId();
        Integer status = pageUserAppletsBackstageDTO.getStatus();
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setUserId(userId);
        sysUserDO.setStatus(status);
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
        if (update > 0) {
            return R.ok();
        }
        return R.fail("用户不存在");
@@ -1120,8 +1126,8 @@
     */
    @Override
    public R deleteUserTest(Long userId) {
        int num=userDao.deleteUserTest(userId);
        if (num>0) {
        int num = userDao.deleteUserTest(userId);
        if (num > 0) {
            return R.ok();
        }
        return R.fail("清除失败");
@@ -1147,11 +1153,11 @@
     */
    @Override
    public R addFeedback(SysUserFeedbackDTO sysUserFeedbackDTO) {
        SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO();
        BeanUtils.copyProperties(sysUserFeedbackDTO,sysUserFeedbackDO);
        SysUserFeedbackDO sysUserFeedbackDO = new SysUserFeedbackDO();
        BeanUtils.copyProperties(sysUserFeedbackDTO, sysUserFeedbackDO);
        sysUserFeedbackDO.setPhotoPath(sysUserFeedbackDTO.getPhotoPah());
        int insert = sysUserFeedbackDAO.insert(sysUserFeedbackDO);
        if (insert>0) {
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
@@ -1165,13 +1171,13 @@
     */
    @Override
    public R pageNotice(PageDTO pageDTO) {
        Long userId=pageDTO.getUserId();
        Long userId = pageDTO.getUserId();
        Integer type = pageDTO.getType();
        int integer =0;
        if (null!=type&&type.intValue()>0) {
            integer=sysUserNoticeDAO.selectCount(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0).eq(SysUserNoticeDO::getType,type));
        }else{
            integer=sysUserNoticeDAO.selectCount(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0));
        int integer = 0;
        if (null != type && type.intValue() > 0) {
            integer = sysUserNoticeDAO.selectCount(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0).eq(SysUserNoticeDO::getType, type));
        } else {
            integer = sysUserNoticeDAO.selectCount(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0));
        }
        Page page = new Page<>();
        Long pageNum = pageDTO.getPageNum();
@@ -1179,9 +1185,9 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<SysUserNoticeVO> iPage = userDao.pageNotice(page, pageDTO);
        Map<String,Object> map=new HashMap<>(2);
        map.put("page",iPage);
        map.put("unreadNum",integer);
        Map<String, Object> map = new HashMap<>(2);
        map.put("page", iPage);
        map.put("unreadNum", integer);
        return R.ok(map);
    }

@@ -1195,20 +1201,20 @@
    public R putNotice(NoticeReadDTO noticeReadDTO) {
        Integer all = noticeReadDTO.getAll();
        Long userId = noticeReadDTO.getUserId();
        int num=0;
        SysUserNoticeDO sysUserNoticeDO=new SysUserNoticeDO();
        if (null!=all&&1==all.intValue()) {
        int num = 0;
        SysUserNoticeDO sysUserNoticeDO = new SysUserNoticeDO();
        if (null != all && 1 == all.intValue()) {
            sysUserNoticeDO.setStatus(1);
            num=sysUserNoticeDAO.update(sysUserNoticeDO,new UpdateWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId,userId).eq(SysUserNoticeDO::getStatus,0));
        }else{
            num = sysUserNoticeDAO.update(sysUserNoticeDO, new UpdateWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0));
        } else {
            sysUserNoticeDO.setId(noticeReadDTO.getId());
            sysUserNoticeDO.setStatus(1);
            num=sysUserNoticeDAO.updateById(sysUserNoticeDO);
            num = sysUserNoticeDAO.updateById(sysUserNoticeDO);
        }
        if (num>0) {
        if (num > 0) {
            return R.ok();
        }
       return R.fail("通知不存在");
        return R.fail("通知不存在");
    }

    /**
@@ -1236,16 +1242,16 @@
     */
    @Override
    public R noticeUnreadNum(Long userId) {
        NoticeUnReadVO noticeUnReadVO=sysUserNoticeDAO.noticeUnreadNum(userId);
        List<SysUserNoticeVO> sysUserNoticeVOList=new ArrayList<>();
        NoticeUnReadVO noticeUnReadVO = sysUserNoticeDAO.noticeUnreadNum(userId);
        List<SysUserNoticeVO> sysUserNoticeVOList = new ArrayList<>();
        List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt));
        if (!ObjectUtils.isEmpty(sysUserNoticeDOS)) {
            List<Integer> typeList=new ArrayList<>(4);
            List<Integer> typeList = new ArrayList<>(4);
            sysUserNoticeDOS.forEach(sysUserNoticeDO -> {
                Integer type = sysUserNoticeDO.getType();
                if (!typeList.contains(type)) {
                    SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
                    BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO);
                    SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                    BeanUtils.copyProperties(sysUserNoticeDO, sysUserNoticeVO);
                    sysUserNoticeVOList.add(sysUserNoticeVO);
                    typeList.add(type);
                }
@@ -1263,7 +1269,7 @@
     */
    @Override
    public R detailFeedback(Long id) {
        SysUserFeedbackVO sysUserFeedbackVO=sysUserFeedbackDAO.detailFeedback(id);
        SysUserFeedbackVO sysUserFeedbackVO = sysUserFeedbackDAO.detailFeedback(id);
        return R.ok(sysUserFeedbackVO);
    }

@@ -1274,13 +1280,13 @@
     */
    @Override
    public R dataKanban() {
        IndexDataKanbanVO indexDataKanbanVO=userDao.selectIndexDataKanban();
        List<DataKanbanDTO> dataKanbanDTOS=userDao.selectCommunityUserOrder();
        IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
        List<DataKanbanDTO> dataKanbanDTOS = userDao.selectCommunityUserOrder();

        List<String> communityUserX=new ArrayList<>();
        List<Integer> communityUserY=new ArrayList<>();
        List<String> communityActiveUserX=new ArrayList<>();
        List<Integer> communityActiveUserY=new ArrayList<>();
        List<String> communityUserX = new ArrayList<>();
        List<Integer> communityUserY = new ArrayList<>();
        List<String> communityActiveUserX = new ArrayList<>();
        List<Integer> communityActiveUserY = new ArrayList<>();
        if (!ObjectUtils.isEmpty(dataKanbanDTOS)) {
            dataKanbanDTOS.forEach(dataKanbanDTO -> {
                communityUserX.add(dataKanbanDTO.getName());
@@ -1288,11 +1294,11 @@
            });
        }
//        获取最近七天数据
        List<Date> serverndays=this.getServenDays();
        List<Date> serverndays = this.getServenDays();
        serverndays.forEach(date -> {
            //        查询社区活动数量
            DataKanbanDTO dataKanbanDTO=userDao.selectCommunityActiveUserOrder(date);
            communityActiveUserX.add(DateFormatUtils.format(date,"MM-dd"));
            DataKanbanDTO dataKanbanDTO = userDao.selectCommunityActiveUserOrder(date);
            communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
            communityActiveUserY.add(dataKanbanDTO.getNum());
        });
        indexDataKanbanVO.setCommunityActiveUserX(communityActiveUserX);
@@ -1304,13 +1310,14 @@

    /**
     * 获取最近七天数据
     *
     * @return
     */
    private List<Date> getServenDays() {
        List<Date>dates=new ArrayList<>();
        Date date=new Date();
        for(int i=6;i>=0;i--){
            Date date1= DateUtils.addDays(date,-i);
        List<Date> dates = new ArrayList<>();
        Date date = new Date();
        for (int i = 6; i >= 0; i--) {
            Date date1 = DateUtils.addDays(date, -i);
            dates.add(date1);
        }
        return dates;
@@ -1324,7 +1331,7 @@
     */
    @Override
    public R indexDataCommunityBackstage(Long communityId) {
        IndexDataVO indexDataVO=userDao.indexDataCommunityBackstage(communityId);
        IndexDataVO indexDataVO = userDao.indexDataCommunityBackstage(communityId);
        return R.ok(indexDataVO);
    }

@@ -1335,9 +1342,9 @@
     */
    @Override
    public R timedTaskContinuousLandingDays() {
        int num=userDao.timedTaskContinuousLandingDays();
        if (num>0) {
            log.info("定时任务维护用户持续登录时间，维护用户数量【{}】",num);
        int num = userDao.timedTaskContinuousLandingDays();
        if (num > 0) {
            log.info("定时任务维护用户持续登录时间，维护用户数量【{}】", num);
        }
        return R.ok();
    }
@@ -1350,10 +1357,10 @@
     */
    @Override
    public R addNotice(SysUserNoticeVO sysUserNoticeVO) {
        SysUserNoticeDO sysUserNoticeDO=new SysUserNoticeDO();
        BeanUtils.copyProperties(sysUserNoticeVO,sysUserNoticeDO);
        SysUserNoticeDO sysUserNoticeDO = new SysUserNoticeDO();
        BeanUtils.copyProperties(sysUserNoticeVO, sysUserNoticeDO);
        int insert = sysUserNoticeDAO.insert(sysUserNoticeDO);
        if (insert>0) {
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
@@ -1367,11 +1374,11 @@
     */
    @Override
    public R updateUserIsPartymember(String idCard) {
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setIsPartymember(1);
        int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
        if (update>0) {
            log.info("新增党员修改用户党员状态成功 身份证号【{}】",idCard);
        if (update > 0) {
            log.info("新增党员修改用户党员状态成功 身份证号【{}】", idCard);
            return R.ok();
        }
        return R.fail();
@@ -1389,8 +1396,8 @@
        if (ObjectUtils.isEmpty(sysUserAgreementDO)) {
            return R.fail("协议不存在");
        }
        SysUserAgreementVO sysUserAgreementVO=new SysUserAgreementVO();
        BeanUtils.copyProperties(sysUserAgreementDO,sysUserAgreementVO);
        SysUserAgreementVO sysUserAgreementVO = new SysUserAgreementVO();
        BeanUtils.copyProperties(sysUserAgreementDO, sysUserAgreementVO);
        return R.ok(sysUserAgreementVO);
    }

@@ -1402,11 +1409,11 @@
     */
    @Override
    public R putUserLastLoginTime(Long userId) {
        SysUserDO sysUserDO=new SysUserDO();
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setUserId(userId);
        sysUserDO.setLastLoginTime(new Date());
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
@@ -1421,7 +1428,7 @@
    @Override
    public R deleteFeedback(Long id) {
        int delete = sysUserFeedbackDAO.deleteById(id);
        if (delete>0) {
        if (delete > 0) {
            return R.ok();
        }
        return R.fail();
@@ -1435,15 +1442,15 @@
     */
    @Override
    public R checkAereaName(String areaName) {
        Integer num=userDao.selectCountArea(areaName);
        if (num>0) {
        Integer num = userDao.selectCountArea(areaName);
        if (num > 0) {
            Integer integer = userDao.selectCountHouse(areaName);
            if (integer>0) {
            if (integer > 0) {
                return R.ok();
            }else{
            } else {
                return R.fail("小区房屋信息未创建,请先在社区平台添加房屋信息");
            }
        }else{
        } else {
            return R.fail("小区不存在,请先在社区平台添加小区");
        }
    }
@@ -1456,7 +1463,7 @@
     */
    @Override
    public CommunityUserInfoVO detailUserComunity(Long userId) {
        CommunityUserInfoVO communityUserInfoVO=new CommunityUserInfoVO();
        CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
        SysUserDO sysUserDO = userDao.selectById(userId);
        if (!ObjectUtils.isEmpty(sysUserDO)) {
            String idCard = sysUserDO.getIdCard();
@@ -1477,18 +1484,18 @@
                communityUserInfoVO.setVolunteerCreateAt(comMngVolunteerMngVO.getCreateAt());
            }
            Integer isPartymember = sysUserDO.getIsPartymember();
            if (isPartymember.intValue()==1) {
            if (isPartymember.intValue() == 1) {
                communityUserInfoVO.setPoliticalOutlook(1);
            }else{
            } else {
                communityUserInfoVO.setPoliticalOutlook(3);
            }
            communityUserInfoVO.setIsVolunteer(sysUserDO.getIsVolunteer());
            List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
            if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
                List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
                List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
                comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
                    ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
                    BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
                    ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
                    BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
                    comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
                });
                communityUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
@@ -1505,18 +1512,18 @@
     */
    @Override
    public R export(ExportUserDTO exportUserDTO) {
        List<EexcelUserDTO> eexcelUserDTOS=userDao.selectExport(exportUserDTO);
        List<EexcelUserDTO> eexcelUserDTOS = userDao.selectExport(exportUserDTO);
        return R.ok(eexcelUserDTOS);
    }

    @Override
    public R getSysUserVOByPhone(String phone) {
        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone));
        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone));
        if (ObjectUtils.isEmpty(sysUserDO)) {
            return R.fail("用户不存在");
        }
        SysUserVO sysUserVO = new SysUserVO();
        BeanUtils.copyProperties(sysUserDO,sysUserVO);
        BeanUtils.copyProperties(sysUserDO, sysUserVO);
        return R.ok(sysUserVO);
    }

@@ -1524,10 +1531,10 @@
//        String encode = new BCryptPasswordEncoder().encode("lbsq123456");
//        System.out.println(encode);

        List<Date>dates=new ArrayList<>();
        Date date=new Date();
        for(int i=6;i>=0;i--){
            Date date1= DateUtils.addDays(date,-i);
        List<Date> dates = new ArrayList<>();
        Date date = new Date();
        for (int i = 6; i >= 0; i--) {
            Date date1 = DateUtils.addDays(date, -i);
            dates.add(date1);
        }
        System.out.println(dates);
@@ -1544,10 +1551,10 @@
     */
    @Override
    public R listTags(Long communityId) {
        List<String> list=new ArrayList<>();
        List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag",1).or().eq("community_id",communityId));
        List<String> list = new ArrayList<>();
        List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
        if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
            list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
            list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
        }
        return R.ok(list);
    }