From 3b07edf0bcb15f8a0d0f48a90465b8aa31342f0a Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期五, 23 九月 2022 11:30:09 +0800
Subject: [PATCH] 新增取消订单接口
---
crm-platform-feign/src/main/java/com/hz/crm/dto/RefundAmountConversion.java | 47 +++++++++++++++
crm-platform-feign/src/main/java/com/hz/crm/dto/RefundItemDto.java | 33 +++++++++++
crm-platform-feign/src/main/java/com/hz/crm/dto/RefundDto.java | 48 ++++++++++++++++
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java | 3
4 files changed, 130 insertions(+), 1 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
new file mode 100644
index 0000000..89bd448
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundAmountConversion.java
@@ -0,0 +1,47 @@
+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/RefundDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundDto.java
new file mode 100644
index 0000000..8c55418
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundDto.java
@@ -0,0 +1,48 @@
+package com.hz.crm.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 閫�娆捐鍗曚俊鎭�
+ * 瀹為檯閫�娆剧殑閲戦鏁版嵁鏄～鍏呭湪杩欓噷鐨�
+ * @author wzh
+ */
+@Data
+public class RefundDto {
+
+ /**蹇呭～ 璁㈠崟绫诲瀷锛圧efundRecordConstants锛� */
+ private Integer refundOrderType;
+ /**蹇呭～ 璁㈠崟id */
+ private String orderId;
+ /** 鍏朵粬璁㈠崟id */
+ private String otherId;
+ /**蹇呭～ 閫�娆剧被鍨�(0:閫�娆℃暟閫�娆�,1:浠呴��娆� 榛樿:0) */
+ private Integer refundType;
+ /** 瀛愯鍗曢泦鍚� - 鍏蜂綋鍒板瓙璁㈠崟閫�娆� */
+ private List<RefundItemDto> itemList;
+ /**閲戦杞寲闆嗗悎*/
+ List<RefundAmountConversion> conversionList;
+ /** 閫�娆惧娉� */
+ private String remarks;
+
+ /**蹇呭～ 閫�娆剧涓夋柟鏀粯鎬婚噾棰濓紙寰俊/鏀粯瀹濇敮浠�/鍏朵粬锛夛紙鍏冿級 */
+ private BigDecimal refundAmountTotal;
+ /**蹇呭～ 閫�娆惧偍鍊奸噾鎬婚噾棰濓紙鍏冿級 */
+ private BigDecimal refundRecharge;
+ /**蹇呭～ 閫�娆惧鍊奸噾鎬婚噾棰濓紙鍏冿級 */
+ private BigDecimal refundIncrement;
+ /**蹇呭～ 閫�娆炬�荤Н鍒� */
+ private BigDecimal refundIntegral;
+
+ ////鎿嶄綔浜轰俊鎭�
+ /**蹇呭～ 鎿嶄綔浜虹被鍨� */
+ private Integer operatorType;
+ /**蹇呭～ 鎿嶄綔浜篿d */
+ private String operatorId;
+ /**蹇呭～ 鎿嶄綔浜哄悕绉� */
+ private String operatorName;
+
+}
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/RefundItemDto.java
new file mode 100644
index 0000000..acde499
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/RefundItemDto.java
@@ -0,0 +1,33 @@
+package com.hz.crm.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 閫�娆惧瓙璁㈠崟鏁版嵁
+ * 杈呭姪瀹炰綋鏁版嵁锛屼富瑕佹槸鐢ㄦ潵璇嗗埆閫�娆鹃噾棰濇潵婧愶紝鏂逛究鍚庣画鐨勬暟鎹彉鏇翠繚瀛�
+ * @author wzh
+ */
+@Data
+public class RefundItemDto extends IdDto {
+
+ /** 瀛愯鍗昳d */
+ private String orderItemId;
+ /** 鍏朵粬璁㈠崟id */
+ private String otherId;
+ /** 閫�鍥炴暟閲� */
+ private Integer refundNum;
+
+ /** 閫�娆炬�婚噾棰濓紙鍏冿級 */
+ private BigDecimal refundTotal;
+ /** 閫�娆炬�荤Н鍒� */
+ private BigDecimal refundIntegral;
+ /**鐜伴噾閫�娆鹃噾棰濓紙鍏�*/
+ private BigDecimal refundMoney = BigDecimal.ZERO;
+ /**閫�娆惧偍鍊奸噾锛堝厓锛�*/
+ private BigDecimal refundFund = BigDecimal.ZERO;
+ /**閫�娆惧鍊奸噾锛堝厓锛�*/
+ private BigDecimal refundIncrement = BigDecimal.ZERO;
+
+}
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 dbf299c..4706e6c 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
@@ -3,6 +3,7 @@
import com.hx.resultTool.Result;
import com.hz.crm.dto.OrderRefundDto;
import com.hz.crm.dto.OrderStatusDto;
+import com.hz.crm.dto.RefundDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -20,5 +21,5 @@
/*閫�娆�*/
@RequestMapping("/order/refund")
- Result refundOrder(@RequestBody(required = false) OrderStatusDto orderStatusDto);
+ Result refundOrder(@RequestBody(required = false) RefundDto refundDto);
}
--
Gitblit v1.8.0