1.扫码开门 2. 修改bug

fengjin

2023-09-20 c6f8a03a3675efa99a833e16ad34ac0dd0fbc9b0

 springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionUserApi.java

@@ -53,12 +53,14 @@
    public R authentication(@RequestBody UnionUserDto unionUserDto, @CurrentUser UnionUserDto unionUser){
        if (unionUserDto.getIsApplets().equals(1)) {
            log.info("小程序进入无需验证");
            return  userService.authentication(unionUserDto);}
            return  userService.authentication(unionUserDto);
        }
        else {
            log.info("h5进入");
            if (unionUser != null) {
                unionUserDto.setId(unionUser.getId());
                return  userService.authentication(unionUserDto);}
                return  userService.authentication(unionUserDto);
            }
            else {
                return R.fail("请重新登录");
            }
@@ -76,4 +78,20 @@
        return  userService.selectById(id);
    }


    /**
     * 用户开门
     *
     * @return 总工会户外劳共用户
     */
    @GetMapping("/openDoor")
    public  R openDoor(@RequestParam(value = "qRCode")  String qRCode,@CurrentUser UnionUserDto unionUser){
        if (unionUser != null) {
            return  userService.openDoor(unionUser,qRCode);
        }
        else {
            return R.fail("请重新登录");
        }
    }

}