From 87e5906636e9c3dc56e716833c3b315c24def707 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 07 六月 2024 15:11:24 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-新版回访
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java | 5 ++
phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java | 2 +
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 6 ++-
phis-feign/src/main/java/com/hz/his/feign/service/rfm/SRfmParagraphGradeService.java | 22 +++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 6 ++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 6 +++
phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java | 15 +++++++
7 files changed, 59 insertions(+), 3 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 b00b365..34eea27 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
@@ -65,4 +65,10 @@
/** 浼樻儬鍒窱D*/
private List<String> couponIdList;
+
+ /**骞冲彴闄愬埗*/
+ private Integer platLimit;
+ /**骞冲彴鍙敤杩囨护,appId*/
+ private List<String> limitPlatformList;
+
}
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 01f8bca..c53c4c5 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
@@ -162,6 +162,10 @@
@PostMapping(value = "/coupon/birthday/list/user")
Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);
-
+ /**
+ * 鑾峰彇浼樻儬鍒搁鍙栬鍒欏垪琛�
+ */
+ @PostMapping(value = "/coupon/receive/rule/list")
+ Result getReceiveRuleList();
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index fab86ce..b0e0a1e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -111,4 +111,9 @@
/**鏌ヨ椤圭洰绉垎鎶垫墸鐜伴噾鐨勬瘮渚�*/
@PostMapping(value = "/project/integral/cash/rate")
Result getIntegralCashRate(@RequestBody ProjectDto projectDto);
+
+ /**鏌ヨ鏄犲皠椤圭洰妯″潡鏍戝瀷涓夌骇*/
+ @PostMapping(value = "/project/item/relation/list")
+ Result projectItemList(@RequestBody ProjectDto projectDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/rfm/SRfmParagraphGradeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/rfm/SRfmParagraphGradeService.java
new file mode 100644
index 0000000..30902f9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/rfm/SRfmParagraphGradeService.java
@@ -0,0 +1,22 @@
+package com.hz.his.feign.service.rfm;
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * RFM绛夌骇鏁版嵁鍖洪棿service
+ * @USER: fhx
+ * @DATE: 2024/5/28
+ **/
+@FeignClient(name="bi-rfm",path = "/rfm",contextId = "phip-rfm-paragraph-grade")
+public interface SRfmParagraphGradeService {
+
+ /**
+ * RFM缁煎悎绛夌骇绛夌骇鍖洪棿鑾峰彇
+ */
+ @RequestMapping("/grade-paragraph/comprehensive/data")
+ Result comprehensiveGradeData();
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java b/phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java
new file mode 100644
index 0000000..30f58c4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java
@@ -0,0 +1,15 @@
+package com.hz.his.vo.coupon;
+
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒搁鍙栬鍒�
+ * */
+@Data
+public class CouponReceiveVo {
+ /**瑙勫垯鏍囪瘑*/
+ private String id;
+ /**瑙勫垯鍚嶇О*/
+ private String name;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index e3bc63e..0d542e8 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -1,7 +1,5 @@
package com.hz.phis.dt.user;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.math.BigDecimal;
@@ -91,4 +89,8 @@
//鏄惁鍚湁鐑帥鍚夐」鐩�
private Boolean isHaveRmj = false;
+ /** 鎵�灞為【闂悕绉� */
+ private String adviserName;
+ /** RFM缁煎悎绛夌骇 */
+ private String rfmGrade;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java b/phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java
index d6b46a5..9b6409f 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java
@@ -9,4 +9,6 @@
public class MoneyRuleVo {
/**鍔熻兘缂栧彿*/
private String functionCode;
+ /**閲戦绫诲瀷:0澧炲�奸噾,1绉垎*/
+ private Integer moneyType;
}
--
Gitblit v1.8.0