From 7a512d4a8b10fad9fb0aa75d6105955f033e1ee9 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期五, 07 六月 2024 15:37:22 +0800 Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java index 44906a1..a225a8e 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java @@ -1,13 +1,11 @@ package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; +import com.hz.phis.vo.order.OrderActivityCountVo; import com.hz.phis.vo.order.OrderActivityVo; 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; - -import java.math.BigDecimal; /**璁㈠崟娲诲姩鏌ヨ * @author CJH @@ -16,7 +14,7 @@ public interface SOrderActivityService { /** - * 鏍规嵁娲诲姩缂栫爜鏌ヨ璁㈠崟鏄惁宸茬粡鎵ц + * 鏍规嵁娲诲姩缂栫爜鏌ヨ鏄惁鎵ц+鏄惁娑堣垂+璧犻�佹暟鎹� * @param orderActivityVo 瀵硅薄 * @return Result 浣跨敤OrderActivityReturnVo杞寲 */ @@ -24,9 +22,11 @@ Result getActivityExecute(@RequestBody OrderActivityVo orderActivityVo); /** - * 鏍规嵁娲诲姩缂栫爜鏌ヨ璧犻�佺殑澧炲�奸噾 + * 鑾峰彇鐢ㄦ埛娲诲姩杩旇禒鐨勬暟鎹� + * @param orderActivityVo 瀵硅薄 + * @return Result 浣跨敤OrderActivityReturnVo杞寲 */ @PostMapping(value = "/order/activity/increment/money") - Result getActivityReturn(@RequestBody OrderActivityVo orderActivityVo); + Result getActivityReturn(@RequestBody OrderActivityCountVo orderActivityVo); } -- Gitblit v1.8.0