修复bug

huanghongfa

2021-04-27 cf3b4b7fc95fd5b83cae6842e8c24b99e70068e0

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -8,10 +8,12 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
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 com.panzhihua.service_user.service.SysUserInputService;
import com.panzhihua.service_user.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -187,6 +189,16 @@
    @PostMapping("putuserisvolunteer")
    R putUserIsVolunteer(@RequestParam("phone")String phone,@RequestParam("type")int type){
        return userService.putUserIsVolunteer(phone,type);
    }

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

    /**
@@ -611,13 +623,13 @@
    }

    /**
     * 通过账号查询用户信息
     * 通过账号和渠道查询用户信息
     * @param account
     * @return
     */
    @GetMapping("getUserByAccount")
    public R getSysUserVOByAccount(@RequestParam(value = "account") String account){
        return userService.getSysUserVOByAccount(account);
    public R getSysUserVOByAccount(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type){
        return userService.getSysUserVOByAccount(account, type);
    }

    /**
@@ -744,4 +756,54 @@
    R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO) {
        return sysUserInputService.specialUserExport(exportSpecialUserDTO);
    }

    /**
     * 创建SysUser用户信息以及权限
     * @param storeVO   请求参数
     * @return  创建结果
     */
    @PostMapping("addSysUser")
    public R addSysUser(@RequestBody ShopStoreVO storeVO){
        return userService.addSysUser(storeVO);
    }

    /**
     * 修改SysUser用户信息
     * @param storeVO   请求参数
     * @return  修改结果
     */
    @PostMapping("editSysUser")
    public R editSysUser(@RequestBody ShopStoreVO storeVO){
        return userService.editSysUser(storeVO);
    }

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

    /**
     * 获取用户电子档案
     * @param userId 家庭成员信息
     * @return 结果
     */
    @GetMapping("getUserArchives")
    public R getUserArchives(@RequestParam("userId") Long userId){
        return userService.getUserArchives(userId);
    }

    /**
     * 编辑用户电子档案
     * @param userArchivesVO 编辑的信息
     * @return 编辑结果
     */
    @PostMapping("updateUserArchives")
    public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO){
        return userService.updateUserArchives(userArchivesVO);
    }
}