From 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期五, 23 八月 2024 16:20:08 +0800 Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 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 51ddff9..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 { /** @@ -31,8 +31,8 @@ * @param shoId 闂ㄥ簵鏍囪瘑 * @return Result */ - @PostMapping(value = "/activity/list") - Result getActivityList(@RequestParam("shoId") String shoId); + @PostMapping(value = "/activity/shopId/list") + Result getActivityList(@RequestParam("shoId") String shoId,@RequestParam("appId") String appId); /** @@ -42,8 +42,9 @@ * @param ordersTotal 璁㈠崟鎬婚噾棰� * @return Result */ - @PostMapping(value = "/activity/list") - Result getActivityList(@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