bug修改

puhanshu

2022-08-31 d5208f24fbf0e71d21171a06b64ce457bad40d43

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

@@ -57,8 +57,8 @@
     */
    @PostMapping("/addOrUpdate")
    public R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey,
        @RequestParam("unionid") String unionid) {
        return userService.updateInsertUser(openid, sessionKey, unionid);
        @RequestParam("unionid") String unionid,@RequestParam("appId")String appId) {
        return userService.updateInsertUser(openid, sessionKey, unionid,appId);
    }

    /**
@@ -104,10 +104,13 @@
     */
    @PostMapping("/getUserInfo")
    public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName) {
        int index = userName.lastIndexOf("_");
        String type = userName.substring(index + 1);
        String name = userName.substring(0, index);
        return userService.getUserInfo(name, Integer.parseInt(type));
        int index2 = userName.lastIndexOf("_");
        String appid=userName.substring(index2+1);
        String username=userName.substring(0,index2);
        int index = username.lastIndexOf("_");
        String type = username.substring(index + 1);
        String name = username.substring(0, index);
        return userService.getUserInfo(name, Integer.parseInt(type),appid);
    }

    /**
@@ -565,8 +568,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);
    }

    /**
@@ -722,8 +725,8 @@
     * @return 协议内容
     */
    @PostMapping("agreement")
    public R agreement(@RequestParam("type") Integer type) {
        return userService.agreement(type);
    public R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId) {
        return userService.agreement(type,appId);
    }

    /**
@@ -1368,8 +1371,8 @@
    @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);
                       @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId){
        return userService.newIndexData(type,streetId,areaCode,appId);
    }

    /**
@@ -1380,8 +1383,8 @@
    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);
                      @RequestParam(value = "range",required = false) Integer range,@RequestParam("appId")String appId){
        return userService.userRate(type,streetId,areaCode,range,appId);
    }

    /**
@@ -1392,8 +1395,8 @@
    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);
                      @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false)String appId){
        return userService.realUser(type,streetId,areaCode,range,appId);
    }


@@ -1401,8 +1404,9 @@
    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);
                          @RequestParam(value = "range",required = false) Integer range,
                          @RequestParam(value = "appId",required = false) String appId){
        return userService.userActivity(type,streetId,areaCode,range, appId);
    }


@@ -1412,6 +1416,19 @@
    @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")
@@ -1424,4 +1441,13 @@
        return userService.getCommunityList(name,id);
    }

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

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