From e0a35f3912912fb3a160ee2633594a2e6c828abc Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 26 十月 2023 12:10:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponQuotaConfigService.java | 4 ++--
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 12 +++---------
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 8 +++++---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 6 ------
5 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
index 5d4edad..8063011 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
@@ -3,6 +3,7 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -15,8 +16,14 @@
private String title;
/**鐢宠绫诲瀷**/
private Integer type;
+ /**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 绫诲瀷 0=閫氱敤 1=鎸囧畾 **/
+ private Integer useProjectType;
/**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 ID,name **/
private List<Map<String,Object>> serviceIds;
/**闂ㄥ簵ID*/
private String shopId;
+ /**绱鐢宠鏁伴噺*/
+ private Integer applyNum;
+ /**绱鐢宠閲戦*/
+ private BigDecimal applyAmount;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
index d18fdee..2fd860d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
@@ -26,8 +26,10 @@
/**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
private String ascrCostDeptName;
- /**鍙戞斁绫诲瀷 */
- private Integer belongType;
- /**鍙戞斁闂ㄥ簵*/
+ /**鍙戞斁鍘熷洜 -闈炲繀濉� 鐩稿綋浜� 淇冩垚浜� 瀹㈣瘔 鎵撴澘 绫诲瀷*/
+ private String sendReason;
+ /**鍙戞斁闂ㄥ簵 -闈炲繀濉� */
private String sendShopId;
+ /**鍙戞斁闂ㄥ簵鍚嶇О*/
+ private String sendShopName;
}
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 110943b..cb942aa 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
@@ -151,10 +151,4 @@
Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
- /**
- * 鏌ヨ浼樻儬鍒稿墿浣欐暟閲� 澶氫釜
- */
- @PostMapping(value = "/check/coupon/surplus/num")
- Result checkCouponSurplusNum(@RequestBody(required = false) CouponDto dto);
-
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponQuotaConfigService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponQuotaConfigService.java
index 3584996..494a42b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponQuotaConfigService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponQuotaConfigService.java
@@ -15,8 +15,8 @@
/**
* 寮�鏀惧钩鍙�-鏍￠獙浼樻儬鍒告槸鍚﹀瓨鍦� 鍒涘缓鎴栬�呮洿鏂�
*/
- @PostMapping(value = "/coupon/quota/config/info")
- Result getConfigInfo(@RequestBody CouponAddDto couponAddDto);
+ @PostMapping(value = "/coupon/quota/config/check/apply")
+ Result checkQuotaApply(@RequestBody CouponAddDto couponAddDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
index 41d1a12..9e05588 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -80,15 +80,9 @@
Result couponCheckCreate(@RequestBody CouponAddDto couponAddDto);
/**
- * 寮�鏀惧钩鍙�-鑾峰彇浼樻儬鍒搁檺棰濋厤缃� 鎬荤殑
+ * 寮�鏀惧钩鍙�- 鏍￠獙浼樻儬鍒稿墿浣欐暟閲�
*/
- @PostMapping(value = "/coupon/use/quato/info/by/total")
- Result couponUseQuotaInfoByTotal(@RequestBody CouponAddDto couponAddDto);
-
- /**
- * 寮�鏀惧钩鍙�-鑾峰彇浼樻儬鍒搁檺棰濋厤缃� 褰撳墠鏈�
- */
- @PostMapping(value = "/coupon/use/quato/info/by/month")
- Result couponUseQuotaInfoByMonth(@RequestBody CouponAddDto couponAddDto);
+ @PostMapping(value = "/coupon/check/surplus/num")
+ Result checkCouponSurplusNum(@RequestBody CouponDto couponDto);
}
\ No newline at end of file
--
Gitblit v1.8.0