Merge remote-tracking branch 'origin/master'

jiangping

2024-12-12 fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java

@@ -72,22 +72,6 @@
        return ApiResponse.success("查询成功",wxAuthorizeVO);
    }


    @LoginNoRequired
    @ApiOperation(value = "testSendNotice", notes = "testSendNotice")
    @GetMapping("/testSendNotice")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "openid", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "token", required = true),
    })
    public ApiResponse wxAuthorize(@RequestParam String openid,String token) {
        WxPlatNotice wxPlatNotice = new WxPlatNotice();
        List<String> idList = Arrays.asList(openid.split(","));
        wxPlatNotice.testSendNotice(idList,token);
        return ApiResponse.success("查询成功");
    }


    @ApiOperation(value = "查询被访问人信息", notes = "查询被访问人信息")
    @PostMapping("/getVisitedMember")
    public ApiResponse<List<MemberVO>> getVisitedMember(@Valid @RequestBody CheckVisitedDTO checkVisitedDTO) {
@@ -124,6 +108,11 @@
    public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap) {
        if(Objects.isNull(pageWrap.getModel()) || StringUtils.isBlank(pageWrap.getModel().getOpenid())){
            pageWrap.getModel().setMemberId(0);
        }else{
            if(Objects.nonNull(pageWrap.getModel()) && Objects.nonNull(pageWrap.getModel().getStatus()) ){
                pageWrap.getModel().setBusinessStatus(pageWrap.getModel().getStatus());
                pageWrap.getModel().setStatus(null);
            }
        }
        return ApiResponse.success(visitsService.findPage(pageWrap));
    }