From f6f928d81ad53f424f35a9149db11b301ed7f8a8 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期一, 22 四月 2024 16:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java
index 5991710..33fd506 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java
@@ -139,7 +139,15 @@
* @return 总工会户外劳共用户
*/
@PostMapping("/unionUser/authentication")
- public R unionUserAuthentication(@RequestBody UnionUserDto unionUserDto);
+ R unionUserAuthentication(@RequestBody UnionUserDto unionUserDto);
+
+ /**
+ * 用户开门
+ * @param qRCode 二维码字符串
+ * @return 总工会户外劳共用户
+ */
+ @GetMapping("/unionUser/openDoor")
+ R openDoor(@RequestParam(value = "qRCode") String qRCode);
/**
@@ -231,7 +239,8 @@
@GetMapping("/UnionExchangeRecord/getList")
public R unionExchangeRecordGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam(value = "communityId",required = false) String communityId);
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "orderType",required = false) String orderType);
@GetMapping("/UnionExchangeRecord/getData")
--
Gitblit v1.7.1