From f3389d6291fb26fa0115b51ba1981e3002d670fb Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 19 三月 2024 15:46:41 +0800 Subject: [PATCH] Merge branch 'master-fwq-颜值规划4.0' into master-test --- 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 b3c9610..6ed6c1d 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 @@ -32,7 +32,7 @@ * @return Result */ @PostMapping(value = "/activity/shopId/list") - Result getActivityList(@RequestParam("shoId") String shoId); + 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