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/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index e770468..e38e6a9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -794,6 +794,16 @@
     }
 
     /**
+     * 获取志愿者详情
+     * @param id
+     * @return
+     */
+    @GetMapping("getVolunteerById")
+    R getVolunteerById(@RequestParam("id")Long id){
+        return comMngVolunteerMngService.getVolunteerById(id);
+    }
+
+    /**
      * 删除志愿者
      * @param comMngVolunteerMngVO 手机号
      * @return 删除结果
@@ -1101,6 +1111,15 @@
     @PostMapping("timedtaskactactivityall")
     R timedTaskActActivityAll(){
         return comActActivityService.timedTaskActActivityAll();
+    }
+
+    /**
+     * 定时任务刷新微心愿的状态
+     * @return 更新结果
+     */
+    @PostMapping("timedtaskactmicrowish")
+    R timedTaskActMicroWishAll(){
+        return comActMicroWishService.timedTaskActMicroWishAll();
     }
 
     /**
@@ -1435,4 +1454,13 @@
         return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
     }
 
+    /**
+     * 删除微心愿
+     * @param id
+     * @return
+     */
+    @PostMapping("deletemicrowish")
+    public R deletemicrowish(@RequestParam("id") Long id){
+        return comActMicroWishService.deleteMicroWish(id);
+    }
 }

--
Gitblit v1.7.1