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 |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 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 57fc55e..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,15 +13,37 @@
  */
 @Data
 public class PayAmountDto {
-    //蹇呭~ 瀹為檯鏀粯閲戦
-    private String amount;
-    //蹇呭~ 鏀粯鏂瑰紡
-    private String method;
-    //蹇呭~ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)
-    private String commonId;
+    /**鏄惁宸叉彁鍓嶆墸鍙�,渚嬪鎷煎洟璁㈠崟鍏堟墸鍙�,鍚庣画缁撹处涓嶇敤鍐嶆墸鍑�*/
+    private Boolean isPay = false;
+    /**宸叉彁鍓嶆墸鍙栫殑璁板綍鏍囪瘑*/
+    private String isPayId;
 
-    //闈炲繀濉� 鏉冪泭绫诲瀷:鍗¢」鏀粯蹇呬紶
+    /**蹇呭~ 瀹為檯鏀粯閲戦*/
+    private BigDecimal amount;
+    /**蹇呭~ 鏀粯鏂瑰紡*/
+    private String method;
+    /**蹇呭~ 鎶垫墸瀹為檯鏀粯鐨勯噾棰� 濡傛灉鏄Н鍒嗘姷鎵g幇閲戣繖閲屽瓨鐨勬槸瑕佹敮浠樼殑绉垎*/
+    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