From def77d26800e0af4467d26ba57b8ae1800ddc45d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 四月 2021 10:04:29 +0800
Subject: [PATCH] 添加用户查询购物车商品数量接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
index 081e912..0a9306b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
@@ -33,10 +33,26 @@
@Resource
private CommunityService communityService;
- @ApiOperation(value = "分页查询调查问卷", response = ComActQuestnaireVO.class)
- @PostMapping("/page")
- public R page(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ @ApiOperation(value = "分页查询登录用户调查问卷", response = QuestnaireListVo.class)
+ @PostMapping("/pageUser")
+ public R pageUser(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Integer isPartymember = loginUserInfo.getIsPartymember();
+ Integer isVolunteer = loginUserInfo.getIsVolunteer();
+ pageQuestnaireDTO.setForParty(1 == isPartymember.intValue());
+ pageQuestnaireDTO.setForVolunteer(1 == isVolunteer.intValue());
+ pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
+ pageQuestnaireDTO.setState(0);
+ return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
+ }
+
+ @ApiOperation(value = "分页查询社区调查问卷", response = QuestnaireListVo.class)
+ @PostMapping("/pageVolunteer")
+ public R pageVolunteer(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ pageQuestnaireDTO.setForMasses(null);
+ pageQuestnaireDTO.setForVolunteer(true);
+ pageQuestnaireDTO.setForParty(true);
return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
}
@@ -44,6 +60,11 @@
@PostMapping("/add")
public R add(@RequestBody QuestnaireVO questnaireVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ boolean userHasRight = loginUserInfo.getIsmemberrole()==1;
+ //if(!userHasRight){
+ if(false){
+ return R.fail("用户无创建调查问卷的权限！");
+ }
return communityService.addQuestnaire(questnaireVO, loginUserInfo.getCommunityId(), loginUserInfo.getUserId());
}
@@ -61,7 +82,7 @@
}
@ApiOperation(value = "在线统计详细", response = ComActQuestnaireAnswerContentVO.class)
- @GetMapping("/stat/details")
+ @PostMapping("/stat/details")
public R statDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
//问卷调查
return communityService.qaQeustAnswerDetails(pageQuestnaireSubDetailsDTO);
@@ -71,21 +92,27 @@
@PostMapping("/stat/answer")
public R usersAnswerQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ boolean userHasRight = loginUserInfo.getIsmemberrole()==1;
+ //if(!userHasRight){
+ if(false){
+ return R.fail("用户写问卷调查问卷！");
+ }
return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO, loginUserInfo.getUserId());
}
@ApiOperation(value = "编辑问卷")
@PostMapping("/edit")
- public R eidtQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
+ public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
return communityService.editQuestnaire(questnaireVO);
}
@ApiOperation(value = "继续调研/停止调研")
- @GetMapping("/toggle")
+ @PostMapping("/toggle")
public R toggle(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) {
- return communityService.editQuestnaireDO(editComActQuestnaireVo);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.editQuestnaireDO(editComActQuestnaireVo, loginUserInfo.getUserId());
}
@ApiOperation(value = "删除问卷")
--
Gitblit v1.7.1