From 41548c00e1b896f9944de4db283a6c8507dc07f8 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 23 十月 2023 17:15:22 +0800
Subject: [PATCH] 添加活动详情 用户是否参加
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java | 625 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 620 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
index 76ee5e5..d9a7dc6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -2,15 +2,17 @@
import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
-import com.panzhihua.common.model.vos.jinhui.JinghuiMerchantEvaluateVO;
-import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
-import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
+import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
+import com.panzhihua.common.model.vos.jinhui.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
/**
* 金汇社区
@@ -211,7 +213,7 @@
* @return
*/
@DeleteMapping("/jinhuiMerchant/delete")
- public R deleteMerchant(@RequestParam("merchantId") String merchantId, @RequestParam("operator") String operator);
+ public R deleteMerchant(@RequestParam("merchantId") String merchantId);
/**
* 分页查询便民服务商家 运营后台
@@ -220,7 +222,7 @@
* @return
*/
@PostMapping("/jinhuiMerchant/page")
- public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);
+ public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO);
/**
* 获取便民服务商家详情
@@ -241,6 +243,13 @@
public R getListCategories(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize);
+
+
+ @PostMapping("/jinhuiMerchant/addData")
+ public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item);
+
+ @PostMapping("/jinhuiMerchant/editData")
+ public R merchantEditData(@RequestBody JinhuiConvenientMerchantVO item);
/**************************************************************************************************************
*
@@ -293,5 +302,611 @@
public R merchantEvaluateExpurgateData(@RequestParam("id") String id);
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇预约空间
+ *
+ *
+ *********************************************************************************************************/
+ /**
+ * 金汇空间预约模块分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceGetList")
+ public R interspaceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "intendantType",required = false) String intendantType);
+
+ /**
+ * 金汇空间预约模块单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceGetDetails")
+ public R interspaceGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 金汇空间预约模块新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceAddData")
+ public R interspaceAddData(@RequestBody JinhuiInterspaceVO item);
+
+
+ /**
+ * 金汇空间预约模块编辑
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceEditData")
+ public R interspaceEditData(@RequestBody JinhuiInterspaceVO item);
+
+
+ /**
+ * 金汇空间预约模块删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceExpurgateData")
+ public R interspaceExpurgateData(@RequestParam("id") String id);
+
+
+ /****************************************************************************************************
+ *
+ *
+ * 空间预约分类
+ *
+ *
+ ******************************************************************************************************/
+ /**
+ * 空间预约分类分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceTypeGetList")
+ public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+ /**
+ * 空间预约分类单个详情
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceTypeGetDetails")
+ public R interspaceTypeGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 空间预约分类新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceTypeAddData")
+ public R interspaceTypeAddData(@RequestBody JinhuiInterspaceTypeVO item);
+
+ /**
+ * 空间预约分类编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceTypeEditData")
+ public R interspaceTypeEditData(@RequestBody JinhuiInterspaceTypeVO item);
+
+
+ /**
+ * 空间预约分类删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/JinhuiInterspace/interspaceTypeExpurgateData")
+ public R interspaceTypeExpurgateData(@RequestParam("id") String id);
+
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 空间预约申请
+ *
+ *
+ **************************************************************************************************************/
+ /**
+ * 空间预约申请分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/applyFor/getList")
+ public R applyForGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "intendantType",required = false) String intendantType,
+ @RequestParam(value = "state",required = false) String state,
+ @RequestParam(value = "interspaceTime",required = false) String interspaceTime,
+ @RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
+ @RequestParam(value = "interspaceId",required = false) String interspaceId);
+
+ /**
+ * 空间预约申请详情
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/applyFor/getDetails")
+ public R applyForGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 空间预约申请新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/applyFor/addData")
+ public R applyForAddData(@RequestBody JinhuiInterspaceApplyForVO item);
+
+ /**
+ * 空间预约申请编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/applyFor/editData")
+ public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item);
+
+ /**
+ * 空间预约申请删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/JinhuiInterspace/applyFor/expurgateData")
+ public R applyForExpurgateData(@RequestParam("id") String id);
+
+
+ /**************************************************************************************************************
+ *
+ *
+ * 金汇微心愿
+ *
+ *
+ ***************************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/micro/volunteering/getList")
+ public R volunteeringGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "state", required = false)String state);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/micro/volunteering/getDetails")
+ public R volunteeringGetDetails(@RequestParam("id") String id);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/micro/volunteering/addData")
+ public R volunteeringAddData(@RequestBody JinhuiMicroVolunteeringVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/micro/volunteering/editData")
+ public R volunteeringEditData(@RequestBody JinhuiMicroVolunteeringVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/micro/volunteering/expurgateData")
+ public R volunteeringExpurgateData(@RequestParam("id") String id);
+
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 金汇微心愿分类
+ *
+ *
+ *****************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/micro/type/getList")
+ public R volunteeringTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/micro/type/getDetails")
+ public R volunteeringTypeGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/micro/type/addData")
+ public R volunteeringTypeAddData(@RequestBody JinhuiMicroVolunteeringTypeVO item);
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/micro/type/editData")
+ public R volunteeringTypeEditData(@RequestBody JinhuiMicroVolunteeringTypeVO item);
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/micro/type/expurgateData")
+ public R volunteeringTypeExpurgateData(@RequestParam("id") String id);
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇商城商品
+ *
+ *
+ *********************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/shoppingGetList")
+ public R shoppingGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodName", required = false) String goodName,
+ @RequestParam(value = "goodType", required = false) String goodType,
+ @RequestParam(value = "id", required = false) String id);
+
+
+ @GetMapping("/jinhuiShopping/shoppingGetDetails")
+ public R shoppingGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiShopping/shoppingAddData")
+ public R shoppingAddData(@RequestBody JinhuiShoppingVO item);
+
+
+ @PostMapping("/jinhuiShopping/shoppingEditData")
+ public R shoppingEditData(@RequestBody JinhuiShoppingVO item);
+
+ @DeleteMapping("/jinhuiShopping/shoppingExpurgateData")
+ public R shoppingExpurgateData(@RequestParam("id") String id);
+
+
+ /********************************************************************************************************
+ *
+ *
+ * 金汇商城商品订单
+ *
+ *
+ ********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/orderGetList")
+ public R orderGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "goodsId", required = false)String goodsId,
+ @RequestParam(value = "orderNumber", required = false)String orderNumber,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "name", required = false)String name,
+ @RequestParam(value = "cancelType", required = false)String cancelType);
+
+ /**
+ * 分页详情
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/orderGetDetails")
+ public R orderGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiShopping/orderAddData")
+ public R orderAddData(@RequestBody JinhuiShoppingOrderVO item);
+
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiShopping/orderEditData")
+ public R orderEditData(@RequestBody JinhuiShoppingOrderVO item);
+
+
+ /**
+ * 取消
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/orderCancelOrder")
+ public R orderCancelOrder(@RequestParam("orderId") String orderId);
+
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/jinhuiShopping/orderExpurgateData")
+ public R orderExpurgateData(@RequestParam("id") String id);
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 社区配置兑换地址 时间
+ *
+ * *******************************************************************************************************
+ * @return
+ */
+
+ @GetMapping("/jinhuiConfig/configGetDetails")
+ public R configGetDetails(@RequestParam("communityId") String communityId);
+
+
+ @PostMapping("/jinhuiConfig/configAddData")
+ public R configAddData(@RequestBody JinhuiConfigVO item);
+
+ @PostMapping("/jinhuiConfig/configEditData")
+ public R configEditData(@RequestBody JinhuiConfigVO item);
+
+ @DeleteMapping("/jinhuiConfig/configExpurgateData")
+ public R configExpurgateData(@RequestParam("communityId") String communityId);
+
+
+
+ /*************************************************************************************************************
+ *
+ *
+ * 商家分类
+ *
+ *
+ **************************************************************************************************************/
+
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/getDetailsCategories")
+ public R getDetailsCategories(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/addDataCategories")
+ public R addDataCategories(@RequestBody JinhuiComConvenientServiceCategoriesVO item);
+
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/editDataCategories")
+ public R editDataCategories(@RequestBody JinhuiComConvenientServiceCategoriesVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/expurgateDataCategories")
+ public R expurgateDataCategories(@RequestParam("id") String id);
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇体验活动
+ *
+ *
+ **********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceGetList")
+ public R experienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "activityName", required = false) String activityName,
+ @RequestParam(value = "activityType", required = false) String activityType,
+ @RequestParam(value = "starTime", required = false) Date starTime,
+ @RequestParam(value = "endTime", required = false) Date endTime);
+
+ /**
+ * 单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceGetDetails")
+ public R experienceGetDetails(@RequestParam("id") String id);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/experienceAddData")
+ public R experienceAddData(@RequestBody JinhuiExperienceActivityVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/experienceEditData")
+ public R experienceEditData(@RequestBody JinhuiExperienceActivityVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceExpurgateData")
+ public R experienceExpurgateData(@RequestParam("id") String id);
+
+
+ /******************************************************************************************************
+ *
+ * 金汇文章
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleGetList")
+ public R articleGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "articleType", required = false) String articleType,
+ @RequestParam(value = "conditionType", required = false) String conditionType);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleGetDetails")
+ public R articleGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiArticle/articleAddData")
+ public R articleAddData(@RequestBody JinhuiArticleManagementVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiArticle/articleEditData")
+ public R articleEditData(@RequestBody JinhuiArticleManagementVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleExpurgateData")
+ public R articleExpurgateData(@RequestParam("id") String id);
+
+
+
+ /*******************************************************************************************************
+ *
+ * 金汇报名体验
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/applyExperienceGetList")
+ public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "isFeedback", required = false) String isFeedback,
+ @RequestParam(value = "activityId", required = false) String activityId);
+
+
+ @GetMapping("/JinhuiExperience/applyExperienceGetDetails")
+ public R applyExperienceGetDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "activityId", required = false) String activityId);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/applyExperienceAddData")
+ public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item);
+
+ @PostMapping("/JinhuiExperience/applyExperienceEditData")
+ public R applyExperienceEditData(@RequestBody JinhuiApplyExperienceVO item);
+
+ @DeleteMapping("/JinhuiExperience/applyExperienceExpurgateData")
+ public R applyExperienceExpurgateData(@RequestParam("id") String id);
+
+
+ /**
+ * 填写反馈接口
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/applyExperienceFilIn")
+ public R filIn(@RequestParam("userId") String userId,
+ @RequestParam("activityId") String activityId,
+ @RequestParam("content") String content);
+
+
+
+ /**************************************************************************************************************
+ *
+ *
+ * 定时任务
+ *
+ *
+ *******************************************************************************************************************/
+
+ //金汇社区定时任务
+ @GetMapping("/JinhuiExperience/timedTaskJinhuiActivitiesJobHandler")
+ public R timedTaskJinhuiActivitiesJobHandler();
+
+
}
--
Gitblit v1.7.1