From 971eb04d09d950f7fa0d534560a76dd69d84c69c Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
index 34779c6..1830c11 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
@@ -14,7 +14,7 @@
  * @Date 2022/8/8 17:36
  * @Version 1.0
  */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "activity")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "activity")
 public interface SActivityService {
 
     /**
@@ -42,8 +42,9 @@
      * @param ordersTotal 璁㈠崟鎬婚噾棰�
      * @return Result
      */
-    @PostMapping(value = "/activity/list")
-    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal);
+    @PostMapping(value = "/activity/check")
+    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,
+                 @RequestParam("ordersTotal") BigDecimal ordersTotal,@RequestParam("shopId") String shopId);
 
 
 

--
Gitblit v1.8.0