From ee641b3624cb2f0c4783cd7b0f44684fb40e913f Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 05 八月 2024 18:30:29 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-xlk
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 8 ++++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index 79d8a0e..3372d50 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -22,6 +22,8 @@
private BigDecimal totalIntegral;
/**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
private BigDecimal totalPoints;
+ /**蹇呭～ 鎶樻墸绠楁硶*/
+ private Integer discountAlgorithm = DISCOUNT_ALGORITHM_PRICE;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
/**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
@@ -69,4 +71,10 @@
/** 瀛愬崟浼樻儬绂忓埄鏁版嵁 */
private List<OrderItemPreferentialDto> orderItemPreferentialList;
+
+ /**鎶樻墸绠楁硶-鍗曚环绠楋紙鍗曚环涔樹互鎶樻墸锛�*/
+ public static final int DISCOUNT_ALGORITHM_PRICE = 0;
+ /**鎶樻墸绠楁硶-鎬讳环绠楋紙鎬讳环涔樹互鎶樻墸锛�*/
+ public static final int DISCOUNT_ALGORITHM_TOTAL = 1;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
index 7dbb7a3..c4a3f06 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
@@ -3,6 +3,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* @author wzh
@@ -39,6 +40,9 @@
/** 澶囨敞 */
private String remarks;
+ /** 鍏朵粬閫�娆炬柟寮� */
+ private List<OrderPayMethodDto> otherRefundMethodList;
+
public OrderPayMethodDto() {
}
--
Gitblit v1.8.0