marge master

This commit is contained in:
xingyu
2023-01-04 10:57:19 +08:00
parent 7b98a3f3f3
commit 854ba3315c
335 changed files with 16 additions and 21122 deletions

View File

@ -6,8 +6,8 @@ import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
import cn.iocoder.yudao.framework.pay.core.client.dto.PayNotifyDataDTO;
import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
import cn.iocoder.yudao.module.pay.service.refund.PayRefundService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -19,7 +19,7 @@ import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.PAY_CHANNEL_CLIENT_NOT_FOUND;
@Api(tags = "管理后台 - 支付通知")
@Tag(name = "管理后台 - 支付通知")
@RestController
@RequestMapping("/pay/notify")
@Validated
@ -43,7 +43,7 @@ public class PayNotifyController {
* @return 返回跳转页面
*/
@GetMapping(value = "/return/{channelId}")
@ApiOperation("渠道统一的支付成功返回地址")
@Operation(summary = "渠道统一的支付成功返回地址")
@Deprecated // TODO yunai如果是 way 的情况,应该是跳转回前端地址
public String returnCallback(@PathVariable("channelId") Long channelId,
@RequestParam Map<String, String> params) {
@ -60,7 +60,7 @@ public class PayNotifyController {
* @return 成功返回 "success"
*/
@PostMapping(value = "/callback/{channelId}")
@ApiOperation(value = "支付渠道的统一回调接口", notes = "包括支付回调,退款回调")
@Operation(summary = "支付渠道的统一回调接口 - 包括支付回调,退款回调")
@PermitAll
@OperateLog(enable = false) // 回调地址,无需记录操作日志
public String notifyCallback(@PathVariable("channelId") Long channelId,