From d768d607e24628420c6416ac955e491e8d747d9d Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 08 八月 2022 19:45:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java | 13 +++++-
phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java | 4 +
phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoDto.java | 28 ++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 10 +++++
phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java | 4 +
phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/label/LabelTypePageDto.java | 5 ++
7 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoDto.java
new file mode 100644
index 0000000..c8e15d9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.dcp;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 鏍囩瑙勫垯锛堟爣绛剧被鍨嬶級鏌ヨ dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TagRuleInfoDto extends BaseDto {
+
+ /**鏍囪瘑*/
+ private String id;
+
+ /**涓婄骇鏍囪瘑*/
+ private String parentId;
+
+ /**鏍囩鍚嶇О**/
+ private String tagTypeName;
+
+ /**鑼冨洿**/
+ private String ascription;
+
+ public TagRuleInfoDto() {
+
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
index d6bd1a5..e982372 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
@@ -24,11 +24,20 @@
/**鏍囩绫诲埆*/
private String tagTypeName;
+ /**鐢ㄦ埛骞冲彴缂栧彿*/
+ private String platformCode;
+
/**鏍囩鏍囪瘑鍖归厤鎼滅储*/
- private List<String> tagIdAndList;
+ private List<String> tagNoAndList;
/**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
- private List<String> tagIdOrList;
+ private List<String> tagNoOrList;
+
+ /**鏍囩鍚嶇О鍖归厤鎼滅储*/
+ private List<String> tagNameAndList;
+
+ /**鏍囩鍚嶇О鍖呭惈鎼滅储*/
+ private List<String> tagNameOrList;
public UserTagInfoDto() {
diff --git a/phis-feign/src/main/java/com/hz/his/dto/label/LabelTypePageDto.java b/phis-feign/src/main/java/com/hz/his/dto/label/LabelTypePageDto.java
index 63541d9..03800f5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/label/LabelTypePageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/label/LabelTypePageDto.java
@@ -2,6 +2,9 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+
+import java.util.List;
+
/**
* @author fwq
* 鏍囩鍒嗙被鎵╁睍
@@ -11,4 +14,6 @@
/**绾у埆 0涓�绾� 1浜岀骇*/
private Integer level;
+ /**褰掑睘*/
+ private List<String> ascription;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java
index 255cbb5..24401df 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java
@@ -17,7 +17,9 @@
/**sku鏍囪瘑*/
private String skuId;
/**鍟嗗搧绫诲瀷*/
- private String goodType;
+ private Integer goodType;
+ /**his鍟嗗搧绫诲瀷*/
+ private String hisGoodType;
/**鍟嗗搧閲戦*/
private BigDecimal price;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
index e63776f..b7c4853 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
@@ -12,7 +12,9 @@
@Data
public class OrderItemCouponDto {
/**鍟嗗搧绫诲瀷*/
- private String goodsType;
+ private Integer goodsType;
+ /**his鍟嗗搧绫诲瀷*/
+ private String hisGoodsType;
/**鍟嗗搧鏍囪瘑*/
private String goodsId;
/**sku鏍囪瘑*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
index 58a9895..6e66d22 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
@@ -13,7 +13,7 @@
/**CRM sku鏍囪瘑*/
private String skuId;
/**鍟嗗搧绫诲瀷*/
- private String goodsType;
+ private Integer goodsType;
/** his绫诲瀷 */
private String hisType;
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 bd99279..9251ceb 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
@@ -2,11 +2,13 @@
import com.alibaba.fastjson.JSONObject;
import com.hx.resultTool.Result;
+import com.hz.his.dto.dcp.TagRuleInfoDto;
import com.hz.his.dto.dcp.TagRuleInfoItemDto;
import com.hz.his.dto.dcp.UserTagInfoDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -17,6 +19,10 @@
/**鏌ヨ鐢ㄦ埛鏍囩鍒楄〃*/
@PostMapping("/user/tag/info/list")
Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
+
+ /**鏌ヨ鐢ㄦ埛鏍囩鐢ㄦ埛鍒楄〃 杩斿洖鐢ㄦ埛id鏁扮粍*/
+ @RequestMapping("/user/tag/info/user/list")
+ Result userListData(@RequestBody UserTagInfoDto userTagInfoDto);
/**
* 缂栬緫鐢ㄦ埛鏍囩 娣诲姞 缂栬緫 鍒犻櫎 涓夊悎涓�鎺ュ彛
@@ -49,4 +55,8 @@
/**鏍囩鍒楄〃*/
@PostMapping("/tag/rule/item/list")
Result tagInfoListData(@RequestBody TagRuleInfoItemDto tagRuleInfoItemDto);
+
+ /**鏍囩鍒嗙被鏁版嵁鍒楄〃*/
+ @PostMapping("/tag/rule/info/list")
+ Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto);
}
--
Gitblit v1.8.0