From 15c1d716e6a89b38e6af36b62fc372b93779df01 Mon Sep 17 00:00:00 2001
From: puhanshu <hansgoallout@163.com>
Date: 星期三, 22 九月 2021 23:02:50 +0800
Subject: [PATCH] 便民服务小程序
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 417 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 413 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 58f4250..7790f0e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3,8 +3,26 @@
import java.util.List;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageMerchantProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -191,7 +209,7 @@
* @return 详情
*/
@PostMapping("detailactivity")
- R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
+ R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize);
/**
* 分页活动报名名单
@@ -1160,12 +1178,20 @@
/**
* 议事投票-详情
*
- * @param id
- * 主键
+ * @param discussDetailDTO
+ * 请求参数
* @return ComActDiscussVO
*/
@PostMapping("detaildiscuss")
- R detailDiscuss(@RequestParam("id") Long id);
+ R detailDiscuss(@RequestBody ComActDiscussDetailDTO discussDetailDTO);
+
+ /**
+ * 分页查询评论下回复列表
+ * @param discussDetailDTO 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("discussCommentReplyAdmin")
+ R discussCommentReplyAdmin(@RequestBody ComActDiscussDetailDTO discussDetailDTO);
/**
* 议事投票-删除
@@ -1198,6 +1224,16 @@
R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
/**
+ * 议事投票-后台分页查询
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO
+ */
+ @PostMapping("pagediscussAdmin")
+ R pageDiscussAdmin(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+
+ /**
* 议事投票-评论-查看
*
* @param id
@@ -1206,6 +1242,14 @@
*/
@PostMapping("detaildiscusscomment")
R detailDiscussComment(@RequestParam("id") Long id);
+
+ /**
+ * 议事投票评论详情
+ * @param pageComActDiscussCommentDTO 请求参数
+ * @return 议事投票详情
+ */
+ @PostMapping("detaildiscusscommentAdmin")
+ R detailDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
/**
* 议事投票-评论-置顶
@@ -1236,6 +1280,16 @@
*/
@PostMapping("pagediscusscomment")
R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-评论-后台分页查询
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页查询参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentAdmin")
+ R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
/**
* 议事投票-分页查询 小程序
@@ -3635,6 +3689,27 @@
R exportPensionAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
/**
+ * 查询养老认证社区认证方式 setPensionAuthType 查询养老认证社区认证方式
+ * @param eldersAuthTypeQueryDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/10 16:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/authtype")
+ R communityPensionAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验） setPensionAuthType 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）
+ * @param communityId 社区id
+ * @param type 检验类型
+ * @return R 设置结果
+ * @author txb
+ * @date 2021/9/10 16:03
+ */
+ @PutMapping("/elders/pensionAuthRecords/authType/{type}")
+ R setPensionAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
* 小程序-查询疫苗分类列表
*
* @return 疫苗分类列表
@@ -5506,6 +5581,67 @@
R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status);
/**
+ * 议事投票后台公布结果
+ * @param publishResultDTO 请求参数
+ * @return 公布结果
+ */
+ @PostMapping("publishResultAdmin")
+ R publishResultAdmin(@RequestBody ComActDiscussPublishResultDTO publishResultDTO);
+
+ /**
+ * 议事投票-评论/回复删除
+ * @param id 评论/回复id
+ * @return 删除结果
+ */
+ @GetMapping("deleteDiscussCommentAdmin")
+ R deleteDiscussCommentAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询社区可发布议事投票权限配置
+ * @param communityId 社区id
+ * @return 社区可发布议事投票权限配置
+ */
+ @GetMapping("discussJurisdictionGet")
+ R discussJurisdictionGet(@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
+
+ /**
+ * 设置当前社区议事投票小程序身份验证参数(1.全部 2.党员 3.志愿者 4.社区工作人员)
+ * @param communityId 社区id
+ * @param value 需要设置的参数值
+ * @return 设置结果
+ */
+ @GetMapping("discussJurisdictionSet")
+ R discussJurisdictionSet(@RequestParam("communityId") Long communityId, @RequestParam("value") String value);
+
+ /**
+ * 议事投票检测状态定时任务
+ * @return 执行结果
+ */
+ @GetMapping("timedTaskDiscussInspectStatus")
+ R timedTaskDiscussInspectStatus();
+
+ /**
+ * 一起议增加浏览量
+ * @param discussId 一起议主键id
+ */
+ @PostMapping("discuss/increase-view-num")
+ void increaseViewNum(@RequestParam("discussId") Long discussId);
+
+ /**
+ * 定时任务每半小时执行一次将一起议浏览量写入到表中
+ */
+ @PostMapping("discuss/write-view-num")
+ R timedTaskWriteDiscussViewNumToTable();
+
+ /**
+ * 公布/编辑一起议投票结果
+ * @param comActDiscussDTO
+ * @return 请求结果
+ */
+ @PostMapping("discuss/edit-result")
+ R editDiscussResult(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
* 定时任务扫描高龄认证记录信息
* @return 执行结果
*/
@@ -5556,4 +5692,277 @@
*/
@GetMapping("/reserve/list")
R reserveListApplets(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询社区高龄认证方式（1.视频认证 2.人脸核验）
+ * @param eldersAuthTypeQueryDTO 请求参数
+ * @return 社区高龄认证方式（1.视频认证 2.人脸核验）
+ */
+ @PostMapping("/elders/new/authtype")
+ R communityEldersAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 设置当前社区高龄认证方式:核验类型（1.视频认证 2.人脸核验）
+ * @param communityId 社区id
+ * @param type 检验类型
+ * @return R 设置结果
+ */
+ @PutMapping("/elders/new/authType/{type}")
+ R setEldersAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
+ * 便民服务新增分类
+ * @param convenientServiceCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/service-category/add")
+ R addServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);
+
+ /**
+ * 便民服务分类编辑
+ * @param convenientServiceCategoryDTO
+ * @return
+ */
+ @PutMapping("/convenient/service-category/put")
+ R putServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);
+
+ /**
+ * 便民服务分类删除
+ * @param categoryId
+ * @return
+ */
+ @DeleteMapping("/convenient/service-category/delete")
+ R deleteServiceCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
+
+ /**
+ * 获取便民服务分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/convenient/service-category/get")
+ R getServiceCategory(@RequestParam("categoryId") Long categoryId);
+
+ /**
+ * 分页查询便民服务分类
+ * @param pageConvenientServiceCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/service-category/page")
+ R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO);
+
+ /**
+ * 便民服务新增商家
+ * @param convenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/add")
+ R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 编辑便民服务商家
+ * @param convenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/convenient/merchant/put")
+ R putMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 删除便民服务商家
+ * @param merchantId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/convenient/merchant/delete")
+ R deleteMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("operator") Long operator);
+
+ /**
+ * 分页查询便民服务商家
+ * @param pageConvenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/page")
+ R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);
+
+ /**
+ * 获取便民服务商家详情
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/get")
+ R getMerchant(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 禁用/启用便民服务商家
+ * @param disableOrEnableConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/convenient/merchant/disable-or-enable")
+ R disableOrEnableMerchant(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
+
+ /**
+ * 重置便民服务商家账号密码
+ * @param resetPasswordConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/convenient/merchant/reset-password")
+ R resetPasswordMerchant(@RequestBody ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO);
+
+ /**
+ * 获取所有便民服务分类
+ * @return
+ */
+ @GetMapping("/convenient/service-category/all")
+ R getAllServiceCategories();
+
+ /**
+ * 获取用户便民服务商家详情
+ * @param account 商家绑定账号
+ * @return
+ */
+ @GetMapping("/convenient/getUserMerchantInfoByAccount")
+ R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);
+
+ /**
+ * 获取商便民服务商家信息
+ * @param userId
+ * @return
+ */
+ @GetMapping("/convenient/merchantInfo")
+ R<ConvenientMerchantVO> getUserConvenientMerchantInfo(@RequestParam("userId") Long userId);
+
+ /**
+ * 新增便民服务产品分类信息
+ * @param convenientProductCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/product-category/add")
+ R addProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);
+
+ /**
+ * 编辑便民服务产品分类信息
+ * @param convenientProductCategoryDTO
+ * @return
+ */
+ @PutMapping("/convenient/product-category/put")
+ R putProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);
+
+ /**
+ * 删除便民服务产品分类信息
+ * @param categoryId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/convenient/product-category/delete")
+ R deleteProductCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
+
+ /**
+ * 获取便民服务产品分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/convenient/product-category/get")
+ R getProductCategory(@RequestParam("categoryId") Long categoryId);
+
+ /**
+ * 分页查询便民服务产品分类信息
+ * @param pageConvenientProductCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/product-category/page")
+ R pageProductCategory(@RequestBody PageConvenientProductCategoryDTO pageConvenientProductCategoryDTO);
+
+ /**
+ * 便民服务商家后台新增产品
+ * @param convenientProductDTO
+ * @return
+ */
+ @PostMapping("/convenient/product/add")
+ R addProduct(@RequestBody ConvenientProductDTO convenientProductDTO);
+
+ /**
+ * 便民服务商家后台编辑产品
+ * @param convenientProductDTO
+ * @return
+ */
+ @PutMapping("/convenient/product/put")
+ R putProduct(@RequestBody ConvenientProductDTO convenientProductDTO);
+
+ /**
+ * 便民服务商家后台获取产品详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/convenient/product/get")
+ R getProduct(@RequestParam("productId") Long productId);
+
+ /**
+ * 便民服务商家后台分页获取产品信息
+ * @param pageConvenientProductDTO
+ * @return
+ */
+ @PostMapping("/convenient/product/page")
+ R pageProduct(@RequestBody PageConvenientProductDTO pageConvenientProductDTO);
+
+ /**
+ * 便民服务商家后台删除产品信息
+ * @param deleteConvenientProductDTO
+ * @return
+ */
+ @DeleteMapping("/convenient/product/delete")
+ R deleteProduct(@RequestBody DeleteConvenientProductDTO deleteConvenientProductDTO);
+
+ /**
+ * 便民服务商家后台上架/下架产品
+ * @param onShelfOrOffShelfProductDTO
+ * @return
+ */
+ @PutMapping("/convenient/product/onShelf-or-offShelf")
+ R onShelfOrOffShelfProduct(@RequestBody OnShelfOrOffShelfProductDTO onShelfOrOffShelfProductDTO);
+
+ /**
+ * 获取所有产品分类
+ * @return
+ */
+ @GetMapping("/convenient/product-category/all")
+ R getAllProductCategory();
+
+ /**
+ * 获取该社区商家数量大于0的分类
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/convenient/service-category/suitable")
+ R getSuitableServiceCategories(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 获取该社区下的热门商家
+ * @param pagePopularMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/popular")
+ R getPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);
+
+ /**
+ * 分页获取服务类型下商家信息
+ * @param pageClassifyMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/classify")
+ R getClassifyMerchants(@RequestBody PageClassifyMerchantDTO pageClassifyMerchantDTO);
+
+ /**
+ * 获取商家详情
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/detail")
+ R getMerchantDetail(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 获取商家产品
+ * @param pageMerchantProductDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/product")
+ R getMerchantProduct(@RequestBody PageMerchantProductDTO pageMerchantProductDTO);
}
--
Gitblit v1.7.1