From ed330ac8093d93cba9fd25fc32267039e8909e83 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 21 三月 2023 17:58:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new-合并账号
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java | 12 +++++++++++-
phis-feign/src/main/java/com/hz/his/dto/user/project/DirectRepealVo.java | 22 ++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java | 6 ++++--
3 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
index 2b28995..3092e43 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
@@ -11,10 +11,12 @@
private Integer operateType;
/**鎿嶄綔鐤楃▼鏁�*/
private Integer operateNum;
+ /**鎿嶄綔鍒掓墸閲戦*/
+ private Integer deductionTotal;
- /**鎿嶄綔闂ㄥ簵鏍囪瘑*/
+ /**鎿嶄綔闂ㄥ簵鏍囪瘑锛堝簾寮冿級*/
private String shopId;
- /**鎿嶄綔鍛樺伐*/
+ /**鎿嶄綔鍛樺伐锛堝簾寮冿級*/
private String employeeId;
/**鎿嶄綔鍛樺伐瑙掕壊*/
private String employeeRoleId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectRepealVo.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectRepealVo.java
new file mode 100644
index 0000000..8eca166
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectRepealVo.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.user.project;
+
+import lombok.Data;
+
+@Data
+public class DirectRepealVo {
+
+ /**鎿嶄綔鐢ㄦ埛椤圭洰璁板綍鏍囪瘑*/
+ private String id;
+
+ /**鎿嶄綔闂ㄥ簵鏍囪瘑锛堝簾寮冿級*/
+ private String shopId;
+ /**鎿嶄綔鍛樺伐锛堝簾寮冿級*/
+ private String employeeId;
+ /**鎿嶄綔鍛樺伐瑙掕壊*/
+ private String employeeRoleId;
+
+ /**鎿嶄綔鍘熷洜*/
+ private String remarkInfo;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java
index 0801c5e..c3d080c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.user.project.DirectCannelVo;
+import com.hz.his.dto.user.project.DirectRepealVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -18,6 +19,15 @@
* @param directCannelVo 灏佽瀵硅薄
* @return
*/
- @PostMapping(value = "/user/getUserLabel")
+ @PostMapping(value = "/user/project/direct/cancel")
Result directCancel(@RequestBody DirectCannelVo directCannelVo);
+
+ /**
+ * 浣滃簾鐩存帴鎿嶄綔鐢ㄦ埛椤圭洰
+ * 鍛樺伐鐩存帴鎿嶄綔
+ * @param directRepealVo 灏佽瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/user/project/direct/repeal")
+ Result directRepeal(@RequestBody DirectRepealVo directRepealVo);
}
\ No newline at end of file
--
Gitblit v1.8.0