From b249df80d95dd998ee93bcce2a6307b023f8cd0c Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 20 十一月 2023 10:38:26 +0800
Subject: [PATCH] Merge branch 'master' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 8 ++-
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java | 22 +++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderTransitionGoodsVo.java | 30 +++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 5 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 5 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 5 ++
7 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java
new file mode 100644
index 0000000..0714acc
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 涓嬪崟锛屾惡甯︾Н鍒嗕俊鎭�
+ * @date 2023-11-07
+ */
+@Data
+public class OrderItemIntegralVo {
+ /**蹇呭～ 鍘熶环绉垎*/
+ private BigDecimal originalIntegral;
+ /**蹇呭～ 鍞环绉垎*/
+ private BigDecimal saleIntegral;
+ /**蹇呭～ 鍘熶环鎬荤Н鍒�*/
+ private BigDecimal originalTotal;
+ /**蹇呭～ 鍞环鎬荤Н鍒�*/
+ private BigDecimal saleTotal;
+}
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 ae6779a..28f4219 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
@@ -44,6 +44,11 @@
/**闈炲繀濉� 鏄惁闄愯喘(0:鍚�,1:鏄�),榛樿:1*/
private String isLimitBug;
+ /**杩囨浮鍟嗗搧绫诲瀷蹇呭～淇℃伅*/
+ private OrderTransitionGoodsVo orderTransitionGoods;
+ /**鍟嗗搧绉垎淇℃伅锛岃繖閲屼笉涓虹┖灏变互杩欓噷涓轰富*/
+ private OrderItemIntegralVo orderItemIntegral;
+
/**闈炲繀濉� 鍗″寘鏍囪瘑 */
private List<CardItemInfoDto> cardItemInfoIds;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
index 8c63637..a8c19b5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
@@ -36,5 +36,10 @@
/** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+
+ /** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/
+ private BigDecimal averageIntegral = BigDecimal.ZERO;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
index db2ccce..42858ef 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -33,5 +33,10 @@
/** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+
+ /** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/
+ private BigDecimal averageIntegral = BigDecimal.ZERO;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java
index 7b81ec6..f7bdcfe 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java
@@ -12,6 +12,8 @@
/** 閫�娆剧殑鏂瑰紡闆嗗悎 */
private List<OrderRefundNoteDto> orderRefundNoteDtos;
+ /**瑁呰浇宸茬粡閫�娆剧殑浜嗛��娆炬柟寮忥紝浣嗘槸涔熻鍚屾鍒癈RM锛岃涓巓rderRefundNoteDtos锛堜笂闈㈤偅涓弬鏁帮級鍋氫氦鍙夋帓鏌�*/
+ private List<OrderRefundNoteDto> orderRefundModelList;
//鎿嶄綔浜哄憳id
private String operationId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderTransitionGoodsVo.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderTransitionGoodsVo.java
new file mode 100644
index 0000000..b9532c5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderTransitionGoodsVo.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 涓嬪崟锛岃繃娓″晢鍝佷俊鎭�
+ * 浼犲晢鎴风郴缁熺殑鍟嗗搧淇℃伅
+ * @author CJH
+ * @date 2023-11-08
+ */
+@Data
+public class OrderTransitionGoodsVo {
+ /**鍟嗗搧鏍囪瘑-蹇呭～*/
+ private String goodsId;
+ /**鍟嗗搧缂栧彿-蹇呭～*/
+ private String goodsNo;
+ /**鍟嗗搧鍚嶇О-蹇呭～*/
+ private String goodsName;
+ /**鍟嗗搧鍘熶环-蹇呭～*/
+ private BigDecimal oriPrice;
+ /**鍟嗗搧鍞环-蹇呭～*/
+ private BigDecimal curPrice;
+
+ /**鍘熶环鎬讳环-蹇呭～*/
+ private BigDecimal oriTotal;
+ /**鍞环鎬讳环锛堝簲浠橀噾棰濓級-蹇呭～*/
+ private BigDecimal curTotal;
+}
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 7b0dc41..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,12 +14,12 @@
@Data
public class PayAmountDto {
/**蹇呭～ 瀹為檯鏀粯閲戦*/
- private String amount;
+ private BigDecimal amount;
/**蹇呭～ 鏀粯鏂瑰紡*/
private String method;
- /**蹇呭～ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
- private String commonId;
+ /**闈炲繀濉� 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
+ private String commonId;
/**闈炲繀濉� 鏉冪泭绫诲瀷:鍗￠」鏀粯蹇呬紶*/
private String cardEquityId;
/**闈炲繀濉� 鍗″寘鏍囪瘑:鍗￠」鏀粯蹇呬紶*/
--
Gitblit v1.8.0