From 13f8c7c5a4fedf6b7222f6775d414f6e8bf95ebc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 六月 2023 15:08:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java | 15 +++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java | 13 +++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 9 +++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 6 ++++++
5 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java
new file mode 100644
index 0000000..5c7c17b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto.file;
+
+import lombok.Data;
+
+/**鐢熸垚绛惧悕璁块棶URL
+ * @author CJH*/
+@Data
+public class FileSignReturnVo {
+
+ /**鏂囦欢璺緞*/
+ private String fileUrl;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
new file mode 100644
index 0000000..8c82c2f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
@@ -0,0 +1,15 @@
+package com.hz.his.dto.file;
+
+import lombok.Data;
+
+/**鐢熸垚绛惧悕璁块棶URL
+ * @author CJH*/
+@Data
+public class FileSignVo {
+
+ /**鏂囦欢璺緞*/
+ private String fileUrl;
+ /**妗跺悕绉�-鍙笉浼�*/
+ private String bucketName;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index d52c540..2574514 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -95,4 +95,6 @@
public static final String OPERATION_REASON_CHANGE = "changeGoods";
/**鎿嶄綔鏂瑰紡-鐢熸棩璧犻��*/
public static final String OPERATION_REASON_BIRTHDAY_GIFT = "birthdayGift";
+
+ public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index ed9dc06..b927907 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.file.FileDownDto;
+import com.hz.his.dto.file.FileSignVo;
import feign.Response;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
@@ -46,4 +47,12 @@
@PostMapping(value = "/cos/download-file")
Response downloadFile(@RequestBody FileDownDto cosDownDto);
+ /**
+ *鐢熸垚绛惧悕璁块棶URL
+ * @param fileSignVo 瀵硅薄
+ * @return 浣跨敤FileSignReturnVo杞寲
+ */
+ @PostMapping(value = "/cos/signUrl")
+ Response downloadFile(@RequestBody FileSignVo fileSignVo);
+
}
\ No newline at end of file
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 a1816d4..074a4f0 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,4 +96,10 @@
*/
@PostMapping(value = "/user/families/room/info/update")
Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绛夌骇閲嶆柊璁＄畻
+ */
+ @PostMapping(value = "/user/level/calc")
+ Result userLevelCalc(@RequestBody UserParamDto userParamDto);
}
\ No newline at end of file
--
Gitblit v1.8.0