From 6be686a489be1fef3df7bfb7cdcdec597dd2d659 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期六, 07 一月 2023 18:49:13 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-zhangxu
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipRefundService.java | 30 +++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/refund/RefundFundsDto.java | 47 +++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 5 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 7 +++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 3 +
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 4 ++
6 files changed, 96 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 015c101..b3ea858 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -33,5 +33,9 @@
/**浼樻儬鍒告爣璇�*/
private String couponId;
+ /**鍙戞斁浼樻儬鍒稿弬鏁�-璁㈠崟鏍囪瘑*/
+ private String orderId;
+ /*鐢ㄦ埛浼樻儬鍒�*/
+ private String couponNumberId;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
index 9f20bc0..2442316 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
@@ -1,5 +1,7 @@
package com.hz.his.dto.order;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.math.BigDecimal;
@@ -34,4 +36,9 @@
/**鏄惁纭璁㈠崟*/
private Integer isCustomerConfirm;
+ /**澶勬柟璁㈠崟鍙�*/
+ private String prescriptionNo;
+ /**澶勬柟璁㈠崟id*/
+ private String prescriptionId;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index c3ec5a1..37efc53 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -32,4 +32,7 @@
private String cashier;
//闈炲繀濉� 鏀堕摱鍛橀棬搴�
private String cashierShopId;
+
+ //闈炲繀濉� 浼樻儬鍒竔d闆嗗悎
+ private List<String> userCouponIds;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/refund/RefundFundsDto.java b/phis-feign/src/main/java/com/hz/his/dto/refund/RefundFundsDto.java
new file mode 100644
index 0000000..96ab902
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/refund/RefundFundsDto.java
@@ -0,0 +1,47 @@
+package com.hz.his.dto.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 鐢ㄦ埛璧勯噾閫�娆綿to
+ */
+@Data
+public class RefundFundsDto {
+
+ // 閫�娆鹃噾棰�
+ private BigDecimal refundTotal;
+ // 鐢ㄦ埛id
+ private String userId;
+ // 闂ㄥ簵id
+ private String shopId;
+ // 鏀舵鏂�
+ private String payee;
+ // 寮�鎴疯
+ private String openBank;
+ // 寮�鎴锋敮琛�
+ private String openBranch;
+ // 璐﹀彿
+ private String account;
+ // 澶囨敞
+ private String remarks;
+ // 鎿嶄綔浜虹被鍨�
+ private Integer operatorType;
+ // 鎿嶄綔浜篿d
+ private String operatorId;
+ // 骞冲彴鏉ユ簮
+ private String platformSource;
+
+ // 钀ラ攢鍔╂墜瀹℃壒鏍囪瘑
+ private String applyId;
+ // 閫�娆炬爣璇�
+ private String refundId;
+ // 0:瀹℃牳澶辫触,1:瀹℃牳閫氳繃
+ private Integer type;
+ // 瀹℃牳浜烘爣璇�
+ private String examEmplId;
+
+ public RefundFundsDto() {
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
index b99219d..edd3c19 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -44,4 +44,9 @@
@PostMapping(value = "/coupon/invalid/user/coupon")
Result invalidCouponNumber(@RequestBody CouponDto couponDto);
+ /**
+ * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤
+ */
+ @PostMapping(value = "/coupon/check/coupon")
+ Result checkCoupon(@RequestBody CouponDto couponDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipRefundService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipRefundService.java
new file mode 100644
index 0000000..13c6c65
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipRefundService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.refund.RefundFundsDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-refund")
+public interface SPhipRefundService {
+
+ /**
+ * 鐢ㄦ埛璧勯噾閫�娆�
+ * @param refundFundsDto 鍙傛暟
+ * @return 杩斿洖
+ */
+ @PostMapping("/refund/user/funds")
+ Result refundUserFunds(@RequestBody RefundFundsDto refundFundsDto);
+
+ /**
+ * 鐢ㄦ埛璧勯噾閫�娆惧鏍�
+ * @param refundFundsDto 鍙傛暟
+ * @return 杩斿洖
+ */
+ @PostMapping(value = "/refund/user/funds/approve")
+ Result refundUserFundsApprove(@RequestBody RefundFundsDto refundFundsDto);
+}
--
Gitblit v1.8.0