Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev

lidongdong

2022-11-10 bdbe40f077aa9ca2ec184707d3eab41af13def03

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

@@ -45,8 +45,7 @@
    private UserService userService;
    @Resource
    private SysUserInputService sysUserInputService;
    @Resource
    private CommunityService communityService;


    /**
     * 新增微信用户
@@ -1435,6 +1434,19 @@
        return userService.uuPush(washPhone,phone,washName,orderStatus);
    }

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

    @GetMapping("/indexData/getAreaAndStreet")
    public R getAreaAndStreet(){
        return userService.getAreaAndStreet();
@@ -1443,6 +1455,11 @@
    @GetMapping("/communityList")
    public R getCommunityList(@RequestParam("name") String name, @RequestParam(value = "id",required = false) Long id){
        return userService.getCommunityList(name,id);
    }

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

    @GetMapping("/resetPasswordAccount")
@@ -1471,6 +1488,15 @@
        return userService.resetPassExpertOrIndustryCenter(account,password);
    }

    /**
     * 移除账号专家权限
     *
     */
    @GetMapping("/removeExpertRole")
    public R removeExpertRole(@RequestParam(value = "phone",required = false)String phone){
        return userService.removeExpertRole(phone);
    }

    @GetMapping("/accept")
    public R accept(@RequestParam("userId")Long userId){
        return userService.accept(userId);
@@ -1481,11 +1507,19 @@
        return userService.addComPbCheckUser(comPbCheckUserDTO);
    }

    /**
     * 是否为专家登陆小程序
     * */
    @GetMapping("/isSanShuoExpert")
    public R isExpert(@RequestParam("number") String number){
        return communityService.isExpert(number);
    @PostMapping("/feedBackReply")
    public R feedBackReply(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){
        return userService.feedBackReply(sysUserFeedbackVO);
    }

    @GetMapping("/myFeedBack")
    public R myFeedBack(@RequestParam("userId")Long id,@RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(id,type);
    }

    @GetMapping("/propertyCheck")
    public R propertyCheck(@RequestParam String phone){
        return userService.propertyCheck(phone);
    }

}