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

:feat: 替换paymentId

Browse Source
This commit is contained in:
re-aoharu
2024-04-16 11:01:25 +08:00
parent 650505a6d4
commit bd3bb82dbd
16 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import cn.bootx.platform.daxpay.service.core.order.pay.service.PayOrderQueryServ
import cn.bootx.platform.daxpay.service.core.payment.close.service.PayCloseService;
import cn.bootx.platform.daxpay.service.core.payment.sync.service.PaySyncService;
import cn.bootx.platform.daxpay.service.dto.order.pay.PayChannelOrderDto;
import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDetailDto;
import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDto;
import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderExtraDto;
import cn.bootx.platform.daxpay.service.param.order.PayOrderQuery;
@@ -59,6 +60,18 @@ public class PayOrderController {
.orElseThrow(() -> new DataNotExistException("支付订单不存在"));
return Res.ok(order);
}
@Operation(summary = "查询订单详情")
@GetMapping("/findByOrderNo")
public ResResult<PayOrderDetailDto> findByOrderNo(String orderNo){
PayOrderDto order = queryService.findByOrderNo(orderNo)
.map(PayOrder::toDto)
.orElseThrow(() -> new DataNotExistException("支付订单不存在"));
PayOrderDetailDto detailDto=new PayOrderDetailDto();
detailDto.setPayOrder(order);
detailDto.setPayOrderExtra(payOrderExtraService.findById(order.getId()).toDto());
detailDto.setPayChannelOrder(payChannelOrderService.findAllByPaymentId(orderNo));
return Res.ok(detailDto);
}
@Operation(summary = "查询支付订单扩展信息")
@GetMapping("/getExtraById")
@@ -68,8 +81,8 @@ public class PayOrderController {
@Operation(summary = "查询支付订单关联支付通道订单")
@GetMapping("/listByChannel")
public ResResult<List<PayChannelOrderDto>> listByChannel(Long paymentId){
return Res.ok(payChannelOrderService.findAllByPaymentId(paymentId));
public ResResult<List<PayChannelOrderDto>> listByChannel(String orderNo){
return Res.ok(payChannelOrderService.findAllByPaymentId(orderNo));
}
@Operation(summary = "查询支付通道订单详情")
@GetMapping("/getChannel")