From 8c51032933d201b0c7aedbde0af6e5ff52db329d Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 14 十二月 2022 10:54:03 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 4 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 6 +++++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index a2c339b..92423d0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -27,6 +27,8 @@
public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
/**鍏叡鏍囪瘑绫诲瀷,鑰佸甫鏂�*/
public static String TYPE_COMMON_OLD_NEW = "old_new";
- /**鍏叡鏍囪瘑绫诲瀷,鍥㈣喘娲诲姩*/
+ /**鍏叡鏍囪瘑绫诲瀷,绀煎搧鍗�*/
public static String TYPE_COMMON_GIFT = "gift";
+ /**鍏叡鏍囪瘑绫诲瀷,钀ラ攢浼樻儬鍒�*/
+ public static String TYPE_COMMON_MARKE = "marketing";
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 9462bd1..7f1e96e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -60,4 +60,8 @@
@PostMapping(value = "/emp/userId/role/check")
Result checkUserIdRole(@RequestBody(required = false)EmployeeDto employeeDto);
+ @PostMapping(value = "/emp/role/liset")
+ Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);
+
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index bb49a46..1407ddc 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -145,5 +145,9 @@
@PostMapping(value = "/order/refund/nextStep")
Result nextStep(OrderRefundDto orderRefundDto);
-
+ /**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟閮ㄥ垎閫�娆惧鏍搁�氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/order/partRefund")
+ Result partRefundApproval(@RequestBody AduitDto aduitDto);
}
\ No newline at end of file
--
Gitblit v1.8.0