From d5bd88b13d5ceb8bcdcfe0eb3b4a6b5fd27f1fc8 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期日, 09 十月 2022 18:48:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 | 53 ++++++++++
crm-platform-feign/src/main/java/com/hz/crm/dto/OrderServiceDto.java | 44 ++++++++
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountConversionDto.java | 36 +++++++
crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java | 6 +
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundItemDto.java | 33 ++++++
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundReturnDto.java | 43 ++++++++
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java | 12 +
8 files changed, 249 insertions(+), 5 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
new file mode 100644
index 0000000..57a9881
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/OrderServiceDto.java
@@ -0,0 +1,44 @@
+package com.hz.crm.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 鐢ㄥ湪灏佷綇鎴栬�呬簨鍔″眰璋冪敤杩斿洖(閫�娆捐繑鍥瀌to)
+ * @author cjh
+ * */
+@Data
+public class OrderServiceDto {
+ /**鏄惁鎴愬姛*/
+ private boolean isSuccess = false;
+ /**杩斿洖鎶ラ敊/杩斿洖鎻愮ず淇℃伅*/
+ private String errMsg;
+
+ /**閫�娆鹃��娆剧姸鎬�*/
+ 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;
+
+
+
+ /************************************/
+ /**鏈�蹇姸鎬�-澶辫触*/
+ public static final int REFUND_STATUS_FAIL = 1;
+ /**鏈�蹇姸鎬�-閮ㄥ垎閫�娆�*/
+ public static final int REFUND_STATUS_PART = 2;
+ /**鏈�蹇姸鎬�-鎴愬姛*/
+ public static final int REFUND_STATUS_SUECCESS = 3;
+
+}
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/order/refund/RefundDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
new file mode 100644
index 0000000..c4c0133
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
@@ -0,0 +1,53 @@
+package com.hz.crm.dto.order.refund;
+
+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<RefundAmountConversionDto> conversionList;
+ /**鐜伴噾閲戦閫�娆炬柟寮�*/
+ List<RefundAmountModelDto> amountModelList;
+ /** 閫�娆惧娉� */
+ 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;
+
+ /*鏄惁鏁村崟閫� 0鍚�1鏄� 锛堝洜涓虹Н鍒嗚鍗曠殑鍘熷洜锛屾殏鏃剁粰phis鐢級*/
+ private Integer isWholeOrder;
+
+}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundItemDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundItemDto.java
new file mode 100644
index 0000000..0b77a63
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundItemDto.java
@@ -0,0 +1,33 @@
+package com.hz.crm.dto.order.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 閫�娆惧瓙璁㈠崟鏁版嵁
+ * 杈呭姪瀹炰綋鏁版嵁锛屼富瑕佹槸鐢ㄦ潵璇嗗埆閫�娆鹃噾棰濇潵婧愶紝鏂逛究鍚庣画鐨勬暟鎹彉鏇翠繚瀛�
+ * @author wzh
+ */
+@Data
+public class RefundItemDto {
+
+ /** 瀛愯鍗昳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/dto/order/refund/RefundReturnDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundReturnDto.java
new file mode 100644
index 0000000..1e7643f
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundReturnDto.java
@@ -0,0 +1,43 @@
+package com.hz.crm.dto.order.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 閫�娆捐繑鍥炲疄浣�
+ */
+@Data
+public class RefundReturnDto {
+
+ /**鏄惁鎴愬姛*/
+ private boolean isSuccess = false;
+ /**杩斿洖鎶ラ敊/杩斿洖鎻愮ず淇℃伅*/
+ private String errMsg;
+ /**閫�娆鹃��娆剧姸鎬�*/
+ 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 List<RefundAmountModelDto> refundAmountModelDtoList;
+
+ /************************************/
+ /**鏈�蹇姸鎬�-澶辫触*/
+ public static final int REFUND_STATUS_FAIL = 1;
+ /**鏈�蹇姸鎬�-閮ㄥ垎閫�娆�*/
+ public static final int REFUND_STATUS_PART = 2;
+ /**鏈�蹇姸鎬�-鎴愬姛*/
+ public static final int REFUND_STATUS_SUECCESS = 3;
+
+}
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..7f3df17 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,8 +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.order.refund.RefundDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -14,11 +14,15 @@
@FeignClient(name="crm-platform-service",path = "/crmp",contextId = "crm-order")
public interface FOderService {
- /*鍙栨秷璁㈠崟*/
+ /**鍙栨秷璁㈠崟*/
@PostMapping(value = "/order/cancel")
Result cancelOrder( @RequestBody(required = false) OrderStatusDto orderStatusDto);
- /*閫�娆�*/
+ /**閫�娆�
+ *
+ * @param refundDto
+ * @return refundReturnDto瀹炰綋杞寲
+ */
@RequestMapping("/order/refund")
- Result refundOrder(@RequestBody(required = false) OrderStatusDto orderStatusDto);
+ Result refundOrder(@RequestBody(required = false) RefundDto refundDto);
}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java
index a1371d1..9c1141f 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java
@@ -13,6 +13,10 @@
public interface FUserService {
@PostMapping(value = "/user/info")
- Result list( @RequestBody(required = false) UserDto userDto);
+ Result info( @RequestBody(required = false) UserDto userDto);
+
+
+ @PostMapping(value = "/user/getUserUnionid")
+ Result getUserUnionid( @RequestBody(required = false) UserDto userDto);
}
--
Gitblit v1.8.0