From bc805bb8b892ddc12f7d38decf519f5e9002892f Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 09 十一月 2023 12:02:38 +0800
Subject: [PATCH] 订单-积分
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java | 8 ++++----
phis-feign/src/main/java/com/hz/his/dto/order/OrderTransitionGoodsVo.java | 30 ++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 2 ++
3 files changed, 36 insertions(+), 4 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
index e2c0dc7..0714acc 100644
--- 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
@@ -11,12 +11,12 @@
*/
@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 2e6e1ac..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,8 @@
/**闈炲繀濉� 鏄惁闄愯喘(0:鍚�,1:鏄�),榛樿:1*/
private String isLimitBug;
+ /**杩囨浮鍟嗗搧绫诲瀷蹇呭～淇℃伅*/
+ private OrderTransitionGoodsVo orderTransitionGoods;
/**鍟嗗搧绉垎淇℃伅锛岃繖閲屼笉涓虹┖灏变互杩欓噷涓轰富*/
private OrderItemIntegralVo orderItemIntegral;
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;
+}
--
Gitblit v1.8.0