dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-07 21:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat 客户系统通知联调, 修复手动发起退款上下文未进行初始化的问题, 其他一些小问题修复

Browse Source
This commit is contained in:
bootx
2024-02-25 21:54:14 +08:00
parent f26806816b
commit 536d3c6191
34 changed files with 348 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/RefundOrderController.java
View File

@@ -4,26 +4,20 @@ import cn.bootx.platform.common.core.rest.PageResult;
import cn.bootx.platform.common.core.rest.Res;
import cn.bootx.platform.common.core.rest.ResResult;
import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.spring.util.WebServletUtil;
import cn.bootx.platform.daxpay.param.pay.RefundParam;
import cn.bootx.platform.daxpay.param.pay.RefundSyncParam;
import cn.bootx.platform.daxpay.result.pay.SyncResult;
import cn.bootx.platform.daxpay.service.core.order.refund.service.RefundOrderQueryService;
import cn.bootx.platform.daxpay.service.core.payment.refund.service.RefundService;
import cn.bootx.platform.daxpay.service.core.order.refund.service.RefundOrderService;
import cn.bootx.platform.daxpay.service.core.payment.sync.service.RefundSyncService;
import cn.bootx.platform.daxpay.service.dto.order.refund.RefundOrderDto;
import cn.bootx.platform.daxpay.service.dto.order.refund.RefundChannelOrderDto;
import cn.bootx.platform.daxpay.service.dto.order.refund.RefundOrderDto;
import cn.bootx.platform.daxpay.service.param.order.PayOrderRefundParam;
import cn.bootx.platform.daxpay.service.param.order.RefundOrderQuery;
import cn.hutool.extra.servlet.ServletUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
/**
* 支付退款控制器
@@ -35,49 +29,39 @@ import java.util.Optional;
@RequestMapping("/order/refund")
@RequiredArgsConstructor
public class RefundOrderController {
private final RefundOrderQueryService payRefundQueryService;
private final RefundService refundService;
private final RefundOrderService refundOrderService;
private final RefundSyncService refundSyncService;
@Operation(summary = "分页查询")
@GetMapping("/page")
public ResResult<PageResult<RefundOrderDto>> page(PageParam pageParam, RefundOrderQuery query){
return Res.ok(payRefundQueryService.page(pageParam, query));
return Res.ok(refundOrderService.page(pageParam, query));
}
@Operation(summary = "查询单条")
@GetMapping("/findById")
public ResResult<RefundOrderDto> findById(Long id){
return Res.ok(payRefundQueryService.findById(id));
return Res.ok(refundOrderService.findById(id));
}
@Operation(summary = "通道退款订单列表查询")
@GetMapping("/listByChannel")
public ResResult<List<RefundChannelOrderDto>> listByChannel(Long refundId){
return Res.ok(payRefundQueryService.listByChannel(refundId));
return Res.ok(refundOrderService.listByChannel(refundId));
}
@Operation(summary = "查询通道退款订单详情")
@GetMapping("/findChannelById")
public ResResult<RefundChannelOrderDto> findChannelById(Long id){
return Res.ok(payRefundQueryService.findChannelById(id));
return Res.ok(refundOrderService.findChannelById(id));
}
@Operation(summary = "手动发起退款")
@PostMapping("/refund")
public ResResult<Void> refund(@RequestBody PayOrderRefundParam param){
String ip = Optional.ofNullable(WebServletUtil.getRequest())
.map(ServletUtil::getClientIP)
.orElse("未知");
RefundParam refundParam = new RefundParam();
refundParam.setPaymentId(param.getPaymentId());
refundParam.setRefundChannels(param.getRefundChannels());
refundParam.setReqTime(LocalDateTime.now());
refundParam.setClientIp(ip);
refundService.refund(refundParam);
refundOrderService.refund(param);
return Res.ok();
}