From 2726d124e58aa0a43044f0e52b514ac086262e83 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期五, 17 三月 2023 16:34:17 +0800
Subject: [PATCH] Merge branch 'master-prod-new'
---
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 5 ++++-
phis-feign/src/main/java/com/hz/phis/dt/marketingCoupon/MarketingCouponDto.java | 26 ++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 8 ++++++++
4 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 52a1938..9234d13 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -14,6 +14,9 @@
*/
@Data
public class OrdersPHisTotalDto {
+
+ /**蹇呭～ 璁㈠崟鍒嗙被锛圤rderTotalConstants锛�,榛樿鏍囧噯璁㈠崟*/
+ private Integer orderClassify;
/**蹇呭～ 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭*/
private String type;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
index 6d20a9c..d3174fb 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
@@ -9,7 +9,6 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -17,6 +16,10 @@
@FeignClient(name="dcp-rules-service",path = "/dcp-rules",contextId = "userTagInfo")
public interface SUserTagInfoService {
+ /** 鏍囩鍒嗙被鏍戝瀷鍒楄〃 */
+ @PostMapping("/tag/rule/info/list/tree")
+ Result listTreeData();
+
/**鏌ヨ鐢ㄦ埛鏍囩鍒楄〃*/
@PostMapping("/user/tag/info/list")
Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
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 40cde67..03821bd 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
@@ -6,6 +6,8 @@
import com.hz.his.dto.coupon.CouponDto;
import com.hz.his.dto.coupon.CouponGoodsDto;
import com.hz.his.dto.coupon.CouponListDetailDto;
+import com.hz.his.dto.dictionaries.DictionariesDto;
+import com.hz.phis.dt.marketingCoupon.MarketingCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -94,4 +96,10 @@
*/
@PostMapping(value = "/getCouponNumber")
Result getCouponNumber(@RequestBody CouponDto couponDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棰嗗彇钀ラ攢浼樻儬鍒告暟鎹�
+ */
+ @PostMapping(value = "/marketing/data")
+ Result marketingData(@RequestBody(required = false) MarketingCouponDto marketingCouponDto);
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/marketingCoupon/MarketingCouponDto.java b/phis-feign/src/main/java/com/hz/phis/dt/marketingCoupon/MarketingCouponDto.java
new file mode 100644
index 0000000..0b67a68
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/marketingCoupon/MarketingCouponDto.java
@@ -0,0 +1,26 @@
+package com.hz.phis.dt.marketingCoupon;
+
+import com.hz.phis.dt.coupon.CouponAppointDt;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName MarketingCouponDto
+ * @Description 钀ラ攢浼樻儬鍒竏to
+ * @Author wrh
+ * @Date 2023/3/2 10:45
+ * @Version 1.0
+ */
+@Data
+public class MarketingCouponDto {
+
+ //鐢ㄦ埛鏍囪瘑
+ private String userId;
+ /**鍏辩敤鏍囪瘑*/
+ private String commonId;
+ /**浼樻儬鍒告爣璇�*/
+ private String couponId;
+ /**鏃犻檺浜岀淮鐮佹惡甯﹀弬鏁�*/
+ private String sceneCode;
+}
--
Gitblit v1.8.0