From 294931596c9b3a0d2866bff295c260f793a44b2d Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 11 八月 2022 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/user/money/PhisUserMoneyDto.java | 63 +++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 4 +-
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 10 -----
3 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/PhisUserMoneyDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/PhisUserMoneyDto.java
new file mode 100644
index 0000000..30bf2d7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/PhisUserMoneyDto.java
@@ -0,0 +1,63 @@
+package com.hz.his.dto.user.money;
+
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * 淇敼鐢ㄦ埛璧勯噾
+ *
+ * @author wzh
+ */
+@Data
+@ToString
+public class PhisUserMoneyDto {
+ /**
+ * 鐢ㄦ埛Id
+ */
+ private String userId;
+ /**
+ * 鎿嶄綔浜篒d
+ */
+ private String operatorId;
+ /**
+ * 鍌ㄥ�奸噾
+ */
+ private String storedValueFund;
+ /**
+ * 澧炲�奸噾
+ */
+ private String valueAddedFund;
+ /**
+ * 绉垎
+ */
+ private String integral;
+ /**
+ * 棰勫畾閲�
+ */
+ private String deposit;
+ /**
+ * 澶囨敞
+ */
+ private String note;
+
+ /*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
+
+ /**
+ * 鎿嶄綔浜虹被鍨�-鐢ㄦ埛
+ */
+ public static final int OPERATOR_TYPE_USER = 0;
+ /**
+ * 鎿嶄綔浜虹被鍨�-鍛樺伐
+ */
+ public static final int OPERATOR_TYPE_EMPLOYEE = 1;
+ /**
+ * 鎿嶄綔浜虹被鍨�-绠＄悊鍛�
+ */
+ public static final int OPERATOR_TYPE_ADMIN = 2;
+ /**
+ * 鎿嶄綔浜虹被鍨�-绯荤粺
+ */
+ public static final int OPERATOR_TYPE_SYSTEM = 3;
+
+}
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 fa00de5..8dbfbd0 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
@@ -26,16 +26,6 @@
@RequestMapping(value = "/cos/upload-multipart",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
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-file")
- Result upload(@RequestParam("file") File file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName);
/**
*涓嬭浇鍥剧墖
* 鍙互浣跨敤 FileDownUtil.downToFile()鏂规硶杞寲涓烘枃浠�
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
index eaf294e..2531f89 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
@@ -1,7 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserParamDto;
+import com.hz.his.dto.user.money.PhisUserMoneyDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +16,7 @@
* 寮�鏀惧钩鍙�-鐢ㄦ埛鏂板
*/
@PostMapping(value = "/user/money/op")
- Result addUser(@RequestBody UserParamDto userParamDto);
+ Result upUserMoney(@RequestBody PhisUserMoneyDto userMoneyDto);
--
Gitblit v1.8.0