bug修改

puhanshu

2022-08-31 d5208f24fbf0e71d21171a06b64ce457bad40d43

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

@@ -4,6 +4,7 @@

import javax.annotation.Resource;

import cn.hutool.core.util.StrUtil;
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;
@@ -56,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);
    }

    /**
@@ -1370,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);
    }

    /**
@@ -1382,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);
    }

    /**
@@ -1394,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);
    }


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


@@ -1433,4 +1435,19 @@
    public R getAreaAndStreet(){
        return userService.getAreaAndStreet();
    }

    @GetMapping("/communityList")
    public R getCommunityList(@RequestParam("name") String name, @RequestParam(value = "id",required = false) Long id){
        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);
    }
}