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

feat 分账限制, 优化一系列分账相关的逻辑

Browse Source
This commit is contained in:
DaxPay
2024-05-29 18:19:10 +08:00
parent a773c520d1
commit ffa0232f20
28 changed files with 141 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daxpay-single/daxpay-single-admin/src/main/java/cn/daxpay/single/admin/controller/order/PayOrderController.java
View File

@@ -15,7 +15,7 @@ import cn.daxpay.single.service.core.order.pay.service.PayOrderQueryService;
import cn.daxpay.single.service.core.payment.allocation.service.AllocationService;
import cn.daxpay.single.service.core.payment.close.service.PayCloseService;
import cn.daxpay.single.service.core.payment.sync.service.PaySyncService;
import cn.daxpay.single.service.dto.order.pay.PayOrderDetailDto;
import cn.daxpay.single.service.dto.order.pay.PayOrderInfoDto;
import cn.daxpay.single.service.dto.order.pay.PayOrderDto;
import cn.daxpay.single.service.dto.order.pay.PayOrderExtraDto;
import cn.daxpay.single.service.param.order.PayOrderQuery;
@@ -63,11 +63,11 @@ public class PayOrderController {
@Operation(summary = "查询订单详情")
@GetMapping("/findByOrderNo")
public ResResult<PayOrderDetailDto> findByOrderNo(String orderNo){
public ResResult<PayOrderInfoDto> findByOrderNo(String orderNo){
PayOrderDto order = queryService.findByOrderNo(orderNo)
.map(PayOrder::toDto)
.orElseThrow(() -> new DataNotExistException("支付订单不存在"));
PayOrderDetailDto detailDto=new PayOrderDetailDto();
PayOrderInfoDto detailDto=new PayOrderInfoDto();
detailDto.setPayOrder(order);
detailDto.setPayOrderExtra(payOrderExtraService.findById(order.getId()));
return Res.ok(detailDto);