From 21cc776dfb780d6e2b0335c1542e6d3e898ce8cb Mon Sep 17 00:00:00 2001
From: guang <guang@guang.com>
Date: 星期五, 14 六月 2024 16:43:48 +0800
Subject: [PATCH] Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform-feign into master-stander

---
 crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
index 92ad1d8..9910c22 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
@@ -13,8 +13,12 @@
 
     /**鏀粯鏂瑰紡缂栧彿*/
     private Integer modelNo;
+    /**绗笁鏂圭殑鏀粯缂栧彿锛坔is鐨勬敮浠樼紪鍙�)锛宮odelNo鍜宼hirdPartyNo蹇呭~涓�涓�*/
+    private String thirdPartyNo;
     /***宸查��娆炬�婚噾棰�***/
     private BigDecimal refundTotal = BigDecimal.ZERO;
+    /***宸查��娆炬�绘姷鎵i噾棰�***/
+    private BigDecimal refundDeductionTotal = BigDecimal.ZERO;
 
     /**********閫�娆剧被鍨�************/
     /**閫�娆剧被鍨嬬被鍨�-寰俊*/
@@ -27,5 +31,9 @@
     public static final int REFUND_TYPE_RECHARGEL = 5;
     /**閫�娆剧被鍨嬬被鍨�--澧炲�奸噾*/
     public static final int REFUND_TYPE_INCREMENT = 6;
+    /**閫�娆剧被鍨嬬被鍨�--his鐨勯��娆炬柟寮忥紙鎵�鏈夋柟寮忎唬琛級*/
+    public static final int REFUND_TYPE_HIS = 7;
+    /**閫�娆剧被鍨嬬被鍨�--鎶垫墸绉垎*/
+    public static final int REFUND_TYPE_INTEGRAL_CASH = 8;
 
 }

--
Gitblit v1.8.0