From 15a48884e67c10739ff38d4d2a823480d4b6ac0f Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 28 七月 2023 11:59:18 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java | 22 +++++++++++
phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java | 34 +++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java | 45 ++++++++++++++++++++++
3 files changed, 101 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java
index 8cdec51..4a08b02 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java
@@ -27,6 +27,15 @@
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
/**
+ *鑾峰彇灏忕▼搴忎紒涓氬井淇″簲鐢╰oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/apply/get_token")
+ Result corpApplyToken(@RequestBody GetTokenDto getTokenDto);
+
+ /**
*鑾峰彇灏忕▼搴忔櫘閫歵oken
* 杞寲浣跨敤 WxTokenDt
* @param getTokenDto 瀵硅薄
@@ -37,6 +46,15 @@
@RequestHeader(name = "appId",required = true) String appId,
@RequestHeader(name = "sign",required = true) String sign,
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
+
+ /**
+ *鑾峰彇灏忕▼搴忔櫘閫歵oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/mp/get_token")
+ Result mpToken(@RequestBody GetTokenDto getTokenDto);
/**
@@ -52,6 +70,15 @@
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
/**
+ *鑾峰彇鍏紬鍙锋櫘閫歵oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/weChat/get_token")
+ Result weChatToken(@RequestBody GetTokenDto getTokenDto);
+
+ /**
*鑾峰彇浼佷笟寰俊閫氳褰晅oken
* 杞寲浣跨敤 WxTokenDt
* @param getTokenDto 瀵硅薄
@@ -64,6 +91,15 @@
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
/**
+ *鑾峰彇浼佷笟寰俊閫氳褰晅oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/communi/get_token")
+ Result corpCommonToken(@RequestBody GetTokenDto getTokenDto);
+
+ /**
*鑾峰彇浼佷笟寰俊鑱旂郴鎴憈oken
* 杞寲浣跨敤 WxTokenDt
* @param getTokenDto 瀵硅薄
@@ -75,4 +111,13 @@
@RequestHeader(name = "sign",required = true) String sign,
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
+ /**
+ *鑾峰彇浼佷笟寰俊鑱旂郴鎴憈oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/contact/get_token")
+ Result corpContactToken(@RequestBody GetTokenDto getTokenDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
new file mode 100644
index 0000000..d02644e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
@@ -0,0 +1,22 @@
+package com.hz.his.feign.service.platform.payment;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.payment.PayNoVo;
+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 = "pay-no")
+public interface SPayNoService {
+
+ /**
+ * 鑾峰彇鏀粯缂栧彿锛屽彧杩斿洖鏀粯缂栧彿
+ * data灏辨槸鏀粯缂栧彿
+ */
+ @PostMapping(value = "/pay/create")
+ Result payCreate(@RequestBody PayNoVo payNoVo);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java b/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
new file mode 100644
index 0000000..64d06f3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
@@ -0,0 +1,34 @@
+package com.hz.his.vo.payment;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class PayNoVo {
+ /**Y-璁㈠崟鍙�*/
+ private String orderNo;
+ /**Y-鍙犲姞闀垮害锛屽湪orderNo鍚庨潰娣诲姞闀垮害锛岄粯璁�6锛屾病鏈夌壒娈婅姹傞兘鏄粯璁�6*/
+ private Integer lengrhCount = 6;
+ /**Y-浜ゆ槗鏂瑰紡*/
+ private String payWay;
+
+ /**Y-鍏宠仈绫诲瀷*/
+ private Integer type;
+ /**Y-鍏宠仈绫诲瀷鏍囪瘑*/
+ private String typeId;
+
+
+ /**鍏宠仈绫诲瀷-鎬昏鍗�*/
+ public static final int TYPE_ORDER = 0;
+
+ /**浜ゆ槗鏂瑰紡-寰俊*/
+ public static final String PAY_WAY_WECHAT = "WECHAT";
+ /**浜ゆ槗鏂瑰紡-鏀粯瀹�*/
+ public static final String PAY_WAY_ALIPAY = "ALIPAY";
+ /**浜ゆ槗鏂瑰紡-閾惰仈*/
+ public static final String PAY_WAY_UNIONPAY = "UNIONPAY";
+ /**浜ゆ槗鏂瑰紡-鏁板瓧浜烘皯甯�*/
+ public static final String PAY_WAYE_EC = "EC";
+}
--
Gitblit v1.8.0