From 5621d5395b5769dc684d60732c9a7465ca0e5b0e Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 14:45:32 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java | 12 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SMoneyRuleService.java | 25 ++++++++++++
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java | 2 +
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 +-
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 5 +-
7 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
index 64309a8..7745f9f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
@@ -12,4 +12,6 @@
/*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
/**璁㈠崟淇℃伅*/
private OrdersTotalDto ordersTotalDto;
+ /**閫�璐圭粺璁＄被鍨�(RefundRecord)*/
+ private String refundStatistics;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
index 0f6c7e5..11ba021 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
@@ -17,6 +17,8 @@
private OrdersTotalDto ordersTotalDto;
/**鏈閫�娆剧敵璇锋�婚噾棰�*/
private BigDecimal refundTotal;
+ /**閫�璐圭粺璁＄被鍨�(RefundRecord)*/
+ private String refundStatistics;
/**鏈閫�娆炬敮浠樻柟寮�*/
private List<PartRefundPayDto> partRefundPayDtoList;
/**鏈閫�娆鹃」鐩�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index 801c4a6..5d358a5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.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;
@@ -61,6 +59,9 @@
/** 鏄惁绗笁鏂归��娆�(0鍚�1鏄�) */
private Integer isThirdPartyRefund = 1;
+ /**蹇呭～:閫�璐圭粺璁＄被鍨�(RefundRecord)*/
+ private String refundStatistics;
+
/**澶囩敤鍙傛暟*/
//鎬昏鍗曢寤烘爣璇�
private String hisOrderId;
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 ded4a22..99d66e4 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..7d006bf
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMoneyRuleService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.phis.vo.money.MoneyRuleVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+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 moneyRuleVo 浼犲弬瀵硅薄
+ * @return 杩斿洖锛岀湅浠ｇ爜
+ */
+ @PostMapping(value = "/money-rule/list")
+ Result getList(@RequestBody MoneyRuleVo moneyRuleVo);
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java b/phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java
new file mode 100644
index 0000000..d6b46a5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java
@@ -0,0 +1,12 @@
+package com.hz.phis.vo.money;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class MoneyRuleVo {
+ /**鍔熻兘缂栧彿*/
+ private String functionCode;
+}
--
Gitblit v1.8.0