From a0c7de34c4539a73e1c08e4dee6609b791dd34c0 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期四, 01 十二月 2022 10:12:05 +0800
Subject: [PATCH] Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
index 4800ec1..97f2c91 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
@@ -4,9 +4,12 @@
* @Author
*/
-import org.springframework.cloud.openfeign.FeignClient;
import com.hx.resultTool.Result;
+import net.sf.json.JSONObject;
+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.RequestParam;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -20,12 +23,17 @@
* @return
*/
@PostMapping(value = "/user/consumption/data/list")
- Result userList(String userId);
+ Result userList(@RequestParam("userId") String userId);
/**
* 鏍规嵁鐢ㄦ埛id鍚屾鐢ㄦ埛鍩烘湰淇℃伅
* @param userId
* @return
*/
@PostMapping(value = "/sync/user/syncUserById")
- Result syncUserById(String userId);
+ Result syncUserById(@RequestParam("userId") String userId);
+
+ /** 涓诲姩鍚屾鍒涘缓椤惧鍒癶is - 淇敼鐢ㄦ埛ciq鍜屼細鍛樼瓑绾�*/
+ @PostMapping("/sync/user/updateMembership")
+ Result updateMembership(@RequestBody JSONObject jsonObject);
+
}
--
Gitblit v1.8.0