From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 7b0dc41..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
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* 缁撹处閲戦闆嗗悎
*
@@ -11,13 +13,20 @@
*/
@Data
public class PayAmountDto {
+ /**鏄惁宸叉彁鍓嶆墸鍙�,渚嬪鎷煎洟璁㈠崟鍏堟墸鍙�,鍚庣画缁撹处涓嶇敤鍐嶆墸鍑�*/
+ private Boolean isPay = false;
+ /**宸叉彁鍓嶆墸鍙栫殑璁板綍鏍囪瘑*/
+ private String isPayId;
+
/**蹇呭～ 瀹為檯鏀粯閲戦*/
- private String amount;
+ private BigDecimal amount;
/**蹇呭～ 鏀粯鏂瑰紡*/
private String method;
- /**蹇呭～ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
- private String commonId;
+ /**蹇呭～ 鎶垫墸瀹為檯鏀粯鐨勯噾棰� 濡傛灉鏄Н鍒嗘姷鎵ｇ幇閲戣繖閲屽瓨鐨勬槸瑕佹敮浠樼殑绉垎*/
+ private BigDecimal deductionAmount = BigDecimal.ZERO;
+ /**闈炲繀濉� 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
+ private String commonId;
/**闈炲繀濉� 鏉冪泭绫诲瀷:鍗￠」鏀粯蹇呬紶*/
private String cardEquityId;
/**闈炲繀濉� 鍗″寘鏍囪瘑:鍗￠」鏀粯蹇呬紶*/
--
Gitblit v1.8.0