From a0c7de34c4539a73e1c08e4dee6609b791dd34c0 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期四, 01 十二月 2022 10:12:05 +0800
Subject: [PATCH] Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
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 2c8e35e..1df593b 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
@@ -13,18 +13,22 @@
*/
@Data
public class PayDto {
- //鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�
+ //蹇呭～ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0
private Integer type;
- //璁㈠崟id 蹇呭～
+ //蹇呭～ 璁㈠崟id
private String orderId;
- //搴斾粯鎬婚噾棰� 蹇呭～
+ //蹇呭～ 搴斾粯鎬婚噾棰�
private String total;
- //缁撹处鍙傛暟 蹇呭～
+ //蹇呭～ 缁撹处鍙傛暟
private List<PayAmountDto> amount;
- //鎿嶄綔浜烘爣璇� 蹇呭～,crm濉敤鎴�
+ //蹇呭～ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�
private String operatorId;
- //浼樻儬鍒竔d
+
+ //闈炲繀濉� 浼樻儬鍒竔d
private String userCouponId;
- //璁㈠崟棰嗗缓鏍囪瘑
+ //闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑
private String hisOrderId;
+
+ //闈炲繀濉� 浼樻儬鍒竔d闆嗗悎
+ private List<String> userCouponIds;
}
--
Gitblit v1.8.0