From e173daa11141b0f6730889ab2cc22b6fc06ffb0b Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 12 八月 2022 19:50:38 +0800
Subject: [PATCH] 优惠券列表
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDetailDto.java | 19 +++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDetailDto.java | 30 +++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 30 +++++++--------
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 3 +
4 files changed, 66 insertions(+), 16 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDetailDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDetailDto.java
new file mode 100644
index 0000000..80286c6
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDetailDto.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.coupon;
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒稿弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponDetailDto extends PageDto {
+ /**涓婁笅鏋�*/
+ private Integer isUp;
+ /**灞曠ず*/
+ private Integer isShow;
+ /**骞冲彴绫诲瀷*/
+ private String platformType;
+ /**棰嗗彇寮�濮�*/
+ private String startShowTime;
+ /**棰嗗彇缁撴潫*/
+ private String endShowTime;
+ /**浼樻儬鍒哥被鍨�*/
+ private Integer type;
+
+ /**骞冲彴绫诲瀷-CRM*/
+ public static String TYPE_PLATFORM_CRM= "crm";
+ /**骞冲彴绫诲瀷-PHIS*/
+ public static String TYPE_PLATFORM_PHIS= "p-his";
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 4c4603a..029ead5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -30,4 +30,7 @@
/**淇敼鏃堕棿*/
private String updateTime;
+ /**浼樻儬鍒告爣璇�*/
+ private String couponId;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDetailDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDetailDto.java
new file mode 100644
index 0000000..02302cb
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDetailDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.coupon;
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒稿弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponListDetailDto extends PageDto {
+ /**浼氬憳绛夌骇*/
+ private String userLevel;
+ /**鏄惁浣跨敤*/
+ private Integer isUse;
+ /**骞冲彴绫诲瀷*/
+ private String couponId;
+}
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 f0567c2..9bc0f5d 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
@@ -2,8 +2,10 @@
import com.hx.resultTool.Result;
+import com.hz.his.dto.coupon.CouponDetailDto;
import com.hz.his.dto.coupon.CouponDto;
import com.hz.his.dto.coupon.CouponGoodsDto;
+import com.hz.his.dto.coupon.CouponListDetailDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,26 +18,18 @@
public interface SCouponService {
/**
- * 鑾峰彇浼樻儬鍒稿垪琛�(鍚寚瀹�)
- * @return Result
- */
- @PostMapping(value = "/coupon/list/appoint")
- Result getListAppoint(@RequestBody CouponDto couponDto);
-
- /**
* 鑾峰彇浼樻儬鍒稿垪琛�
* @return Result
*/
@PostMapping(value = "/coupon/list")
Result getList(@RequestBody CouponDto couponDto);
-
/**
- * 鍟嗗搧鍙鍙栦紭鎯犲埜
+ * 鑾峰彇浼樻儬鍒稿垪琛�(鍚寚瀹�,缁熻浜烘暟)
+ * @return Result
*/
- @PostMapping(value = "/goods/receive/coupon")
- Result goodsReceiveCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
-
+ @PostMapping(value = "/coupon/list/appoint")
+ Result getListAppoint(@RequestBody CouponDetailDto couponDetailDto);
/**
* 浼樻儬鍒歌鎯�
@@ -43,13 +37,17 @@
@PostMapping(value = "/coupon/detail")
Result couponDetail(@RequestParam("couponId") String couponId);
+ /**
+ * 浼樻儬鍒哥粺璁�
+ */
+ @PostMapping(value = "/coupon/count")
+ Result couponCount(@RequestParam("couponId") String couponId);
/**
- * 鍟嗗搧鍙敤浼樻儬鍒�
+ * 浼樻儬鍒镐娇鐢ㄦ儏鍐�
*/
- @PostMapping(value = "/goods/canUsed/coupon")
- Result goodsCanUsedCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
-
+ @PostMapping(value = "/coupon/used/detail")
+ Result couponUsedDetail(@RequestBody CouponListDetailDto couponListDetailDto);
/**
* 鐢ㄦ埛鏄惁棰嗗彇杩囧洟璐椿鍔ㄤ紭鎯犲埜
--
Gitblit v1.8.0