build 3.0.0.beta1, fix pg数据库脚本

2026-08-05 21:05:52 +08:00 · 2024-12-05 20:45:18 +08:00
parent 65891ffc2f
commit 31b50869b2
33 changed files with 79 additions and 52 deletions
--- 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",
--- 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] 获取是否订阅消息通知类型查询范围错误问题

 ## 任务池
- [ ] 定时同步任务频次不要太高, 预防产生过多的数据
 - [ ] 退款支持以撤销的方式进行退款
 - [ ] 商户应用增加启停用状态
 - [ ] 商户应用应该要有一个类似删除的功能, 实现停用冻结, 但不影响数据的关联
--- a/bootx-platform/bootx-platform-common/common-cache/pom.xml
+++ b/bootx-platform/bootx-platform-common/common-cache/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-cache</artifactId>
--- a/bootx-platform/bootx-platform-common/common-config/pom.xml
+++ b/bootx-platform/bootx-platform-common/common-config/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-config</artifactId>
--- 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 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-exception-handler</artifactId>
--- 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 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-header-holder</artifactId>
--- a/bootx-platform/bootx-platform-common/common-jackson/pom.xml
+++ b/bootx-platform/bootx-platform-common/common-jackson/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-jackson</artifactId>
--- a/bootx-platform/bootx-platform-common/common-log/pom.xml
+++ b/bootx-platform/bootx-platform-common/common-log/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-log</artifactId>
--- 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 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-mybatis-plus</artifactId>
--- a/bootx-platform/bootx-platform-common/common-redis/pom.xml
+++ b/bootx-platform/bootx-platform-common/common-redis/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-redis</artifactId>
--- a/bootx-platform/bootx-platform-common/common-spring/pom.xml
+++ b/bootx-platform/bootx-platform-common/common-spring/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-spring</artifactId>
--- a/bootx-platform/bootx-platform-common/common-swagger/pom.xml
+++ b/bootx-platform/bootx-platform-common/common-swagger/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-common</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>common-swagger</artifactId>
--- a/bootx-platform/bootx-platform-common/pom.xml
+++ b/bootx-platform/bootx-platform-common/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/bootx-platform/bootx-platform-core/pom.xml
+++ b/bootx-platform/bootx-platform-core/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/bootx-platform/bootx-platform-service/pom.xml
+++ b/bootx-platform/bootx-platform-service/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>
    <modules>
        <module>service-baseapi</module>
--- a/bootx-platform/bootx-platform-service/service-baseapi/pom.xml
+++ b/bootx-platform/bootx-platform-service/service-baseapi/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-service</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>service-baseapi</artifactId>
--- a/bootx-platform/bootx-platform-service/service-iam/pom.xml
+++ b/bootx-platform/bootx-platform-service/service-iam/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-service</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>service-iam</artifactId>
--- a/bootx-platform/bootx-platform-starter/pom.xml
+++ b/bootx-platform/bootx-platform-starter/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>
    <modules>
        <module>starter-auth</module>
@@ -25,7 +25,7 @@
        <dependency>
            <groupId>cn.bootx.platform</groupId>
            <artifactId>bootx-platform-core</artifactId>
-            <version>3.0.0.beta1</version>
+            <version>3.0.0.beta2</version>
        </dependency>
        <!-- lombok -->
        <dependency>
--- 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 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-starter</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>starter-audit-log</artifactId>
--- a/bootx-platform/bootx-platform-starter/starter-auth/pom.xml
+++ b/bootx-platform/bootx-platform-starter/starter-auth/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-starter</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>starter-auth</artifactId>
--- 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 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-starter</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>starter-delay-queue</artifactId>
--- a/bootx-platform/bootx-platform-starter/starter-file/pom.xml
+++ b/bootx-platform/bootx-platform-starter/starter-file/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-starter</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>starter-file</artifactId>
--- a/bootx-platform/bootx-platform-starter/starter-quartz/pom.xml
+++ b/bootx-platform/bootx-platform-starter/starter-quartz/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>cn.bootx.platform</groupId>
        <artifactId>bootx-platform-starter</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>starter-quartz</artifactId>
--- a/bootx-platform/pom.xml
+++ b/bootx-platform/pom.xml
@@ -13,7 +13,7 @@

    <groupId>cn.bootx.platform</groupId>
    <artifactId>bootx-platform</artifactId>
-    <version>3.0.0.beta1</version>
+    <version>3.0.0.beta2</version>
    <packaging>pom</packaging>
    <description>基础脚手架服务</description>

@@ -25,7 +25,7 @@
    </modules>

    <properties>
-        <bootx-platform.version>3.0.0.beta1</bootx-platform.version>
+        <bootx-platform.version>3.0.0.beta2</bootx-platform.version>
        <!-- 再高的的新版本与会knife4j 4.5冲突 -->
        <springdoc.version>2.5.0</springdoc.version>
        <hutool.version>5.8.31</hutool.version>
--- a/daxpay-single-channel/daxpay-single-alipay/pom.xml
+++ b/daxpay-single-channel/daxpay-single-alipay/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.dromara.daxpay</groupId>
        <artifactId>daxpay-single-channel</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>daxpay-single-alipay</artifactId>
--- a/daxpay-single-channel/daxpay-single-union/pom.xml
+++ b/daxpay-single-channel/daxpay-single-union/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.dromara.daxpay</groupId>
        <artifactId>daxpay-single-channel</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>daxpay-single-union</artifactId>
--- a/daxpay-single-channel/daxpay-single-wechat/pom.xml
+++ b/daxpay-single-channel/daxpay-single-wechat/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.dromara.daxpay</groupId>
        <artifactId>daxpay-single-channel</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>daxpay-single-wechat</artifactId>
--- a/daxpay-single-channel/pom.xml
+++ b/daxpay-single-channel/pom.xml
@@ -13,7 +13,7 @@

    <groupId>org.dromara.daxpay</groupId>
    <artifactId>daxpay-single-channel</artifactId>
-    <version>3.0.0.beta1</version>
+    <version>3.0.0.beta2</version>
    <packaging>pom</packaging>
    <description>单商户支付通道功能实现</description>

@@ -35,8 +35,8 @@
        <autopoi.version>1.4.8</autopoi.version>
        <easypoi.version>4.5.0</easypoi.version>

-        <bootx-platform.version>3.0.0.beta1</bootx-platform.version>
-        <daxpay.version>3.0.0.beta1</daxpay.version>
+        <bootx-platform.version>3.0.0.beta2</bootx-platform.version>
+        <daxpay.version>3.0.0.beta2</daxpay.version>
    </properties>

    <dependencies>
@@ -67,7 +67,7 @@
        <dependency>
            <groupId>org.dromara.daxpay</groupId>
            <artifactId>daxpay-single-service</artifactId>
-            <version>3.0.0.beta1</version>
+            <version>3.0.0.beta2</version>
        </dependency>
    </dependencies>

--- a/daxpay-single/daxpay-single-core/pom.xml
+++ b/daxpay-single/daxpay-single-core/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.dromara.daxpay</groupId>
        <artifactId>daxpay-single</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>daxpay-single-core</artifactId>
--- a/daxpay-single/daxpay-single-service/pom.xml
+++ b/daxpay-single/daxpay-single-service/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.dromara.daxpay</groupId>
        <artifactId>daxpay-single</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>daxpay-single-service</artifactId>
--- a/daxpay-single/daxpay-single-unisdk/pom.xml
+++ b/daxpay-single/daxpay-single-unisdk/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.dromara.daxpay</groupId>
        <artifactId>daxpay-single</artifactId>
-        <version>3.0.0.beta1</version>
+        <version>3.0.0.beta2</version>
    </parent>

    <artifactId>daxpay-single-unisdk</artifactId>
--- a/daxpay-single/pom.xml
+++ b/daxpay-single/pom.xml
@@ -13,7 +13,7 @@

    <groupId>org.dromara.daxpay</groupId>
    <artifactId>daxpay-single</artifactId>
-    <version>3.0.0.beta1</version>
+    <version>3.0.0.beta2</version>
    <packaging>pom</packaging>
    <description>单商户支付核心功能实现</description>

@@ -33,8 +33,8 @@
        <lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
        <minio.version>8.5.2</minio.version>

-        <bootx-platform.version>3.0.0.beta1</bootx-platform.version>
-        <daxpay.version>3.0.0.beta1</daxpay.version>
+        <bootx-platform.version>3.0.0.beta2</bootx-platform.version>
+        <daxpay.version>3.0.0.beta2</daxpay.version>
    </properties>

    <dependencies>
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@

    <groupId>org.dromara.daxpay</groupId>
    <artifactId>daxpay</artifactId>
-    <version>3.0.0.beta1</version>
+    <version>3.0.0.beta2</version>
    <packaging>pom</packaging>

    <name>dax-pay-single</name>