From 5e5ea0e3b26dbe73b38ee346380623000da037ae Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 28 六月 2023 19:10:08 +0800
Subject: [PATCH] Merge branch 'prod-扫码登记' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java | 20 ++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java | 30 ++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 8 ++------
3 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java b/phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java
new file mode 100644
index 0000000..d58528a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.mp;
+
+
+/**
+ * 灏忕▼搴忎簩缁寸爜dto
+ */
+public class MpQrCodeDto {
+
+ //ciq
+ private String ciq;
+
+ //闂ㄥ簵缂栧彿
+ private String shopCode;
+
+ public String getCiq() {
+ return ciq;
+ }
+
+ public void setCiq(String ciq) {
+ this.ciq = ciq;
+ }
+
+ public String getShopCode() {
+ return shopCode;
+ }
+
+ public void setShopCode(String shopCode) {
+ this.shopCode = shopCode;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java
new file mode 100644
index 0000000..8d6e743
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.mp.MpQrCodeDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-qrcode")
+public interface SPhipMpQrCodeService {
+
+ /**
+ * 寮�鏀惧钩鍙�- 鐢ㄦ埛鎵爜鐧昏妯″潡 娉ㄥ唽缁戝畾鍚庡垱寤篽is鍔╂墜灏忕▼搴忕爜(MpQrCodeController-userTempVisitQrCode鏂规硶)
+ */
+ @PostMapping(value = "/mp/qrcode/user/temp/visit/qrcode")
+ Result userTempVisitQrCode(@RequestBody MpQrCodeDto mpQrCodeDto);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 157b7c4..e967991 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -96,12 +96,8 @@
*/
@PostMapping(value = "/user/families/room/info/update")
Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
-
- /**
- * 寮�鏀惧钩鍙�- 鐢ㄦ埛鎵爜鐧昏妯″潡 娉ㄥ唽缁戝畾鍚庡垱寤篽is鍔╂墜灏忕▼搴忕爜(UserCreateMpQrcodeController-bindCreateHisQrcode鏂规硶)
- */
- @PostMapping(value = "/user/mp/qrcode/create/his")
- Result bindCreateHisQrcode(@RequestBody com.alibaba.fastjson.JSONObject jsonObject);
+
+
/**
* 寮�鏀惧钩鍙�-鐢ㄦ埛绛夌骇閲嶆柊璁＄畻
--
Gitblit v1.8.0