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 | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 232 insertions(+), 2 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 e94cce8..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,13 +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.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;
/**
* 金汇社区
@@ -209,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);
/**
* 分页查询便民服务商家 运营后台
@@ -218,7 +222,7 @@
* @return
*/
@PostMapping("/jinhuiMerchant/page")
- public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);
+ public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO);
/**
* 获取便民服务商家详情
@@ -239,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);
/**************************************************************************************************************
*
@@ -679,4 +690,223 @@
@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