From 17a2faf677cbaa5d2ec1a35cd8111c68eb0b9e75 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 15 十一月 2023 17:41:11 +0800
Subject: [PATCH] Merge branch 'rx-1109-营销优惠券优化' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java | 5 +++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 5 +++++
4 files changed, 14 insertions(+), 0 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 6a040f6..50eccc8 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
@@ -6,6 +6,7 @@
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* 浼樻儬鍒告柊澧炲弬鏁�
@@ -26,4 +27,8 @@
private Integer applyNum;
/**绱鐢宠閲戦*/
private BigDecimal applyAmount;
+ /**浼樻儬鍒告垚鏈儴闂ㄧ紪鍙� 鏍煎紡 ["CDT20230816WTAu"] */
+ private String costDepartmentCode;
+ /** 浼樻儬鍒告垚鏈儴闂� 澶氫釜*/
+ private List<Object> costDeptListArr;
}
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 2fd860d..4aae7d2 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
@@ -32,4 +32,6 @@
private String sendShopId;
/**鍙戞斁闂ㄥ簵鍚嶇О*/
private String sendShopName;
+ /** 鎵撴澘鍒告湁鏃犺倴鍍忔潈鍗忚 0=鍚� 1=鏄�*/
+ private Integer isPortrait;
}
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
index f40547c..a5f437b 100644
--- 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
@@ -11,4 +11,6 @@
public class CouponTypeDto extends PageDto {
/**鏄惁钀ラ攢鍔╂墜鍙敵璇�*/
private Integer isMarketAssistantApply;
+ /** 浼樻儬鍒告垚鏈儴闂� */
+ private String costDeptName;
}
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 cb942aa..0fc8854 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
@@ -150,5 +150,10 @@
@PostMapping(value = "/couponType/list")
Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
+ /***
+ * 鏌ヨ浼樻儬鍒稿彲鐢ㄩ」鐩�
+ */
+ @PostMapping(value = "/coupon/usable/project/list")
+ Result couponUsableProjectList(@RequestBody(required = false) CouponDto dto);
}
--
Gitblit v1.8.0