From 633b7ea17a3fd767e8958477fadcae4217117faa Mon Sep 17 00:00:00 2001 From: DaxPay Date: Wed, 4 Dec 2024 19:23:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(core):=20=E5=AE=8C=E6=88=90=E6=94=B6?= =?UTF-8?q?=E9=93=B6=E5=8F=B0=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 实现收银台台功能 - 添加 CheckoutGroupConfigResult 和 CheckoutItemConfigResult 类的主键字段- 更新 CheckoutQueryService 以设置订单信息 - 调整 Task.md 中的任务列表，标记已完成的收银台相关任务 --- _doc/Task.md | 11 ++++++----- .../result/checkout/CheckoutGroupConfigResult.java | 3 +++ .../result/checkout/CheckoutItemConfigResult.java | 3 +++ .../service/checkout/CheckoutQueryService.java | 1 + 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/_doc/Task.md b/_doc/Task.md index 06e57dd7a..7ff41c514 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -11,7 +11,7 @@ - [x] 微信通道添加单独的认证跳转地址, 处理它的特殊情况 - [x] 支付订单新增待支付状态 ## 3.0.0.beta3 -- [ ] 收银台台功能 +- [x] 收银台台功能 - [x] 收银台配置 - [x] 分类配置 - [x] 明细配置 @@ -24,16 +24,17 @@ - [ ] 聚合支付(生成扫码链接) - [ ] H5收银台 - [ ] 跳转支付 + - [x] 升级为聚合支付 - [ ] ~~APP调起支付~~ - [ ] ~~小程序支付~~ - - [ ] 聚合收银台 - - [ ] Jsapi调用 - - [ ] 跳转支付 + - [x] 聚合收银台 + - [x] Jsapi调用 + - [x] 跳转支付 - [x] 支付码牌功能改造 - [x] 一个应用支持多码牌 - [x] 码牌不再使用应用号作为标识, 使用独立的编码 - [x] 码牌H5页面对接 - +- [ ] 分账配置/分账组/分账接收方合并为一个tabs页面 ## bugs - [x] 修复 BigDecimal 类型数据序列化和签名异常问题 - [x] 获取是否订阅消息通知类型查询范围错误问题 diff --git a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/checkout/CheckoutGroupConfigResult.java b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/checkout/CheckoutGroupConfigResult.java index 886322983..5f342ea60 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/checkout/CheckoutGroupConfigResult.java +++ b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/checkout/CheckoutGroupConfigResult.java @@ -16,6 +16,9 @@ import java.util.List; @Accessors(chain = true) @Schema(title = "收银台分类配置") public class CheckoutGroupConfigResult{ + /** 主键 */ + @Schema(description = "主键") + private Long id; /** * 类型 web/h5/小程序 diff --git a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/checkout/CheckoutItemConfigResult.java b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/checkout/CheckoutItemConfigResult.java index 883be86ae..a8f4256bb 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/checkout/CheckoutItemConfigResult.java +++ b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/checkout/CheckoutItemConfigResult.java @@ -17,6 +17,9 @@ import org.dromara.daxpay.core.enums.PayMethodEnum; @Schema(title = "收银台配置项") public class CheckoutItemConfigResult { + /** 主键 */ + @Schema(description = "主键") + private Long id; /** * 发起调用的类型 * @see CheckoutCallTypeEnum diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/checkout/CheckoutQueryService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/checkout/CheckoutQueryService.java index 50a918ff2..8ac2ef219 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/checkout/CheckoutQueryService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/checkout/CheckoutQueryService.java @@ -90,6 +90,7 @@ public class CheckoutQueryService { .setAmount(payOrder.getAmount()) .setBizOrderNo(payOrder.getBizOrderNo()) .setOrderNo(payOrder.getOrderNo()); + checkoutInfoResult.setOrder(order); // 获取收银台配置 checkoutInfoResult.setConfig(this.getConfig(payOrder.getAppId())); // 获取分组和明细配置