From ed365a9b836ceb79227e1a3b967a713198826fed Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 26 九月 2022 17:56:15 +0800
Subject: [PATCH] 退款接口修改
---
/dev/null | 47 ---------------
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountModelDto.java | 27 +++++++++
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java | 6 +
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountConversionDto.java | 36 ++++++++++++
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundItemDto.java | 4
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java | 3
6 files changed, 70 insertions(+), 53 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundAmountConversion.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundAmountConversion.java
deleted file mode 100644
index 89bd448..0000000
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundAmountConversion.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.hz.crm.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 閫�娆� -閲戦杞寲璁板綍
- * 鐜伴噾鍙浆鍌ㄥ�奸噾銆佸鍊奸噾鍜岀Н鍒�
- * 鍌ㄥ�奸噾鍙浆澧炲�奸噾鍜岀Н鍒�
- * 澧炲�奸噾鍙浆绉垎
- */
-@Data
-public class RefundAmountConversion {
-
- /*琚浆鍖栭噾棰濈被鍨�*/
- private Integer amountType;
- /*琚浆鍖栭噾棰濓紙鍏�/绉垎锛�*/
- private BigDecimal amountTotal = BigDecimal.ZERO;
-
- /*杞寲閲戦绫诲瀷conversion*/
- private Integer conversionType;
- /*杞寲閲戦锛堝厓/绉垎锛�*/
- private BigDecimal conversionTotal = BigDecimal.ZERO;
-
- /*********璁㈠崟鏉ユ簮***********/
- /*璁㈠崟绫诲瀷(RefundRecordConstants)*/
- private Integer orderType;
- /*璁㈠崟id*/
- private String orderId;
- //鏇存崲瀛愯鍗昳d/鍏朵粬id
- private String otherId;
-
- /*閫�娆炬�昏〃id*/
- private String refundGeneralId;
-
- /**********閲戦绫诲瀷************/
- /**閲戦绫诲瀷-鐜伴噾*/
- public static final int AMOUNT_TYPE_CASH = 1;
- /**閲戦绫诲瀷-鍌ㄥ�奸噾*/
- public static final int AMOUNT_TYPE_RECHARGE = 2;
- /**閲戦绫诲瀷-澧炲�奸噾*/
- public static final int AMOUNT_TYPE_INCREMENT = 3;
- /**閲戦绫诲瀷-绉垎*/
- public static final int AMOUNT_TYPE_INTEGRAL = 4;
-
-}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountConversionDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountConversionDto.java
new file mode 100644
index 0000000..d654929
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountConversionDto.java
@@ -0,0 +1,36 @@
+package com.hz.crm.dto.order.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 閫�娆� -閲戦杞寲璁板綍
+ * 鐜伴噾鍙浆鍌ㄥ�奸噾銆佸鍊奸噾鍜岀Н鍒�
+ * 鍌ㄥ�奸噾鍙浆澧炲�奸噾鍜岀Н鍒�
+ * 澧炲�奸噾鍙浆绉垎
+ */
+@Data
+public class RefundAmountConversionDto {
+
+ /**Y - 琚浆鍖栭噾棰濈被鍨�*/
+ private Integer amountType;
+ /**Y - 琚浆鍖栭噾棰濓紙鍏�/绉垎锛�*/
+ private BigDecimal amountTotal;
+
+ /**Y - 杞寲閲戦绫诲瀷*/
+ private Integer conversionType;
+ /**Y - 杞寲閲戦锛堝厓/绉垎锛�*/
+ private BigDecimal conversionTotal;
+
+ /**********閲戦绫诲瀷************/
+ /**閲戦绫诲瀷-鐜伴噾*/
+ public static final int AMOUNT_TYPE_CASH = 1;
+ /**閲戦绫诲瀷-鍌ㄥ�奸噾*/
+ public static final int AMOUNT_TYPE_RECHARGE = 2;
+ /**閲戦绫诲瀷-澧炲�奸噾*/
+ public static final int AMOUNT_TYPE_INCREMENT = 3;
+ /**閲戦绫诲瀷-绉垎*/
+ public static final int AMOUNT_TYPE_INTEGRAL = 4;
+
+}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountModelDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountModelDto.java
new file mode 100644
index 0000000..f23eac4
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountModelDto.java
@@ -0,0 +1,27 @@
+package com.hz.crm.dto.order.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 閫�娆捐褰� - 閲戦閫�娆炬柟寮�
+ * 鐜伴噾鍙浆鍌ㄥ�奸噾銆佸鍊奸噾鍜岀Н鍒�
+ * 鍌ㄥ�奸噾鍙浆澧炲�奸噾鍜岀Н鍒�
+ * 澧炲�奸噾鍙浆绉垎
+ */
+@Data
+public class RefundAmountModelDto {
+
+ /**Y - 鐜伴噾閫�娆剧被鍨�*/
+ private Integer refundType;
+ /**Y - 閫�娆鹃噾棰濓紙鍏�/绉垎锛�*/
+ private BigDecimal amountTotal;
+
+ /**********閫�娆剧被鍨�************/
+ /**閫�娆剧被鍨嬬被鍨�-寰俊*/
+ public static final int REFUND_TYPE_WX = 0;
+ /**閫�娆剧被鍨嬬被鍨�-鏀粯瀹�*/
+ public static final int REFUND_TYPE_ZFB = 1;
+
+}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
similarity index 89%
rename from crm-platform-feign/src/main/java/com/hz/crm/dto/RefundDto.java
rename to crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
index 57fbbbe..c4c0133 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
@@ -1,4 +1,4 @@
-package com.hz.crm.dto;
+package com.hz.crm.dto.order.refund;
import lombok.Data;
@@ -24,7 +24,9 @@
/** 瀛愯鍗曢泦鍚� - 鍏蜂綋鍒板瓙璁㈠崟閫�娆� */
private List<RefundItemDto> itemList;
/**閲戦杞寲闆嗗悎*/
- List<RefundAmountConversion> conversionList;
+ List<RefundAmountConversionDto> conversionList;
+ /**鐜伴噾閲戦閫�娆炬柟寮�*/
+ List<RefundAmountModelDto> amountModelList;
/** 閫�娆惧娉� */
private String remarks;
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundItemDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundItemDto.java
similarity index 91%
rename from crm-platform-feign/src/main/java/com/hz/crm/dto/RefundItemDto.java
rename to crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundItemDto.java
index acde499..0b77a63 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundItemDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundItemDto.java
@@ -1,4 +1,4 @@
-package com.hz.crm.dto;
+package com.hz.crm.dto.order.refund;
import lombok.Data;
@@ -10,7 +10,7 @@
* @author wzh
*/
@Data
-public class RefundItemDto extends IdDto {
+public class RefundItemDto {
/** 瀛愯鍗昳d */
private String orderItemId;
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
index 4706e6c..04f5ee8 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
@@ -1,9 +1,8 @@
package com.hz.crm.feign;
import com.hx.resultTool.Result;
-import com.hz.crm.dto.OrderRefundDto;
import com.hz.crm.dto.OrderStatusDto;
-import com.hz.crm.dto.RefundDto;
+import com.hz.crm.dto.order.refund.RefundDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
--
Gitblit v1.8.0