From 8708339502e8222677cb109ed3ae5b38f67be845 Mon Sep 17 00:00:00 2001 From: DaxPay Date: Wed, 11 Dec 2024 18:07:15 +0800 Subject: [PATCH] =?UTF-8?q?style(allocation):=20=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=E5=92=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/ChangeLog.md | 7 +++++++ .../controller/allocation/AllocOrderController.java | 12 ++++++------ .../entity/allocation/transaction/AllocDetail.java | 8 ++++---- .../entity/allocation/transaction/AllocOrder.java | 8 ++++---- .../allocation/order/AllocOrderQueryService.java | 12 ++++++------ 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index f237586d4..2308272f3 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,4 +1,11 @@ # CHANGELOG +## [v3.0.0.beta3] 2024-12-05 +- 新增: 增加支付宝分账功能 +- 优化: 优化分账 +- fix: 修复微信v2当面付发起失败问题 +- fix sm3签名校验问题 +- fix SDK参数和返回对象与接口不一致修改 + ## [v3.0.0.beta2] 2024-12-05 - 新增: 增加PC收银台功能 - 新增: 增加H5收银台功能 diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/allocation/AllocOrderController.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/allocation/AllocOrderController.java index f57a7c4b5..c31705dab 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/allocation/AllocOrderController.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/allocation/AllocOrderController.java @@ -9,9 +9,9 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.dromara.daxpay.core.param.allocation.transaction.AllocFinishParam; -import org.dromara.daxpay.core.result.allocation.order.AllocDetailResult; -import org.dromara.daxpay.core.result.allocation.order.AllocOrderResult; import org.dromara.daxpay.service.param.order.allocation.AllocOrderQuery; +import org.dromara.daxpay.service.result.allocation.order.AllocDetailVo; +import org.dromara.daxpay.service.result.allocation.order.AllocOrderVo; import org.dromara.daxpay.service.service.allocation.AllocationService; import org.dromara.daxpay.service.service.allocation.order.AllocOrderQueryService; import org.springframework.web.bind.annotation.GetMapping; @@ -39,25 +39,25 @@ public class AllocOrderController { @Operation(summary = "分页") @GetMapping("/page") - public Result> page(PageParam pageParam, AllocOrderQuery param){ + public Result> page(PageParam pageParam, AllocOrderQuery param){ return Res.ok(queryService.page(pageParam,param)); } @Operation(summary = "分账明细列表") @GetMapping("/detail/findAll") - public Result> findDetailsByOrderId(Long orderId){ + public Result> findDetailsByOrderId(Long orderId){ return Res.ok(queryService.findDetailsByOrderId(orderId)); } @Operation(summary = "查询详情") @GetMapping("/findById") - public Result findById(Long id){ + public Result findById(Long id){ return Res.ok(queryService.findById(id)); } @Operation(summary = "查询明细详情") @GetMapping("/detail/findById") - public Result findDetailById(Long id){ + public Result findDetailById(Long id){ return Res.ok(queryService.findDetailById(id)); } diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocDetail.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocDetail.java index e8b766aaa..c85ac7cc9 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocDetail.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocDetail.java @@ -7,9 +7,9 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.dromara.daxpay.core.enums.AllocDetailResultEnum; import org.dromara.daxpay.core.enums.AllocReceiverTypeEnum; -import org.dromara.daxpay.core.result.allocation.order.AllocDetailResult; import org.dromara.daxpay.service.common.entity.MchAppBaseEntity; import org.dromara.daxpay.service.convert.allocation.AllocOrderConvert; +import org.dromara.daxpay.service.result.allocation.order.AllocDetailVo; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -23,7 +23,7 @@ import java.time.LocalDateTime; @Data @Accessors(chain = true) @TableName("pay_alloc_detail") -public class AllocDetail extends MchAppBaseEntity implements ToResult { +public class AllocDetail extends MchAppBaseEntity implements ToResult { /** 分账订单ID */ private Long allocationId; @@ -71,7 +71,7 @@ public class AllocDetail extends MchAppBaseEntity implements ToResult { +public class AllocOrder extends MchAppBaseEntity implements ToResult { /** 分账单号 */ private String allocNo; @@ -106,7 +106,7 @@ public class AllocOrder extends MchAppBaseEntity implements ToResult page(PageParam pageParam, AllocOrderQuery param){ + public PageResult page(PageParam pageParam, AllocOrderQuery param){ return MpUtil.toPageResult(allocationOrderManager.page(pageParam, param)); } /** * 查询详情 */ - public AllocOrderResult findById(Long id) { + public AllocOrderVo findById(Long id) { return allocationOrderManager.findById(id).map(AllocOrder::toResult).orElseThrow(() -> new DataNotExistException("分账订单不存在")); } /** * 查询订单明细列表 */ - public List findDetailsByOrderId(Long orderId){ + public List findDetailsByOrderId(Long orderId){ return MpUtil.toListResult(allocOrderDetailManager.findAllByOrderId(orderId)); } /** * 查询订单明细详情 */ - public AllocDetailResult findDetailById(Long id){ + public AllocDetailVo findDetailById(Long id){ return allocOrderDetailManager.findById(id).map(AllocDetail::toResult).orElseThrow(() -> new DataNotExistException("分账订单明细不存在")); }