From ad2201f809f45cbbe2e63a829e4c93a9c7b7f67c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 11 十一月 2022 10:00:19 +0800
Subject: [PATCH] #feat 修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 156 insertions(+), 21 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 b02143a..a791bf7 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
@@ -24,6 +24,7 @@
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
+import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
@@ -33,6 +34,7 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
+import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
@@ -203,27 +205,6 @@
import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
-import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
-import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
-import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
@@ -608,6 +589,19 @@
R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
+ * 随手拍详情
+ *
+ * @param id
+ * 随手拍主键
+ * @param userId
+ * 登录用户id
+ * @return 详情内容
+ */
+ @PostMapping("detaileasyphotodesensitize")
+ R detailEasyPhotoDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+
+ /**
* 随手拍删除
*
* @param id
@@ -638,6 +632,15 @@
*/
@PostMapping("pagemicrowish/applets")
R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);
+ /**
+ * 小程序分页查询微心愿
+ *
+ * @param comActMicroWishVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pagemicrowish/appletsDesensitize")
+ R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO);
/**
* 心愿详情
@@ -650,6 +653,17 @@
*/
@PostMapping("detailmicrowish")
R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+ /**
+ * 心愿详情
+ *
+ * @param id
+ * 查询主键
+ * @param userId
+ * 登录用户id
+ * @return 心愿内容
+ */
+ @PostMapping("detailmicrowishdesensitize")
+ R detailMicroWishDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
* 审核、分配、反馈心愿
@@ -1332,6 +1346,17 @@
R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
/**
+ * 小程序分页查询随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("pageeasyphotoappletsdesensitize")
+ R pageEasyPhotoAppletsDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+
+ /**
* 随手拍评论分页查询
*
* @param pageComActEasyPhotoCommentDTO
@@ -1340,6 +1365,16 @@
*/
@PostMapping("pagecomacteasyphotocomment")
R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);
+
+ /**
+ * 随手拍评论分页查询 - 脱敏
+ *
+ * @param pageComActEasyPhotoCommentDTO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pagecomacteasyphotocommentdesensitize")
+ R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);
/**
* 评论点赞/取消点赞
@@ -1506,6 +1541,15 @@
*/
@PostMapping("pagediscussapplets")
R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+ /**
+ * 议事投票-分页查询 小程序 -脱敏
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO 分页
+ */
+ @PostMapping("pagediscussappletsdesensitize")
+ R pageDiscussAppletsDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
/**
* 议事投票-点赞、取消点赞
@@ -1528,6 +1572,16 @@
R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
/**
+ * 议事投票-评论-分页查询 小程序 脱敏
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentappletsdesensitize")
+ R pageDiscussCommentAppletsDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
* 议事投票-详情 小程序
*
* @param id
@@ -1538,6 +1592,17 @@
*/
@PostMapping("detaildiscussapplets")
R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+ /**
+ * 议事投票-详情 小程序
+ *
+ * @param id
+ * 主键
+ * @param userId
+ * 登录用户主键
+ * @return ComActDiscussVO
+ */
+ @PostMapping("detaildiscussappletsdesensitize")
+ R detailDiscussAppletsDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
* 议事投票-投票
@@ -2866,6 +2931,63 @@
*/
@GetMapping("/shop/changeShopGoodsStatus")
R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
+ /**
+ * 商品列表-分页查询
+ *
+ * @param pageComShopGoodsDTO
+ * 添加数据
+ */
+ @PostMapping("/shopFlower/pageGoods")
+ R pageFlowerGoodsList(@RequestBody PageComShopFlowerGoodsDTO pageComShopGoodsDTO);
+
+ /**
+ * 商品列表-分页查询
+ *
+ * @param comShopFlowerGoodsDTO
+ * 添加数据
+ */
+ @PostMapping("/shopFlower/pageShopFlowerGoodsByApp")
+ R pageShopFlowerGoodsByApp(@RequestBody ComShopFlowerGoodsDTO comShopFlowerGoodsDTO);
+
+
+ /**
+ * 新增商品
+ *
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shopFlower/saveShopGoods")
+ R saveFlowerShopGoods(@RequestBody AddShopFlowerGoodsVO addShopGoodsVO);
+
+ /**
+ * 编辑商品
+ *
+ * @param id
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shopFlower/editShopGoods/{id}")
+ R editFlowerShopGoods(@PathVariable("id") Long id, @RequestBody AddShopFlowerGoodsVO addShopGoodsVO);
+
+ /**
+ * 删除商品
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/shopFlower/deleteShopGoods")
+ R deleteFlowerShopGoods(@RequestBody Long[] id);
+
+ /**
+ * 修改商品状态
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/changeShopGoodsStatus")
+ R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
/**
* 结果
@@ -10513,6 +10635,13 @@
@DeleteMapping("/point/delete")
R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);
+ /**
+ * 便民服务详情 自提点
+ * @param pointId
+ * @return
+ */
+ @GetMapping("/point/detail")
+ R detailPoint(@RequestParam("pointId") Long pointId);
/**
* 新增商品分类
@@ -10559,4 +10688,10 @@
@DeleteMapping("/proceedings/remove")
R removeProceedings(@RequestParam("id") Long id);
+
+ /**
+ * 获取物业公司通知公告列表
+ * */
+ @GetMapping("comProperty/noticeList")
+ R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);
}
--
Gitblit v1.7.1