From f52dc5114638600e934cc82fe63c4a25f22594cc Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期一, 13 五月 2024 10:56:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 10 +++++++--- 1 files changed, 7 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..99fbe70 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; + /** * 缁撹处閲戦闆嗗悎 * @@ -12,12 +14,14 @@ @Data public class PayAmountDto { /**蹇呭~ 瀹為檯鏀粯閲戦*/ - private String amount; + private BigDecimal amount; /**蹇呭~ 鏀粯鏂瑰紡*/ private String method; - /**蹇呭~ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/ - private String commonId; + /**蹇呭~ 鎶垫墸瀹為檯鏀粯鐨勯噾棰� 濡傛灉鏄Н鍒嗘姷鎵g幇閲戣繖閲屽瓨鐨勬槸瑕佹敮浠樼殑绉垎*/ + private BigDecimal deductionAmount = BigDecimal.ZERO; + /**闈炲繀濉� 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/ + private String commonId; /**闈炲繀濉� 鏉冪泭绫诲瀷:鍗¢」鏀粯蹇呬紶*/ private String cardEquityId; /**闈炲繀濉� 鍗″寘鏍囪瘑:鍗¢」鏀粯蹇呬紶*/ -- Gitblit v1.8.0