From a369ba556c3502319a94f5d5d4d23ffbdd932e39 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 26 十二月 2023 14:35:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 crm-platform-feign/src/main/java/com/hz/crm/dto/OrderServiceDto.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/OrderServiceDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/OrderServiceDto.java
index f062480..cef1971 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/OrderServiceDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/OrderServiceDto.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 
 /**
  * 鐢ㄥ湪灏佷綇鎴栬�呬簨鍔″眰璋冪敤杩斿洖(閫�娆捐繑鍥瀌to)
@@ -17,6 +19,22 @@
     /**閫�娆鹃��娆剧姸鎬�*/
     public int refundStatus;
 
+    /***绋嬪簭宸查��娆炬暟鎹紝閫�鎺夌殑鍔犺繘鍘�***/
+    /***宸查��娆炬�婚噾棰�***/
+    private BigDecimal refundTotal = BigDecimal.ZERO;
+    /**宸查��娆剧幇閲�***/
+    private BigDecimal refundAmountTotal = BigDecimal.ZERO;
+    /**宸查��娆惧偍鍊奸噾*/
+    private BigDecimal refundRecharge = BigDecimal.ZERO;
+    /**宸查��娆惧鍊奸噾*/
+    private BigDecimal refundIncrement = BigDecimal.ZERO;
+    /**宸查��娆剧Н鍒�*/
+    private BigDecimal refundIntegral = BigDecimal.ZERO;
+
+    //閫�娆炬祦姘村彿
+    private String refundNo;
+
+
 
     /************************************/
     /**鏈�蹇姸鎬�-澶辫触*/

--
Gitblit v1.8.0