From 891401eebaa5446bb54f23a46a326a40619e1733 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 07 五月 2024 17:22:48 +0800
Subject: [PATCH] Merge branch 'fhx-prod-0506电子签修改' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 caca455..9ed4794 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
@@ -20,8 +20,14 @@
private BigDecimal total;
/**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
private BigDecimal totalIntegral;
+ /**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
+ private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
+ /**鎶垫墸鐜伴噾閲戦*/
+ private BigDecimal cash = BigDecimal.ZERO;
+ /**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
+ private BigDecimal integralCash = BigDecimal.ZERO;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
private Integer buyNum;
/**蹇呭～ 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭～*/
@@ -42,7 +48,15 @@
/**闈炲繀濉� 鏄惁闄愯喘(0:鍚�,1:鏄�),榛樿:1*/
private String isLimitBug;
+ /**杩囨浮鍟嗗搧绫诲瀷蹇呭～淇℃伅*/
+ private OrderTransitionGoodsVo orderTransitionGoods;
+ /**鍟嗗搧绉垎淇℃伅锛岃繖閲屼笉涓虹┖灏变互杩欓噷涓轰富*/
+ private OrderItemIntegralVo orderItemIntegral;
+
/**闈炲繀濉� 鍗″寘鏍囪瘑 */
private List<CardItemInfoDto> cardItemInfoIds;
+ /** 璇夋眰鍒嗙被idList */
+ private List<String> appealTypeIdList;
+
}
--
Gitblit v1.8.0