From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderOtherFilesDto.java | 13 +++++++++++++
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 ++++++++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 3 +++
7 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index 3907d31..9640ea9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -25,6 +25,8 @@
private List<String> typeIdList;
/**appid*/
private String appId;
+ /*** 闂ㄥ簵ID**/
+ private String shopId;
public Integer getPageNum() {
if(this.pageNum == null || this.pageNum < 0){
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/OrderOtherFilesDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderOtherFilesDto.java
new file mode 100644
index 0000000..b16914e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderOtherFilesDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto.order;
+
+
+import lombok.Data;
+
+@Data
+public class OrderOtherFilesDto {
+
+ /*** 鏂囦欢绫诲瀷 **/
+ private String fileType;
+ /*** 鏂囦欢璺緞**/
+ private String fileUrl;
+}
\ No newline at end of file
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() {
}
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 97b8d87..48e7c8b 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
@@ -73,6 +73,9 @@
/**蹇呭～:閫�璐圭粺璁＄被鍨�(RefundRecord)*/
private String refundStatistics;
+ /**鏄惁褰掕繕鍟嗗搧 0=鍚� 1=鏄�*/
+ private Integer isReturnBack;
+
/**澶囩敤鍙傛暟*/
//鎬昏鍗曢寤烘爣璇�
private String hisOrderId;
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 6f5dbaa..0a97690 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
@@ -61,6 +61,8 @@
/**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
private List<String> canIntegralCashIdList;
+ /**闈炲繀濉� 鍏朵粬鎴浘鎴栬�呮枃浠朵笂浼� **/
+ private List<OrderOtherFilesDto> otherInfoFiles;
/**缁撹处鍚庤禒閫�*/
private PaySendDto paySendDto;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
index eee977b..d692ebb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
@@ -20,5 +20,7 @@
/**浠锋牸鏌ヨ 鏈�灏忎环鏍� 鏈�澶т环鏍�*/
private String minPrice;
private String maxPrice;
+ /**鏌ヨ鍖哄垎 0=椤圭洰鍒嗙被鏌ヨ 1=璇夋眰鍒嗙被鏌ヨ**/
+ private Integer searchType;
}
--
Gitblit v1.8.0