From dbf3d2ed84142a6dc4092353b59be902a153bcb6 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 10 八月 2023 15:36:34 +0800
Subject: [PATCH] Merge branch 'rx-0807-优惠券查询补充条件' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 5 +++++
3 files changed, 14 insertions(+), 0 deletions(-)
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 fdb98a9..260182b 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
@@ -51,4 +51,9 @@
/** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
private Integer isMarketApply = 0;
+
+ /** 浼樻儬鍒稿垎绫籌D*/
+ private String couponTypeId;
+ /** 鍩虹鍒嗙被-浼樻儬鍒�*/
+ private String type;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index 5ec403f..a1a41fb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -99,4 +99,6 @@
public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
/**鎿嶄綔鏂瑰紡-娲诲姩鍙備笌*/
public static final String OPERATION_REASON_ACTIVITY_JOIN = "activity_join";
+ /**鎿嶄綔鏂瑰紡-钀ラ攢鍔╂墜绉垎鍏戞崲浼樻儬鍒�*/
+ public static final String OPERATION_REASON_EXCHANGE_COUPON_USE_INTEGRAL = "exchange_coupon_use_integral";
}
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 ee1befb..656629c 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
@@ -130,4 +130,11 @@
*/
@PostMapping(value = "/coupon/user/goods")
Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);
+
+ /**
+ * 鏌ヨ浼樻儬鍒稿垎绫�
+ */
+ @PostMapping(value = "/coupon/type/list")
+ Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);
+
}
--
Gitblit v1.8.0