金汇社区模块

lidongdong

2023-10-11 2af69b8d4e804397799c89e2aa0d837c6de738a8

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

@@ -7,7 +7,6 @@
import com.panzhihua.service_equipment.model.dos.UnionUser;
import com.panzhihua.service_equipment.service.UnionUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -53,12 +52,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 +77,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("请重新登录");
        }
    }

}