From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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 91e40a7..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,14 +13,37 @@
*/
@Data
public class PayAmountDto {
- //瀹為檯鏀粯閲戦
- private String amount;
- //鏀粯鏂瑰紡
+ /**鏄惁宸叉彁鍓嶆墸鍙�,渚嬪鎷煎洟璁㈠崟鍏堟墸鍙�,鍚庣画缁撹处涓嶇敤鍐嶆墸鍑�*/
+ private Boolean isPay = false;
+ /**宸叉彁鍓嶆墸鍙栫殑璁板綍鏍囪瘑*/
+ private String isPayId;
+
+ /**蹇呭～ 瀹為檯鏀粯閲戦*/
+ private BigDecimal amount;
+ /**蹇呭～ 鏀粯鏂瑰紡*/
private String method;
- //鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)
+ /**蹇呭～ 鎶垫墸瀹為檯鏀粯鐨勯噾棰� 濡傛灉鏄Н鍒嗘姷鎵ｇ幇閲戣繖閲屽瓨鐨勬槸瑕佹敮浠樼殑绉垎*/
+ private BigDecimal deductionAmount = BigDecimal.ZERO;
+
+ /**闈炲繀濉� 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
private String commonId;
- //鏉冪泭绫诲瀷:鍗￠」鏀粯蹇呬紶
+ /**闈炲繀濉� 鏉冪泭绫诲瀷:鍗￠」鏀粯蹇呬紶*/
private String cardEquityId;
- //鍗″寘鏍囪瘑:鍗￠」鏀粯蹇呬紶
+ /**闈炲繀濉� 鍗″寘鏍囪瘑:鍗￠」鏀粯蹇呬紶*/
private String userCardId;
+
+ /**
+ * 鏍囪瀛楁锛岄粯璁�0
+ * 鏀粯鏂瑰紡涓虹Н鍒嗘椂锛�
+ * isDel=100锛屽垯phis杩欒竟闇�瑕佹墸鍑忕敤鎴风Н鍒�
+ * isDel=101锛屽垯phis杩欒竟涓嶉渶瑕佹墸鍑忕敤鎴风Н鍒�
+ */
+ private Integer isDel = 0;
+
+ /**闈炲繀濉� 绗笁鏂硅鍗曠紪鍙�*/
+ private String otherOrderNo;
+ /**闈炲繀濉� 娆＄骇璁㈠崟鍙锋垨鍏戞崲鐮�*/
+ private String assistOrderNo;
+ /**闈炲繀濉� OCR璇嗗埆鍥剧墖閾炬帴*/
+ private String ocrImageUrl;
}
--
Gitblit v1.8.0