From b249df80d95dd998ee93bcce2a6307b023f8cd0c Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 20 十一月 2023 10:38:26 +0800
Subject: [PATCH] Merge branch 'master' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 23 ++++++++++++++++++++---
1 files changed, 20 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 4e5fccc..57030f2 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,14 +14,29 @@
@Data
public class PayAmountDto {
/**蹇呭～ 瀹為檯鏀粯閲戦*/
- private String amount;
+ private BigDecimal amount;
/**蹇呭～ 鏀粯鏂瑰紡*/
private String method;
- /**蹇呭～ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
- private String commonId;
+ /**闈炲繀濉� 鍟嗗搧/椤圭洰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