From 117ce03906b8596441986bc97ae5738918d63626 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 07 十月 2023 18:09:50 +0800
Subject: [PATCH] 代王业绩报表导出

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index cd84eb5..ae6779a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -16,10 +16,12 @@
 public class OrderItemPHisDto {
     /**蹇呭~ 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭, */
     private String type;
-    /**蹇呭~ 瀛愬崟鎬讳环锛屽疄浠樹环鏍硷紙鍏冿級*/
+    /**蹇呭~ 瀛愬崟鎬讳环锛屽疄浠樹环鏍硷紙鍏冿級(鏆傛椂鐢ㄤ笉涓�)*/
     private BigDecimal total;
-    /**蹇呭~ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎*/
+    /**蹇呭~ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
     private BigDecimal totalIntegral;
+    /**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
+    private BigDecimal totalPoints;
     /**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭~锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
     private BigDecimal discount;
     /**蹇呭~ 璐拱鏁伴噺 蹇呭~锛岄粯璁�0*/
@@ -39,8 +41,13 @@
     private String platformTypeId;
     /**闈炲繀濉� 骞冲彴绫诲瀷(鑹惧績鑽熴�乸-his銆佸叾浠�,榛樿p-his)*/
     private String platformType;
+    /**闈炲繀濉� 鏄惁闄愯喘(0:鍚�,1:鏄�),榛樿:1*/
+    private String isLimitBug;
 
     /**闈炲繀濉� 鍗″寘鏍囪瘑 */
     private List<CardItemInfoDto> cardItemInfoIds;
 
+    /** 璇夋眰鍒嗙被idList */
+    private List<String> appealTypeIdList;
+
 }

--
Gitblit v1.8.0