101captain
2022-07-21 0947c349e79d437dfb056bb2c622cba478c882f0
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -103,10 +103,12 @@
     */
    @PostMapping("/getUserInfo")
    public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName) {
        int index = userName.lastIndexOf("_");
        String type = userName.substring(index + 1);
        int index = userName.indexOf("_");
        int index2 = userName.lastIndexOf("_");
        String type = userName.substring(index + 1,index2);
        String name = userName.substring(0, index);
        return userService.getUserInfo(name, Integer.parseInt(type));
        String appid=userName.substring(index2+1);
        return userService.getUserInfo(name, Integer.parseInt(type),appid);
    }
    /**
@@ -564,8 +566,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);
    }
    /**
@@ -1413,6 +1415,19 @@
        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();