bug修改

101captain

2022-07-21 1e586a8778838c24cd2cfdfdcf18ab0132b6b09f

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

@@ -4,6 +4,15 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.model.dtos.PageDTO;
@@ -137,6 +146,18 @@
    }

    /**
     * 批量重置密码
     *
     * @param userId
     *            新密码
     * @return 修改结果
     */
    @GetMapping("resetPasswordPatch")
    public R resetPasswordPatch(@RequestParam("userIds") Long[] userId,@RequestParam("password")String password) {
        return userService.resetPasswordPatch(userId,password);
    }

    /**
     * 某社区后台人员查询
     *
     * @param param
@@ -152,7 +173,7 @@

    /**
     * 微心愿搜索社区团队人员列表
     * 
     *
     * @param param
     *            请求参数
     * @param communityId
@@ -228,7 +249,7 @@
     * @return 人员详情
     */
    @PostMapping("detailuser")
    public R detailUser(@RequestParam("userId") Long userId) {
    public R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId) {
        return userService.detailUser(userId);
    }

@@ -378,6 +399,18 @@
    @PostMapping("putuserbackstage")
    R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
        return userService.putUserBackstage(administratorsUserVO);
    }

    /**
     * 更新
     *
     * @param administratorsUserVO
     *            编辑账户内容
     * @return 编辑结果
     */
    @PostMapping("updateStreet")
    R updateStreet(@RequestBody AdministratorsUserVO administratorsUserVO) {
        return userService.updateStreetId(administratorsUserVO);
    }

    /**
@@ -531,8 +564,8 @@
     * @return 协议内容
     */
    @PostMapping("useragreement")
    public R userAgreement(@RequestParam("type") int type) {
        return userService.userAgreement(type);
    public R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId) {
        return userService.userAgreement(type,appId);
    }

    /**
@@ -613,8 +646,8 @@
     * @return 运营后台数据看板
     */
    @PostMapping("datakanban")
    public R dataKanban() {
        return userService.dataKanban();
    public R dataKanban(@RequestParam("areaCode")String areaCode) {
        return userService.dataKanban(areaCode);
    }

    /**
@@ -663,9 +696,14 @@
        return userService.updateUserIsPartymember(idCard);
    }

    @PostMapping("updateuserispartymemberByPhone")
    public R updateUserIsPartymemberByPhone(@RequestParam("phone") String phone) {
        return userService.updateUserIsPartymemberByPhone(phone);
    }

    /**
     * 修改用户为非党员状态
     * 
     *
     * @param idCard
     *            身份证号
     * @return 修改结果
@@ -1011,7 +1049,7 @@

    /**
     * 修改app用户密码
     * 
     *
     * @param userInfoAppDTO
     *            请求参数
     * @return 修改结果
@@ -1023,7 +1061,7 @@

    /**
     * 添加网格员
     * 
     *
     * @param eventGridMemberAddDTO
     *            请求参数
     * @return 结果
@@ -1035,7 +1073,7 @@

    /**
     * 网格员管理
     * 
     *
     * @param memberRelationDTO
     *            请求参数
     * @return 网格员列表
@@ -1047,7 +1085,7 @@

    /**
     * 修改网格员信息
     * 
     *
     * @param gridMemberDTO
     *            请求参数
     * @return 修改结果
@@ -1059,7 +1097,7 @@

    /**
     * 重置网格员密码
     * 
     *
     * @param gridMemberDTO
     *            请求参数
     * @return 重置结果
@@ -1071,7 +1109,7 @@

    /**
     * 批量删除网格员
     * 
     *
     * @param Ids
     *            网格员id集合
     * @return 删除结果
@@ -1093,7 +1131,7 @@

    /**
     * 查询社区的收益说明
     * 
     *
     * @param communityId
     *            社区id
     * @return 收益说明
@@ -1115,7 +1153,7 @@

    /**
     * 根据用户id查询用户openid
     * 
     *
     * @param userId
     *            用户id
     * @return openid
@@ -1127,7 +1165,7 @@

    /**
     * 查询社区后台工作人员列表
     * 
     *
     * @param communityId
     *            社区id
     * @return 社区后台工作人员列表
@@ -1147,4 +1185,249 @@
    public R checkCurrentUserIsTeam(String phone, Long communityId) {
        return userService.checkCurrentUserIsTeam(phone, communityId);
    }

    /**
     * 便民服务新增商家账号
     * @param convenientMerchantDTO
     * @return 商家用户id
     */
    @PostMapping("insertMerchantAccount")
    public R addConvenientMerchantUser(@RequestBody ConvenientMerchantDTO convenientMerchantDTO) {
        return userService.addConvenientMerchantUser(convenientMerchantDTO);
    }

    /**
     * 修改便民服务商家绑定账号
     * @param userId 用户id
     * @param account 修改账户
     * @return 修改结果
     */
    @PutMapping("putMerchantUserAccount")
    public R putUserAccount(@RequestParam("userId") Long userId, @RequestParam("account") String account) {
        return userService.putUserAccount(userId, account);
    }

    /**
     * 禁用/启用便民服务商家用户
     * @param disableOrEnableConvenientMerchantDTO
     * @return
     */
    @PutMapping("disableOrEnableMerchantUsers")
    public R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
        return userService.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO);
    }

    /**
     * 根据openid维护社区团队里是否注册
     * @param openid    用户微信唯一标识
     */
    @PostMapping("judgeCommunityTeam")
    public void judgeCommunityTeam(@RequestParam("openid") String openid) {
        userService.judgeCommunityTeam(openid);
    }

    /**
     * 数据看板升级版
     *
     * @return 运营后台数据看板升级版
     */
    @PostMapping("datakanbans")
    public R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto) {
        return userService.dataKanBans(dataKanBansDto);
    }

    /**
     * 运营后台-用户数据统计汇总
     * @return  用户数据统计汇总
     */
    @GetMapping("community/statistics")
    public R communityStatistics(@RequestParam("areaCode") String areaCode) {
        return userService.communityStatistics(areaCode);
    }

    @GetMapping("community/statistics/export")
    public R communityStatisticsExport(@RequestParam("areaCode") String areaCode) {
        return userService.communityStatisticsExport(areaCode);
    }

    /**
     * 通过UnionId获取用户信息
     * @param unionId
     * @return
     */
    @GetMapping("/getByUnionId")
    public R getUserInfoByUnionId(@RequestParam("unionId") String unionId) {
        return userService.getUserInfoByUnionId(unionId);
    }

    /**
     * 微商业街新增商家账号
     * @param mcsMerchantDTO
     * @return 商家用户id
     */
    @PostMapping("insertMcsMerchantAccount")
    public R addMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO) {
        return userService.addMcsMerchantUser(mcsMerchantDTO);
    }

    /**
     * 微商业街修改商家账号
     * @param mcsMerchantDTO
     * @return
     */
    @PutMapping("putMcsMerchantUser")
    public R putMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO) {
        return userService.putMcsMerchantUser(mcsMerchantDTO);
    }

    /**
     * 检查用户是否有效
     * @param userId
     * @param type
     * @return
     */
    @PutMapping("checkUserIsValid")
    public Boolean checkUserIsValid(@RequestParam("userId") Long userId, @RequestParam("type") Integer type) {
        return userService.checkUserIsValid(userId, type);
    }

    /**
     * 根据手机号、用户类型查询用户
     * @param phone
     * @param type
     * @return
     */
    @GetMapping("/getSysUserByPhone")
    public R getSysUserByPhone(@RequestParam("phone") String phone, @RequestParam("type") Integer type) {
        return userService.getSysUserByPhone(phone, type);
    }

    /**
     * 发送验证码
     * @param phone 手机号
     * @param clientIP 用户ip
     * @param prefixKey redis Key 前缀
     * @param limit 获取次数限制
     * @param timeout 超次数获取时间等待
     * @return
     */
    @GetMapping("/sendMessageCode")
    public R sendMessageCode(@RequestParam("phone") String phone,
                                     @RequestParam(value = "clientIP", required = false) String clientIP,
                                     @RequestParam("prefixKey") String prefixKey,
                                     @RequestParam("limit") Integer limit,
                                     @RequestParam("timeout") Integer timeout) {
        return userService.sendMessageCode(phone, clientIP, prefixKey, limit, timeout);
    }

    /**
     * 根据openId获取微商业街用户
     * @param openid
     * @return
     */
    @GetMapping("/getMcsUserByOpenId")
    public R getMcsUserByOpenId(@RequestParam("openid") String openid) {
        return userService.getMcsUserByOpenId(openid);
    }

    /**
     * 商业街用户微信授权-绑定手机号
     * @param bindUserPhoneDTO
     * @return
     */
    @PostMapping("/mcs/bindPhone")
    public R bindOrAddMcsUser(@RequestBody BindUserPhoneDTO bindUserPhoneDTO) {
        return userService.bindOrAddMcsUser(bindUserPhoneDTO);
    }

    /**
     * 删除用户信息缓存
     * @param phone
     */
    @DeleteMapping("/deleteUserCashByPhone")
    public R deleteUserCashByPhone(@RequestParam("phone") String phone) {
        return userService.deleteUserCashByPhone(phone);
    }

    @PostMapping("/update/user/party/status")
    public R updateUserPartyStatus(@RequestParam("userId") Long userId) {
        return userService.updateUserPartyStatus(userId);
    }

    @PostMapping("/uuLogin")
    public R uuLogin(@RequestBody UuLoginVO uuLoginVO){
        return userService.uuLogin(uuLoginVO);
    }


    /**
     * 数据看板：数据总览
     * @return
     */
    @GetMapping("/indexData/totalData")
    public R indexData(@RequestParam(value = "type",required = false) Integer type,
                       @RequestParam(value = "streetId",required = false) Long streetId,
                       @RequestParam(value = "areaCode",required = false) Long areaCode){
        return userService.newIndexData(type,streetId,areaCode);
    }

    /**
     * 数据看板：用户占比
     * @return
     */
    @GetMapping("/indexData/userRate")
    public R userRate(@RequestParam(value = "type",required = false) Integer type,
                          @RequestParam(value = "streetId",required = false) Long streetId,
                          @RequestParam(value = "areaCode",required = false) Long areaCode,
                      @RequestParam(value = "range",required = false) Integer range){
        return userService.userRate(type,streetId,areaCode,range);
    }

    /**
     * 数据看板：真实用户统计
     * @return
     */
    @GetMapping("/indexData/realUser")
    public R realUser(@RequestParam(value = "type",required = false) Integer type,
                      @RequestParam(value = "streetId",required = false) Long streetId,
                      @RequestParam(value = "areaCode",required = false) Long areaCode,
                      @RequestParam(value = "range",required = false) Integer range){
        return userService.realUser(type,streetId,areaCode,range);
    }


    @GetMapping("/indexData/userActivity")
    public R userActivity(@RequestParam(value = "type",required = false) Integer type,
                          @RequestParam(value = "streetId",required = false) Long streetId,
                          @RequestParam(value = "areaCode",required = false) Long areaCode,
                          @RequestParam(value = "range",required = false) Integer range){
        return userService.userActivity(type,streetId,areaCode,range);
    }


    /**
     *导出验证密码
     */
    @GetMapping("/checkExport")
    public R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword){
        return userService.checkExport(account,password,oldPassword);
    }

    /**
     * uu洗车推送
     * @param washPhone
     * @param phone
     * @param washName
     * @param orderStatus
     * @return
     */
    @GetMapping("/uuPush")
    public R uuPush(@RequestParam(value = "washPhone",required = false)String washPhone,@RequestParam("phone")String phone,@RequestParam(value = "washName",required = false)String washName,@RequestParam("orderStatus")Integer orderStatus){
        return userService.uuPush(washPhone,phone,washName,orderStatus);
    }

    @GetMapping("/indexData/getAreaAndStreet")
    public R getAreaAndStreet(){
        return userService.getAreaAndStreet();
    }
}