From 23f491fce092e67c093d7f8ed89aa6a0b1e940e0 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 24 十一月 2023 11:15:34 +0800
Subject: [PATCH] tmk业绩汇总列表补充搜索条件

---
 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