From 31b50869b272518bcc6bfa5415fd54da7ef301fd Mon Sep 17 00:00:00 2001 From: DaxPay Date: Thu, 5 Dec 2024 20:45:18 +0800 Subject: [PATCH] =?UTF-8?q?build=203.0.0.beta1,=20fix=20pg=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config/postgresql/dax-pay-single.sql | 2 +- _doc/Task.md | 53 ++++++++++++++----- .../common-cache/pom.xml | 2 +- .../common-config/pom.xml | 2 +- .../common-exception-handler/pom.xml | 2 +- .../common-header-holder/pom.xml | 2 +- .../common-jackson/pom.xml | 2 +- .../bootx-platform-common/common-log/pom.xml | 2 +- .../common-mybatis-plus/pom.xml | 2 +- .../common-redis/pom.xml | 2 +- .../common-spring/pom.xml | 2 +- .../common-swagger/pom.xml | 2 +- bootx-platform/bootx-platform-common/pom.xml | 2 +- bootx-platform/bootx-platform-core/pom.xml | 2 +- bootx-platform/bootx-platform-service/pom.xml | 2 +- .../service-baseapi/pom.xml | 2 +- .../service-iam/pom.xml | 2 +- bootx-platform/bootx-platform-starter/pom.xml | 4 +- .../starter-audit-log/pom.xml | 2 +- .../starter-auth/pom.xml | 2 +- .../starter-delay-queue/pom.xml | 2 +- .../starter-file/pom.xml | 2 +- .../starter-quartz/pom.xml | 2 +- bootx-platform/pom.xml | 4 +- .../daxpay-single-alipay/pom.xml | 2 +- .../daxpay-single-union/pom.xml | 2 +- .../daxpay-single-wechat/pom.xml | 2 +- daxpay-single-channel/pom.xml | 8 +-- daxpay-single/daxpay-single-core/pom.xml | 2 +- daxpay-single/daxpay-single-service/pom.xml | 2 +- daxpay-single/daxpay-single-unisdk/pom.xml | 2 +- daxpay-single/pom.xml | 6 +-- pom.xml | 2 +- 33 files changed, 79 insertions(+), 52 deletions(-) diff --git a/_config/postgresql/dax-pay-single.sql b/_config/postgresql/dax-pay-single.sql index 0fd2e47a..d0092cd6 100644 --- a/_config/postgresql/dax-pay-single.sql +++ b/_config/postgresql/dax-pay-single.sql @@ -1235,7 +1235,7 @@ CREATE TABLE "public"."pay_checkout_group_config" ( "last_modifier" int8, "last_modified_time" timestamp(6), "version" int4 NOT NULL, - "deleted" varchar(1) COLLATE "pg_catalog"."default" NOT NULL, + "deleted" bool NOT NULL, "app_id" varchar(32) COLLATE "pg_catalog"."default", "type" varchar(32) COLLATE "pg_catalog"."default", "name" varchar(50) COLLATE "pg_catalog"."default", diff --git a/_doc/Task.md b/_doc/Task.md index e52890e0..0f70f7ac 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -2,7 +2,19 @@ ## 3.0.1 功能优化 - [ ] 收银台功能优化 - [ ] 支持配置背景色和图标 -## 3.0.0.beta3 +- [ ] 定时同步任务频次不要太高, 预防产生过多的数据 +## 3.0.0.bate3: 功能完善 +- 优化: +- [ ] 增加首页驾驶舱功能 +- [ ] 分账功能 + - [x] 分账接收方配置 + - [ ] 分账单管理 + - [ ] 分账接口开发 +- [ ] 网关配套移动端开发 + - [ ] 同步回调页 +- [x] 微信通道添加单独的认证跳转地址, 处理它的特殊情况 +- [x] 支付订单新增待支付状态 +## 3.0.0.beta2 收银台 - [x] 收银台功能 - [x] 收银台配置 - [x] 分类配置 @@ -28,23 +40,38 @@ - [x] 码牌不再使用应用号作为标识, 使用独立的编码 - [x] 码牌H5页面对接 - [ ] 分账配置/分账组/分账接收方合并为一个tabs页面 -## 3.0.0.bate2: 功能完善第二阶段 -- 优化: -- [ ] 增加首页驾驶舱功能 -- [ ] 分账功能 - - [x] 分账接收方配置 - - [ ] 分账单管理 - - [ ] 分账接口开发 -- [ ] 网关配套移动端开发 - - [ ] 同步回调页 -- [x] 微信通道添加单独的认证跳转地址, 处理它的特殊情况 -- [x] 支付订单新增待支付状态 +## 3.0.0.beta2 收银台 +- [x] 收银台功能 + - [x] 收银台配置 + - [x] 分类配置 + - [x] 明细配置 + - [x] 聚合支付配置 + - [x] 支持通过订单信息生成多种类型的收银台链接, + - [x] pc收银台 + - [x] 扫码支付 + - [x] 条码支付 + - [x] 跳转支付 + - [x] 聚合支付(生成扫码链接) + - [x] 聚合支付(条码支付) + - [x] H5收银台 + - [x] 跳转支付 + - [x] 升级为聚合支付 + - [ ] ~~APP调起支付~~ + - [ ] ~~小程序支付~~ + - [x] 聚合收银台 + - [x] Jsapi调用 + - [x] 跳转支付 +- [x] 支付码牌功能改造 + - [x] 一个应用支持多码牌 + - [x] 码牌不再使用应用号作为标识, 使用独立的编码 + - [x] 码牌H5页面对接 +- [ ] 分账配置/分账组/分账接收方合并为一个tabs页面 + ## bugs - [x] 修复 BigDecimal 类型数据序列化和签名异常问题 - [x] 获取是否订阅消息通知类型查询范围错误问题 ## 任务池 -- [ ] 定时同步任务频次不要太高, 预防产生过多的数据 - [ ] 退款支持以撤销的方式进行退款 - [ ] 商户应用增加启停用状态 - [ ] 商户应用应该要有一个类似删除的功能, 实现停用冻结, 但不影响数据的关联 diff --git a/bootx-platform/bootx-platform-common/common-cache/pom.xml b/bootx-platform/bootx-platform-common/common-cache/pom.xml index 9b6b9105..5e18c29c 100644 --- a/bootx-platform/bootx-platform-common/common-cache/pom.xml +++ b/bootx-platform/bootx-platform-common/common-cache/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-cache diff --git a/bootx-platform/bootx-platform-common/common-config/pom.xml b/bootx-platform/bootx-platform-common/common-config/pom.xml index 772bc4ed..687ff96f 100644 --- a/bootx-platform/bootx-platform-common/common-config/pom.xml +++ b/bootx-platform/bootx-platform-common/common-config/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-config diff --git a/bootx-platform/bootx-platform-common/common-exception-handler/pom.xml b/bootx-platform/bootx-platform-common/common-exception-handler/pom.xml index f234042f..176633a8 100644 --- a/bootx-platform/bootx-platform-common/common-exception-handler/pom.xml +++ b/bootx-platform/bootx-platform-common/common-exception-handler/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-exception-handler diff --git a/bootx-platform/bootx-platform-common/common-header-holder/pom.xml b/bootx-platform/bootx-platform-common/common-header-holder/pom.xml index 41fcf29e..fc1327e4 100644 --- a/bootx-platform/bootx-platform-common/common-header-holder/pom.xml +++ b/bootx-platform/bootx-platform-common/common-header-holder/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-header-holder diff --git a/bootx-platform/bootx-platform-common/common-jackson/pom.xml b/bootx-platform/bootx-platform-common/common-jackson/pom.xml index bac001df..1558dcc9 100644 --- a/bootx-platform/bootx-platform-common/common-jackson/pom.xml +++ b/bootx-platform/bootx-platform-common/common-jackson/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-jackson diff --git a/bootx-platform/bootx-platform-common/common-log/pom.xml b/bootx-platform/bootx-platform-common/common-log/pom.xml index 8e3270f3..aeedc3bd 100644 --- a/bootx-platform/bootx-platform-common/common-log/pom.xml +++ b/bootx-platform/bootx-platform-common/common-log/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-log diff --git a/bootx-platform/bootx-platform-common/common-mybatis-plus/pom.xml b/bootx-platform/bootx-platform-common/common-mybatis-plus/pom.xml index 2c5837e9..b35359b1 100644 --- a/bootx-platform/bootx-platform-common/common-mybatis-plus/pom.xml +++ b/bootx-platform/bootx-platform-common/common-mybatis-plus/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-mybatis-plus diff --git a/bootx-platform/bootx-platform-common/common-redis/pom.xml b/bootx-platform/bootx-platform-common/common-redis/pom.xml index d5b52b7d..ac495790 100644 --- a/bootx-platform/bootx-platform-common/common-redis/pom.xml +++ b/bootx-platform/bootx-platform-common/common-redis/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-redis diff --git a/bootx-platform/bootx-platform-common/common-spring/pom.xml b/bootx-platform/bootx-platform-common/common-spring/pom.xml index 2ee2a772..08eacbc6 100644 --- a/bootx-platform/bootx-platform-common/common-spring/pom.xml +++ b/bootx-platform/bootx-platform-common/common-spring/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-spring diff --git a/bootx-platform/bootx-platform-common/common-swagger/pom.xml b/bootx-platform/bootx-platform-common/common-swagger/pom.xml index 958bee3d..d6d59a6b 100644 --- a/bootx-platform/bootx-platform-common/common-swagger/pom.xml +++ b/bootx-platform/bootx-platform-common/common-swagger/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-common - 3.0.0.beta1 + 3.0.0.beta2 common-swagger diff --git a/bootx-platform/bootx-platform-common/pom.xml b/bootx-platform/bootx-platform-common/pom.xml index 6b20ba44..69c3ad5d 100644 --- a/bootx-platform/bootx-platform-common/pom.xml +++ b/bootx-platform/bootx-platform-common/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform - 3.0.0.beta1 + 3.0.0.beta2 4.0.0 diff --git a/bootx-platform/bootx-platform-core/pom.xml b/bootx-platform/bootx-platform-core/pom.xml index f92aaa71..adf36d88 100644 --- a/bootx-platform/bootx-platform-core/pom.xml +++ b/bootx-platform/bootx-platform-core/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform - 3.0.0.beta1 + 3.0.0.beta2 4.0.0 diff --git a/bootx-platform/bootx-platform-service/pom.xml b/bootx-platform/bootx-platform-service/pom.xml index dba99229..ab7d1af6 100644 --- a/bootx-platform/bootx-platform-service/pom.xml +++ b/bootx-platform/bootx-platform-service/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform - 3.0.0.beta1 + 3.0.0.beta2 service-baseapi diff --git a/bootx-platform/bootx-platform-service/service-baseapi/pom.xml b/bootx-platform/bootx-platform-service/service-baseapi/pom.xml index 990be525..0db50969 100644 --- a/bootx-platform/bootx-platform-service/service-baseapi/pom.xml +++ b/bootx-platform/bootx-platform-service/service-baseapi/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-service - 3.0.0.beta1 + 3.0.0.beta2 service-baseapi diff --git a/bootx-platform/bootx-platform-service/service-iam/pom.xml b/bootx-platform/bootx-platform-service/service-iam/pom.xml index 09210584..84a6af32 100644 --- a/bootx-platform/bootx-platform-service/service-iam/pom.xml +++ b/bootx-platform/bootx-platform-service/service-iam/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-service - 3.0.0.beta1 + 3.0.0.beta2 service-iam diff --git a/bootx-platform/bootx-platform-starter/pom.xml b/bootx-platform/bootx-platform-starter/pom.xml index 920124de..9d4530b3 100644 --- a/bootx-platform/bootx-platform-starter/pom.xml +++ b/bootx-platform/bootx-platform-starter/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform - 3.0.0.beta1 + 3.0.0.beta2 starter-auth @@ -25,7 +25,7 @@ cn.bootx.platform bootx-platform-core - 3.0.0.beta1 + 3.0.0.beta2 diff --git a/bootx-platform/bootx-platform-starter/starter-audit-log/pom.xml b/bootx-platform/bootx-platform-starter/starter-audit-log/pom.xml index 695aef18..bf0df5e7 100644 --- a/bootx-platform/bootx-platform-starter/starter-audit-log/pom.xml +++ b/bootx-platform/bootx-platform-starter/starter-audit-log/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-starter - 3.0.0.beta1 + 3.0.0.beta2 starter-audit-log diff --git a/bootx-platform/bootx-platform-starter/starter-auth/pom.xml b/bootx-platform/bootx-platform-starter/starter-auth/pom.xml index 69fabe7c..c34ce6c8 100644 --- a/bootx-platform/bootx-platform-starter/starter-auth/pom.xml +++ b/bootx-platform/bootx-platform-starter/starter-auth/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-starter - 3.0.0.beta1 + 3.0.0.beta2 starter-auth diff --git a/bootx-platform/bootx-platform-starter/starter-delay-queue/pom.xml b/bootx-platform/bootx-platform-starter/starter-delay-queue/pom.xml index 39a29ca2..95eebe20 100644 --- a/bootx-platform/bootx-platform-starter/starter-delay-queue/pom.xml +++ b/bootx-platform/bootx-platform-starter/starter-delay-queue/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-starter - 3.0.0.beta1 + 3.0.0.beta2 starter-delay-queue diff --git a/bootx-platform/bootx-platform-starter/starter-file/pom.xml b/bootx-platform/bootx-platform-starter/starter-file/pom.xml index ad636325..3fbb2c03 100644 --- a/bootx-platform/bootx-platform-starter/starter-file/pom.xml +++ b/bootx-platform/bootx-platform-starter/starter-file/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-starter - 3.0.0.beta1 + 3.0.0.beta2 starter-file diff --git a/bootx-platform/bootx-platform-starter/starter-quartz/pom.xml b/bootx-platform/bootx-platform-starter/starter-quartz/pom.xml index b21cc087..84aa2944 100644 --- a/bootx-platform/bootx-platform-starter/starter-quartz/pom.xml +++ b/bootx-platform/bootx-platform-starter/starter-quartz/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-platform-starter - 3.0.0.beta1 + 3.0.0.beta2 starter-quartz diff --git a/bootx-platform/pom.xml b/bootx-platform/pom.xml index 24be8883..290c33ab 100644 --- a/bootx-platform/pom.xml +++ b/bootx-platform/pom.xml @@ -13,7 +13,7 @@ cn.bootx.platform bootx-platform - 3.0.0.beta1 + 3.0.0.beta2 pom 基础脚手架服务 @@ -25,7 +25,7 @@ - 3.0.0.beta1 + 3.0.0.beta2 2.5.0 5.8.31 diff --git a/daxpay-single-channel/daxpay-single-alipay/pom.xml b/daxpay-single-channel/daxpay-single-alipay/pom.xml index 2e8c2733..112d96e8 100644 --- a/daxpay-single-channel/daxpay-single-alipay/pom.xml +++ b/daxpay-single-channel/daxpay-single-alipay/pom.xml @@ -7,7 +7,7 @@ org.dromara.daxpay daxpay-single-channel - 3.0.0.beta1 + 3.0.0.beta2 daxpay-single-alipay diff --git a/daxpay-single-channel/daxpay-single-union/pom.xml b/daxpay-single-channel/daxpay-single-union/pom.xml index c4241d6f..7cd349ab 100644 --- a/daxpay-single-channel/daxpay-single-union/pom.xml +++ b/daxpay-single-channel/daxpay-single-union/pom.xml @@ -7,7 +7,7 @@ org.dromara.daxpay daxpay-single-channel - 3.0.0.beta1 + 3.0.0.beta2 daxpay-single-union diff --git a/daxpay-single-channel/daxpay-single-wechat/pom.xml b/daxpay-single-channel/daxpay-single-wechat/pom.xml index d5bd1be5..00b935c0 100644 --- a/daxpay-single-channel/daxpay-single-wechat/pom.xml +++ b/daxpay-single-channel/daxpay-single-wechat/pom.xml @@ -7,7 +7,7 @@ org.dromara.daxpay daxpay-single-channel - 3.0.0.beta1 + 3.0.0.beta2 daxpay-single-wechat diff --git a/daxpay-single-channel/pom.xml b/daxpay-single-channel/pom.xml index d1515f92..11825766 100644 --- a/daxpay-single-channel/pom.xml +++ b/daxpay-single-channel/pom.xml @@ -13,7 +13,7 @@ org.dromara.daxpay daxpay-single-channel - 3.0.0.beta1 + 3.0.0.beta2 pom 单商户支付通道功能实现 @@ -35,8 +35,8 @@ 1.4.8 4.5.0 - 3.0.0.beta1 - 3.0.0.beta1 + 3.0.0.beta2 + 3.0.0.beta2 @@ -67,7 +67,7 @@ org.dromara.daxpay daxpay-single-service - 3.0.0.beta1 + 3.0.0.beta2 diff --git a/daxpay-single/daxpay-single-core/pom.xml b/daxpay-single/daxpay-single-core/pom.xml index 6e2d95b4..19bf07b8 100644 --- a/daxpay-single/daxpay-single-core/pom.xml +++ b/daxpay-single/daxpay-single-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.daxpay daxpay-single - 3.0.0.beta1 + 3.0.0.beta2 daxpay-single-core diff --git a/daxpay-single/daxpay-single-service/pom.xml b/daxpay-single/daxpay-single-service/pom.xml index 123da5a1..59621c23 100644 --- a/daxpay-single/daxpay-single-service/pom.xml +++ b/daxpay-single/daxpay-single-service/pom.xml @@ -6,7 +6,7 @@ org.dromara.daxpay daxpay-single - 3.0.0.beta1 + 3.0.0.beta2 daxpay-single-service diff --git a/daxpay-single/daxpay-single-unisdk/pom.xml b/daxpay-single/daxpay-single-unisdk/pom.xml index fe016019..2623bc75 100644 --- a/daxpay-single/daxpay-single-unisdk/pom.xml +++ b/daxpay-single/daxpay-single-unisdk/pom.xml @@ -6,7 +6,7 @@ org.dromara.daxpay daxpay-single - 3.0.0.beta1 + 3.0.0.beta2 daxpay-single-unisdk diff --git a/daxpay-single/pom.xml b/daxpay-single/pom.xml index b8395f39..7589b6f1 100644 --- a/daxpay-single/pom.xml +++ b/daxpay-single/pom.xml @@ -13,7 +13,7 @@ org.dromara.daxpay daxpay-single - 3.0.0.beta1 + 3.0.0.beta2 pom 单商户支付核心功能实现 @@ -33,8 +33,8 @@ 0.2.0 8.5.2 - 3.0.0.beta1 - 3.0.0.beta1 + 3.0.0.beta2 + 3.0.0.beta2 diff --git a/pom.xml b/pom.xml index 79b6b1b5..7b1b17a4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.dromara.daxpay daxpay - 3.0.0.beta1 + 3.0.0.beta2 pom dax-pay-single