From 8ddd254b64576a890152c841d1cd17303d144d68 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 九月 2022 19:46:48 +0800
Subject: [PATCH] 订单整合

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java   |    4 ++++
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java |    2 +-
 2 files changed, 5 insertions(+), 1 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 e69c4b6..e53423d 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,6 +16,10 @@
 public class OrderItemPHisDto {
     /**蹇呭~ 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭, */
     private String type;
+    /**蹇呭~ 瀛愬崟鎬讳环锛屽疄浠樹环鏍硷紙鍏冿級*/
+    private BigDecimal total;
+    /**蹇呭~ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎*/
+    private BigDecimal totalIntegral;
     /**蹇呭~ 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭~锛岄粯璁�100*/
     private BigDecimal discount;
     /**蹇呭~ 璐拱鏁伴噺 蹇呭~锛岄粯璁�0*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 6fd69ed..1630580 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -41,7 +41,7 @@
     /**crm蹇呭~ 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞~鐢ㄦ埛*/
     private String developerName;
 
-    /**蹇呭~ 鐢ㄦ埛Id */
+    /**蹇呭~ 璁㈠崟鎵�灞炵敤鎴稩d */
     private String userId;
 
     /**crm蹇呭~ 璁㈠崟娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛�,涓夊皯璇达細crm蹇呭~ */

--
Gitblit v1.8.0