From 05e9aa8a610932d706d48257a36e95cec9de39fa Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 22 二月 2024 19:22:37 +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/SMoneyRuleService.java | 23 +++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 12 ++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 5 ++---
3 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index c5bb717..3594f19 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -1,7 +1,5 @@
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;
@@ -112,5 +110,6 @@
private Integer activityPageType = 0;
/**娲诲姩鍖哄垎缂栧彿-鐢ㄤ簬涓�娆℃�ф椿鍔紝瀛樺偍娲诲姩缂栧彿锛屼究浜庢煡鎵�*/
private String activityPageCode;
-
+ /**娲诲姩鍖哄垎鏍囬*/
+ private String activityPageName;
}
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 210a568..004e530 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
@@ -2,6 +2,7 @@
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -57,4 +58,15 @@
private Integer directDeduction = 0;
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
+
+ /**璧犻�佸埌璐︾敤鎴�*/
+ private String giveIncreaseUserId;
+ /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級*/
+ private BigDecimal giveIncrease;
+ /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級*/
+ private String giveIncreaseId;
+ /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず锛�*/
+ private String giveIncreaseTitle;
+
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMoneyRuleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMoneyRuleService.java
new file mode 100644
index 0000000..3992df1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMoneyRuleService.java
@@ -0,0 +1,23 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**
+ * 璧勯噾鍒拌处瑙勫垯
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "money-rule")
+public interface SMoneyRuleService {
+
+ /**
+ * @param functionCode 鍔熻兘缂栧彿
+ * @return
+ */
+ @PostMapping(value = "/money-rule/list")
+ Result getList(@RequestParam("functionCode") String functionCode);
+
+}
--
Gitblit v1.8.0