From 503a9f7f2ef6ae1bb2eaccdbaa50cc6711b1f4a9 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 14 十二月 2022 15:28:35 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 22 +++++++++++++++-------
1 files changed, 15 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..15ae1f3 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,26 @@
*/
@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;
+ //闈炲繀濉� 鏀堕摱鍛榠d
+ private String cashier;
+ //闈炲繀濉� 鏀堕摱鍛橀棬搴�
+ private String cashierShopId;
}
--
Gitblit v1.8.0