From b6082fe75b377ac9c177736d98f36ae46e7cdb70 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期三, 28 四月 2021 10:20:55 +0800
Subject: [PATCH] Merge branch 'master' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 116 insertions(+), 1 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 0c50a95..cc25662 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
@@ -9,6 +9,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
+import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
@@ -20,9 +21,9 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
import java.util.List;
/**
@@ -740,6 +741,15 @@
*/
@PostMapping("timedtaskactactivityall")
R timedTaskActActivityAll();
+
+
+ /**
+ * 定时任务刷新社区活动的各个状态 除取消外
+ *
+ * @return
+ */
+ @PostMapping("timedtaskactmicrowishall")
+ R timedTaskActMicroWishAll();
/**
* 其他建筑详情
@@ -1612,6 +1622,15 @@
R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
/**
+ * 确认导入实有人口（有则更新，无则新建）
+ * @param list 用户信息
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/import/confirm")
+ R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
* 分页查询实有人口
*
* @param comMngPopulationVO 查询参数
@@ -1628,6 +1647,15 @@
*/
@PostMapping("/common/data/population/detail")
R detailPopulation(@RequestParam(value = "populationId") Long populationId);
+
+ /**
+ * 根据id查询实有人口电子档案信息
+ * @param populationId 实有人口id
+ * @return 实有人口电子档信息
+ */
+ @PostMapping("/common/data/population/electronicArchives")
+ R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId);
+
/**
* 根据id修改实有人口标签列表
@@ -1786,6 +1814,13 @@
@PostMapping("/shop/saveStore")
R saveStore(@RequestBody ShopStoreVO storeVO);
+ /**
+ * 新增店铺
+ * @param storeVO 店铺信息
+ * @return 新增结果
+ */
+ @PostMapping("/shop/addStore")
+ R addStore(@RequestBody ShopStoreVO storeVO);
/**
* 编辑店铺、启用、禁用
@@ -1909,6 +1944,14 @@
*/
@PostMapping("/shop/shopCartList")
R shopCartList(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询用户购物车数量
+ * @param userId 用户id
+ * @return 用户购物车商品数量
+ */
+ @PostMapping("/shop/shopCartUserTotal")
+ R shopCartUserTotal(@RequestParam("userId") Long userId);
/**
* 购物车添加
@@ -2123,4 +2166,76 @@
*/
@PostMapping("/shop/wxPay")
R wxPay(@RequestBody OrderPayDTO orderPayDTO);
+
+ /**
+ * 编辑实有人口
+ * @param editComMngPopulationVO
+ * @return
+ */
+ @PostMapping("/common/data/population/edit")
+ R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 微心愿删除
+ * @param id 微心愿id
+ */
+ @PostMapping("deletemicrowish")
+ R deletemicrowish(@RequestParam("id")Long id);
+
+ /**
+ * 基础数据》特殊群体》分页查询
+ * @param pageInputUserDTO
+ * @return
+ */
+ @PostMapping("common/data/special/page")
+ R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 删除特殊群体人员
+ * @param id 特殊群体id
+ * @return 删除结果
+ */
+ @PostMapping("common/data/special/delete")
+ R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
+
+
+ /**
+ * 办事指南_新增
+ * @param workGuideVO 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("/addworkguide")
+ R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);
+
+ /**
+ * 办事指南_编辑
+ * @param workGuideVO
+ * @return 编辑结果
+ */
+ @PostMapping("/editworkguide")
+ R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);
+
+ /**
+ * 办事指南_详情
+ * @param workGuideId
+ * @return 详情
+ */
+ @GetMapping("/detailworkguide")
+ R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId);
+ /**
+ * 办事指南_分页
+ * @param pageActWorkGuideDTO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/pageworkguide")
+ R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);
+
+ /**
+ * 办事指南_删除
+ * @param workGuideId 办事指南id
+ * @return 删除结果
+ */
+ @PostMapping("/delectworkguide")
+ R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);
+
}
--
Gitblit v1.7.1