From fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 16:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
index c41616f..3da8c70 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
+++ b/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));
}
--
Gitblit v1.9.3