From 7e4852e4b12f5728e11e9c50caa96d3aba3786ff Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 03 二月 2023 13:04:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 11 +++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 4 ++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java | 6 +++++-
3 files changed, 20 insertions(+), 1 deletions(-)
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 8dbfbd0..a83202d 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
@@ -27,6 +27,17 @@
Result upload(@RequestPart("file") MultipartFile file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName);
/**
+ *涓婁紶鍥剧墖锛堣浆鍖栧疄浣揊ileUpdateDto锛�
+ * @param file 鏂囦欢
+ * @param folderCode 瀛樺偍鏂囦欢澶�,姣斿鍟嗗搧杞挱鍥�:/goods/banner
+ * @param bucketName 瀛樺偍妗跺悕绉�
+ * @return
+ */
+ @RequestMapping(value = "/cos/upload-multipart/name",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ Result upload(@RequestPart("file") MultipartFile file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName,@RequestParam("bucketName")String fileName);
+
+
+ /**
*涓嬭浇鍥剧墖
* 鍙互浣跨敤 FileDownUtil.downToFile()鏂规硶杞寲涓烘枃浠�
* @param cosDownDto 瀵硅薄
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
index 75c960b..bc71485 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
@@ -38,5 +38,9 @@
@PostMapping(value = "/order/numByActivityId")
Result queryOrderNumByActivityId(@RequestParam("activityId") String activityId);
-
+ /**
+ * 璁㈠崟鍒楄〃
+ */
+ @PostMapping(value = "/order/deta/all")
+ Result getOrderDetasAll(@RequestBody OrderDto orderDto);
}
\ 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 0b773ba..a1657e4 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
@@ -6,6 +6,7 @@
import com.hz.his.dto.user.UserUnionDto;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
+import net.sf.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -62,6 +63,9 @@
@PostMapping(value = "/user/coupon/cancel")
Result cancelUserCoupon(@RequestBody UserCouponDto userCouponDto);
+ /** 涓诲姩鍚屾鍒涘缓椤惧鍒癶is - 浼氬憳绛夌骇*/
+ @PostMapping("/user/sync/update/his/user/level")
+ Result updateMembership(@RequestBody JSONObject jsonObject);
}
\ No newline at end of file
--
Gitblit v1.8.0