From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index 57030f2..0d28248 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -13,10 +13,17 @@
*/
@Data
public class PayAmountDto {
+ /**鏄惁宸叉彁鍓嶆墸鍙�,渚嬪鎷煎洟璁㈠崟鍏堟墸鍙�,鍚庣画缁撹处涓嶇敤鍐嶆墸鍑�*/
+ private Boolean isPay = false;
+ /**宸叉彁鍓嶆墸鍙栫殑璁板綍鏍囪瘑*/
+ private String isPayId;
+
/**蹇呭～ 瀹為檯鏀粯閲戦*/
private BigDecimal amount;
/**蹇呭～ 鏀粯鏂瑰紡*/
private String method;
+ /**蹇呭～ 鎶垫墸瀹為檯鏀粯鐨勯噾棰� 濡傛灉鏄Н鍒嗘姷鎵ｇ幇閲戣繖閲屽瓨鐨勬槸瑕佹敮浠樼殑绉垎*/
+ private BigDecimal deductionAmount = BigDecimal.ZERO;
/**闈炲繀濉� 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
private String commonId;
--
Gitblit v1.8.0