From d6e3defd7ec2ab68c552a63af709efbd8191409e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 07 五月 2024 19:08:08 +0800
Subject: [PATCH] 1.修改FddDto

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java |   17 ++++++++++++++---
 1 files changed, 14 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 a92147a..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;
     /**闈炲繀濉� 鍗″寘鏍囪瘑:鍗¢」鏀粯蹇呬紶*/
@@ -30,4 +34,11 @@
      * isDel=101锛屽垯phis杩欒竟涓嶉渶瑕佹墸鍑忕敤鎴风Н鍒�
      */
     private Integer isDel = 0;
+
+    /**闈炲繀濉� 绗笁鏂硅鍗曠紪鍙�*/
+    private String otherOrderNo;
+    /**闈炲繀濉� 娆$骇璁㈠崟鍙锋垨鍏戞崲鐮�*/
+    private String assistOrderNo;
+    /**闈炲繀濉� OCR璇嗗埆鍥剧墖閾炬帴*/
+    private String ocrImageUrl;
 }

--
Gitblit v1.8.0