From dc72b94ed88585df5d49a90a39f723cd0364bb6d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 24 四月 2024 18:07:15 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-test
---
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 aabf9b5..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
@@ -12,8 +12,28 @@
public class RefundModelVo {
/**鏀粯鏂瑰紡缂栧彿*/
- private String modelNo;
+ private Integer modelNo;
+ /**绗笁鏂圭殑鏀粯缂栧彿锛坔is鐨勬敮浠樼紪鍙�)锛宮odelNo鍜宼hirdPartyNo蹇呭～涓�涓�*/
+ private String thirdPartyNo;
/***宸查��娆炬�婚噾棰�***/
private BigDecimal refundTotal = BigDecimal.ZERO;
+ /***宸查��娆炬�绘姷鎵ｉ噾棰�***/
+ private BigDecimal refundDeductionTotal = BigDecimal.ZERO;
+
+ /**********閫�娆剧被鍨�************/
+ /**閫�娆剧被鍨嬬被鍨�-寰俊*/
+ public static final int REFUND_TYPE_WX = 0;
+ /**閫�娆剧被鍨嬬被鍨�-鏀粯瀹�*/
+ public static final int REFUND_TYPE_ZFB = 1;
+ /**閫�娆剧被鍨嬬被鍨�-鐢ㄦ埛绉垎*/
+ public static final int REFUND_TYPE_INTEGRAL = 2;
+ /**閫�娆剧被鍨嬬被鍨�--鍌ㄥ�奸噾*/
+ 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