From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 2ac7672..c41616f 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
@@ -10,6 +10,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.model.VisitReason;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
@@ -32,6 +33,7 @@
import org.springframework.web.server.ServerWebExchange;
import javax.validation.Valid;
+import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@@ -71,6 +73,21 @@
}
+ @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) {
@@ -105,6 +122,9 @@
@ApiOperation("璁垮璁板綍 - 鍒嗛〉鍒楄〃")
@PostMapping("/visitPage")
public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap) {
+ if(Objects.isNull(pageWrap.getModel()) || StringUtils.isBlank(pageWrap.getModel().getOpenid())){
+ pageWrap.getModel().setMemberId(0);
+ }
return ApiResponse.success(visitsService.findPage(pageWrap));
}
--
Gitblit v1.9.3