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

@@ -11,6 +11,8 @@
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 com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -43,6 +45,7 @@
    private UserService userService;
    @Resource
    private SysUserInputService sysUserInputService;


    /**
     * 新增微信用户
@@ -1431,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();
@@ -1441,13 +1457,69 @@
        return userService.getCommunityList(name,id);
    }

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

    @GetMapping("/resetPasswordAccount")
    public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account){
        return userService.resetPassword(type,account);
    public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
        return userService.resetPassword(type,account,appId);
    }

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

    /**
     * 三说会堂新增业务中心或专家账号
     * */
    @PostMapping("/sanshuoAddUser")
    public R sanshuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO){
        return userService.addExpertOrIndustryCenter(administratorsUserVO);
    }

    /**
     * 三说会堂后台重置密码
     * */
    @GetMapping("/sanshuoResetPassword")
    public R sanshuoAddUser(@RequestParam("account") String account,@RequestParam("pass")String password){
        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);
    }

    @PostMapping("/addComPbCheckUser")
    public R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO){
        return userService.addComPbCheckUser(comPbCheckUserDTO);
    }

    @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);
    }

}