From 6905e1a25e41be00461e2989f5acaed148d5ad45 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 04 十一月 2022 16:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java    |    5 +++--
 phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java      |    5 +++--
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |    7 +++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
index 96c12a3..64309a8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
@@ -1,5 +1,6 @@
 package com.hz.his.dto.marketing;
 
+import com.hz.his.dto.order.OrdersTotalDto;
 import lombok.Data;
 
 /**
@@ -9,6 +10,6 @@
 @Data
 public class OrderCancelDto extends MarketingDto{
     /*******************蹇呭~椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
-    /**璁㈠崟鏍囪瘑*/
-    private String orderId;
+    /**璁㈠崟淇℃伅*/
+    private OrdersTotalDto ordersTotalDto;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java
index dc748e6..96c37f0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java
@@ -1,5 +1,6 @@
 package com.hz.his.dto.marketing;
 
+import com.hz.his.dto.order.OrdersTotalDto;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -11,8 +12,8 @@
 @Data
 public class OrderDiscountDto extends MarketingDto{
     /*******************蹇呭~椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
-    /**璁㈠崟鏍囪瘑*/
-    private String orderId;
+    /**璁㈠崟淇℃伅*/
+    private OrdersTotalDto ordersTotalDto;
     /**璁㈠崟鎶樻墸(鍗曚綅:鐧惧垎姣�)*/
     private BigDecimal discountNum;
 
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 3926995..bb6ecf6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -80,4 +80,11 @@
      */
     @PostMapping(value = "/get/coupon/goods")
     Result getCouponGoods(@RequestBody CouponGoodsDto couponGoodsDto);
+
+    /**
+     * 鑾峰彇浼樻儬鍒稿垪琛�(涓嶅垎椤�)
+     * @return Result
+     */
+    @PostMapping(value = "/getCouponList")
+    Result getCouponList(@RequestBody CouponDto couponDto);
 }

--
Gitblit v1.8.0