From eba69ea7970d1abb5da1f8cc3294d777f1038ab2 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 16 五月 2024 09:58:52 +0800
Subject: [PATCH] Merge branch 'fhx-prod-复购活动' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java | 24 ++++++++++++++++++++++++
3 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
index 799d2b1..2760d5a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
@@ -17,6 +17,7 @@
public class CouponNumberDto{
/**鏍囪瘑*/
private String id;
+
/**鏍囬*/
private String title;
/**鏈夋晥寮�濮嬫椂闂�*/
@@ -58,6 +59,13 @@
/**璁℃椂绫诲瀷锛�0鏃堕棿娈碉紝1棰嗗彇鏈夋晥鏃堕暱锛堥鍙栨椂闂村彔鍔犳椂闂达級锛�2鏃犳晥鏃堕暱锛�*/
private Integer timeType;
+ /** 浼樻儬鍒竔d */
+ private String couponId;
+ /** 浼樻儬鍒告爣棰� */
+ private String couponTitle;
+ /** 浼樻儬鍒哥爜id */
+ private String couponNumberId;
+
/**璁℃椂绫诲瀷-鏃堕棿娈�*/
public static final int TIME_TYPE_SLOT = 0;
/**璁℃椂绫诲瀷-棰嗗彇鏃堕暱锛堥鍙栨椂闂村彔鍔犳椂闂达級*/
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 196d775..97b8d87 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,5 +1,6 @@
package com.hz.his.dto.order;
+import com.hz.his.dto.refund.RefundPreferentialDto;
import lombok.Data;
import java.math.BigDecimal;
@@ -78,4 +79,7 @@
//闈炲繀濉� 閲嶅彂鏍囪瘑
private String resendRecordId;
+ /** 閫�娆句紭鎯� */
+ private RefundPreferentialDto refundPreferentialDto;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java b/phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java
new file mode 100644
index 0000000..82169a8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.refund;
+
+import com.hz.his.dto.coupon.CouponNumberDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 閫�娆句紭鎯燿to
+ * @USER: fhx
+ * @DATE: 2024/5/15
+ **/
+@Data
+public class RefundPreferentialDto {
+
+ /** 瑕侀��娆剧殑澶嶈喘娲诲姩璧犻�佺Н鍒� */
+ private BigDecimal refundRepoGiftIntegral;
+ /** 瑕侀��娆句綔搴熺殑澶嶈喘娲诲姩璧犻�佷紭鎯犲埜 */
+ private List<CouponNumberDto> refundRepoGiftCouponList;
+ /** 宸蹭娇鐢ㄤ紭鎯犲埜鎻愮ず */
+ private List<String> couponTipsList;
+
+}
--
Gitblit v1.8.0