From 350c9e309f58745f544e7ce13650d2b8d9d2006f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 08 十一月 2022 15:01:58 +0800
Subject: [PATCH] 订单总金额的折后金额字段

---
 phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

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 7ebbb7b..b645b90 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
@@ -1,11 +1,14 @@
 package com.hz.his.feign.service.dcp;
 
+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 鏄姹傛帴鍙e墠缂�
@@ -16,6 +19,10 @@
     /**鏌ヨ鐢ㄦ埛鏍囩鍒楄〃*/
     @PostMapping("/user/tag/info/list")
     Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
+
+    /**鏌ヨ鐢ㄦ埛鏍囩鐢ㄦ埛鍒楄〃 杩斿洖(FilterUserDto)*/
+    @RequestMapping("/user/tag/info/user/list")
+    Result userListData(@RequestBody UserTagInfoDto userTagInfoDto);
 
     /**
      * 缂栬緫鐢ㄦ埛鏍囩 娣诲姞 缂栬緫 鍒犻櫎  涓夊悎涓�鎺ュ彛
@@ -38,14 +45,18 @@
      * }
      */
     @PostMapping(value = "/user/tag/info/edit")
-    Result edit(@RequestBody String data);
+    Result edit(@RequestBody JSONObject data);
 
 
     /**鏍囩鍒嗙被鏍戝舰鏁版嵁  鏁版嵁妗堜緥锛歿"ascription":["customer","project","product","card","employee","promotion"]}*/
     @PostMapping("/tag/rule/info/tree/data")
-    Result tagTypeTreeData(@RequestBody String data);
+    Result tagTypeTreeData(@RequestBody JSONObject data);
 
     /**鏍囩鍒楄〃*/
     @PostMapping("/tag/rule/item/list")
     Result tagInfoListData(@RequestBody TagRuleInfoItemDto tagRuleInfoItemDto);
+
+    /**鏍囩鍒嗙被鏁版嵁鍒楄〃*/
+    @PostMapping("/tag/rule/info/list")
+    Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto);
 }

--
Gitblit v1.8.0