Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 e3c5378b79d23f4cebb4059c78bfbdd32cd5a2f9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -9,6 +9,7 @@
import com.panzhihua.common.model.vos.MenuVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -165,6 +166,15 @@
     */
    @PostMapping("putuserisvolunteer")
    R putUserIsVolunteer(@RequestParam("phone") String phone,@RequestParam("type")int type);


    /**
     * 修改用户志愿者状态
     * @param userId 用户ID
     * @param type 1 支援者  0不是志愿者
     */
    @PostMapping("putuserisvolunteerbyid")
    R putUserIsVolunteerById(@RequestParam("userId") Long userId,@RequestParam("type")int type);

    /**
     * 用户绑定社区、小区
@@ -540,6 +550,14 @@
    @GetMapping("getUserByPhone")
    R getSysUserVOByPhone(@RequestParam(value = "phone") String phone);

    /**
     * 通过账号查询用户信息
     * @param account
     * @return
     */
    @GetMapping("getUserByAccount")
    R getSysUserVOByAccountAndType(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type);


    /**
     * 基础数据》居民管理》居民列表
@@ -604,7 +622,7 @@
     * @return
     */
    @PostMapping("common/data/special/tags/page")
    R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO);
    R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO);

    /**
     * 新增或修改特殊群体标签
@@ -629,4 +647,35 @@
     */
    @PostMapping("/common/data/special/export")
    R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO);

    /**
     * 查询所有人员标签
     * @return 标签集合
     */
    @PostMapping("listtag/getTag")
    R listTags(@RequestParam("communityId") Long communityId);

    /**
     * 添加SysUser信息
     * @param storeVO   sysUser信息
     * @return  添加sysUser结果
     */
    @PostMapping("addSysUser")
    R addSysUser(@RequestBody ShopStoreVO storeVO);

    /**
     * 修改SysUser信息
     * @param storeVO   sysUser信息
     * @return  修改结果
     */
    @PostMapping("editSysUser")
    R editSysUser(@RequestBody ShopStoreVO storeVO);

    /**
     * 修改用户小程序首页活动提示
     * @param userEditTipsDTO  请求参数
     * @return  修改结果
     */
    @PostMapping("editUserTips")
    R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO);
}