From d8afbdc39cd6e7739054fc1cc21898e0b81216d0 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 21 八月 2023 11:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq优惠券分类优化' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java | 14 ++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 7 ++++++-
3 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
index db55fe3..6a6b5c5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
@@ -29,6 +29,8 @@
private String commonId;
/**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
private String commonType;
+ /**鏉ユ簮瀛愭爣璇�*/
+ private String commonItemId;
/**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
private List<CouponSendUserDto> sendUserList;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java
new file mode 100644
index 0000000..f40547c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.coupon;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponTypeDto extends PageDto {
+ /**鏄惁钀ラ攢鍔╂墜鍙敵璇�*/
+ private Integer isMarketAssistantApply;
+}
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 656629c..a7eac39 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
@@ -132,9 +132,14 @@
Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);
/**
- * 鏌ヨ浼樻儬鍒稿垎绫�
+ * 鏌ヨ鍩虹鍒嗙被
*/
@PostMapping(value = "/coupon/type/list")
Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);
+ /**
+ * 鏌ヨ浼樻儬鍒稿垎绫�
+ */
+ @PostMapping(value = "/couponType/list")
+ Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
}
--
Gitblit v1.8.0