From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
index 476aa48..f3f7169 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -120,6 +120,16 @@
     }
 
     /**
+     * 外部调用提交居家隔离
+     * @param comActReserveCommitVO
+     * @return
+     */
+    @PostMapping("/homeQuarantine/commitNoToken")
+    public R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
+        return comActReserveService.commitNoToken(comActReserveCommitVO);
+    }
+
+    /**
      * 小程序提交预约/登记
      * @param comActReserveCommitVO
      * @return
@@ -378,4 +388,9 @@
     public R deleteRecord(@RequestParam("recordId")Long recordId){
         return R.ok(comActReserveRecordService.removeById(recordId));
     }
+
+    @GetMapping("/fiveCount")
+    public R fiveCount(@RequestParam("reserveId") Long reserveId){
+        return comActReserveRecordService.fiveCount(reserveId);
+    }
 }

--
Gitblit v1.7.1