From c6f30eb46d66dce8cadc6c3dcd1bf735896d7f53 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 01 八月 2022 09:54:32 +0800
Subject: [PATCH] 人群包推送优惠券

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |    7 +++++++
 phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java |   38 ++++++++++++++++++++++++++++++++++++++
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java            |    5 +++--
 3 files changed, 48 insertions(+), 2 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 a044af2..5b50ee8 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
@@ -12,6 +12,8 @@
  */
 @Data
 public class CouponDto extends PageDto {
+    /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
+    private String appIdCode;
     /**鎿嶄綔浜烘爣璇�*/
     private String operatorId;
     /**鎿嶄綔浜哄悕绉�*/
@@ -21,8 +23,7 @@
     /**鐢ㄦ埛璇︽儏*/
     private List<UserArrDto> userArr;
 
-    /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
-    private String appIdCode;
+
 
     /**淇敼鏃堕棿*/
     private String updateTime;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
new file mode 100644
index 0000000..1a97941
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
@@ -0,0 +1,38 @@
+package com.hz.his.dto.user.project;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 鏌ヨ浜虹兢鍖呭垪琛�
+ * */
+@Data
+public class UserPackageDto extends PageDto {
+
+    /**鏍囩鏍囪瘑闆嗗悎*/
+    private List<String> labelIdList;
+    /**椤圭洰鏍囪瘑闆嗗悎*/
+    private List<String> projectIdList;
+    /**浼氬憳绛夌骇鍚嶇О闆嗗悎*/
+    private List<String> memberLevelList;
+
+    /**鐢ㄦ埛鍒涘缓鏃堕棿寮�濮�*/
+    private String createStartTime;
+    /**鐢ㄦ埛鍒涘缓鏃堕棿缁撴潫*/
+    private String createEndTime;
+
+    /**鐢ㄦ埛鏈�鍚庝竴娆″埌搴楀紑濮�*/
+    private String arriveStartTime;
+    /**鐢ㄦ埛鏈�鍚庝竴娆″埌搴楃粨鏉�*/
+    private String arriveEndTime;
+
+    /**鐢ㄦ埛鏈�鍚庝竴娆℃秷璐瑰紑濮�*/
+    private String consumeStartTime;
+    /**鐢ㄦ埛鏈�鍚庝竴娆℃秷璐圭粨鏉�*/
+    private String consumeEndTime;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index a8f13f3..39b0dd2 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -10,6 +10,7 @@
 import com.hz.his.dto.user.coupon.UserCouponDto;
 import com.hz.his.dto.user.money.*;
 import com.hz.his.dto.user.label.UserLabelDto;
+import com.hz.his.dto.user.project.UserPackageDto;
 import com.hz.his.dto.user.project.UserProjectDto;
 import com.hz.his.dto.user.project.UserProjectUsedDto;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -207,4 +208,10 @@
     @PostMapping(value = "/user/appearance/info")
     Result userAppearanceInfo(@RequestParam("appearanceId") String appearanceId);
 
+    /**
+     * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,鎷ユ湁鐨勬爣绛�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
+     * */
+    @PostMapping(value = "/user/package/list")
+    Result userPackageList(@RequestBody UserPackageDto userPackageDto);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0