From f7d264eff7b85e034b0c5b8e634175b9e25c0dbb Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 24 Oct 2023 12:41:26 +0800 Subject: [PATCH] =?UTF-8?q?mall=EF=BC=9A=E5=AE=8C=E5=96=84=20cloud=20?= =?UTF-8?q?=E7=9A=84=20api=20=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promotion/api/combination/CombinationRecordApi.java | 4 ++-- .../iocoder/yudao/module/pay/api/order/PayOrderApi.java | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApi.java b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApi.java index 90994b714..acd9d935f 100644 --- a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApi.java +++ b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApi.java @@ -57,13 +57,13 @@ public interface CombinationRecordApi { @Parameters({ @Parameter(name = "userId", description = "用户编号", required = true, example = "1024"), @Parameter(name = "activityId", description = "活动编号", required = true, example = "2048"), - @Parameter(name = "headId", description = "团长编号", required = true, example = "4096"), + @Parameter(name = "headId", description = "团长编号", example = "4096"), // 如果新发起的团，headId 不用传递 @Parameter(name = "skuId", description = "SKU 编号", required = true, example = "8192"), @Parameter(name = "count", description = "数量", required = true, example = "1"), }) CommonResult validateJoinCombination(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId, - @RequestParam("headId") Long headId, + @RequestParam(value = "headId", required = false) Long headId, @RequestParam("skuId") Long skuId, @RequestParam("count") Integer count); diff --git a/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java b/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java index 389af59b8..502bfdd8e 100644 --- a/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java +++ b/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java @@ -9,10 +9,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -26,10 +23,10 @@ public interface PayOrderApi { @Operation(summary = "创建支付单") CommonResult createOrder(@Valid @RequestBody PayOrderCreateReqDTO reqDTO); - @PostMapping(PREFIX + "/get") + @GetMapping(PREFIX + "/get") @Operation(summary = "获得支付单") @Parameter(name = "id", description = "支付单编号", example = "1", required = true) - CommonResult getOrder(Long id); + CommonResult getOrder(@RequestParam("id") Long id); @PutMapping(PREFIX + "/update-price") @Operation(summary = "更新支付订单价格")