From c7aa3363613eccd39c3e7ab5ae81a93ff9bbc722 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 12 十二月 2022 17:55:14 +0800
Subject: [PATCH] Merge branch 'master-prod-new'
---
phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java | 20 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 4 +
phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java | 20 ++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java | 10 +++-
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java | 25 ++++++++++++
5 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index a2c339b..92423d0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -27,6 +27,8 @@
public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
/**鍏叡鏍囪瘑绫诲瀷,鑰佸甫鏂�*/
public static String TYPE_COMMON_OLD_NEW = "old_new";
- /**鍏叡鏍囪瘑绫诲瀷,鍥㈣喘娲诲姩*/
+ /**鍏叡鏍囪瘑绫诲瀷,绀煎搧鍗�*/
public static String TYPE_COMMON_GIFT = "gift";
+ /**鍏叡鏍囪瘑绫诲瀷,钀ラ攢浼樻儬鍒�*/
+ public static String TYPE_COMMON_MARKE = "marketing";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
new file mode 100644
index 0000000..0f6c7e5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.marketing;
+
+import com.hz.his.dto.order.OrdersTotalDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜璁㈠崟閮ㄥ垎閫�娆剧敵璇峰叆鍙�
+ * @author fwq
+ */
+@Data
+public class OrderPartRefundDto extends MarketingDto{
+ /*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
+ /**璁㈠崟淇℃伅*/
+ private OrdersTotalDto ordersTotalDto;
+ /**鏈閫�娆剧敵璇锋�婚噾棰�*/
+ private BigDecimal refundTotal;
+ /**鏈閫�娆炬敮浠樻柟寮�*/
+ private List<PartRefundPayDto> partRefundPayDtoList;
+ /**鏈閫�娆鹃」鐩�*/
+ private List<RefundProjectDto> refundProjectDtoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java
new file mode 100644
index 0000000..dac1e47
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.marketing;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 閮ㄥ垎閫�娆剧敵璇�-鏀粯鏂瑰紡鏄庣粏
+ * */
+@Data
+public class PartRefundPayDto {
+ /**閫�娆炬敮浠樻柟寮忔爣璇�*/
+ private String payMethodId;
+ /**閫�娆炬敮浠樻柟寮忕紪鍙�*/
+ private String payMethodNo;
+ /**閫�娆炬敮浠樻柟寮忓悕绉�*/
+ private String payMethodName;
+ /**鏀粯鏂瑰紡鐨勯��娆鹃噾棰�*/
+ private BigDecimal refundMoney;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
new file mode 100644
index 0000000..41682b1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.marketing;
+
+import lombok.Data;
+
+/**
+ * 閮ㄥ垎閫�娆剧敵璇�-鏀粯鏂瑰紡鏄庣粏
+ * */
+@Data
+public class RefundProjectDto {
+ /**閫�鐨勭被鍨�: OrderItemConstants*/
+ private String projectType;
+ /**閫�鐨勬爣璇� 鍟嗗搧/椤圭洰/...*/
+ private String projectId;
+ /**閫�鐨勭紪鍙� 鍟嗗搧/椤圭洰/...*/
+ private String projectNo;
+ /**閫�鐨勫悕绉� 鍟嗗搧/椤圭洰/... - 蹇呭～*/
+ private String projectName;
+ /**閫�鐨勬暟閲� 鍟嗗搧/椤圭洰/... - 蹇呭～*/
+ private Integer refundNum;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
index 3b663d6..523328a 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
@@ -3,12 +3,10 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.marketing.OrderCancelDto;
import com.hz.his.dto.marketing.OrderDiscountDto;
+import com.hz.his.dto.marketing.OrderPartRefundDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.math.BigDecimal;
/**
* 钀ラ攢鍔╂墜
@@ -30,4 +28,10 @@
Result applyOrderCancel(@RequestBody OrderCancelDto orderCancelDto);
+ /**
+ * 璁㈠崟閮ㄥ垎閫�娆剧敵璇�
+ */
+ @PostMapping(value = "/order/apply/part/refund")
+ Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);
+
}
--
Gitblit v1.8.0