From 87a9aade5539d7be459059ab07566af148b40a0e Mon Sep 17 00:00:00 2001 From: zhouxiang <zhouxiang> Date: 星期三, 28 十二月 2022 19:04:50 +0800 Subject: [PATCH] Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-prod-new --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 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..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 @@ -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