From 17b502adebb47bf24a092a620595d73f4aa993d3 Mon Sep 17 00:00:00 2001 From: terrfly Date: Fri, 7 Jul 2023 14:51:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=20db=20=E5=88=9D=E5=A7=8B=E5=8C=96=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E6=94=B9=E4=B8=BA=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E7=82=B9=E5=90=8E3=E4=BD=8D=EF=BC=8C=20=E4=B8=8E=20ja?= =?UTF-8?q?va=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=E3=80=82=202.=20=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=AF=AB=E7=A7=92=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/sql/init.sql | 74 +++++++++---------- .../jeequan/jeepay/core/utils/DateKit.java | 3 +- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/docs/sql/init.sql b/docs/sql/init.sql index df04f49..dd2a769 100644 --- a/docs/sql/init.sql +++ b/docs/sql/init.sql @@ -16,8 +16,8 @@ CREATE TABLE `t_sys_entitlement` ( `pid` VARCHAR(32) NOT NULL COMMENT '父ID', `ent_sort` INT(11) NOT NULL DEFAULT 0 COMMENT '排序字段, 规则：正序', `sys_type` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`ent_id`, `sys_type`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统权限表'; @@ -28,7 +28,7 @@ CREATE TABLE `t_sys_role` ( `role_name` VARCHAR(32) NOT NULL COMMENT '角色名称', `sys_type` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心', `belong_info_id` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '所属商户ID / 0(平台)', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`role_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统角色表'; @@ -54,8 +54,8 @@ CREATE TABLE `t_sys_user` ( `state` TINYINT(6) NOT NULL DEFAULT 0 COMMENT '状态 0-停用 1-启用', `sys_type` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心', `belong_info_id` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '所属商户ID / 0(平台)', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`sys_user_id`), UNIQUE KEY(`sys_type`,`login_username`), UNIQUE KEY(`sys_type`,`telphone`), @@ -95,7 +95,7 @@ CREATE TABLE `t_sys_config` ( `config_val` TEXT NOT NULL COMMENT '配置内容项', `type` VARCHAR(20) NOT NULL DEFAULT 'text' COMMENT '类型: text-输入框, textarea-多行文本, uploadImg-上传图片, switch-开关', `sort_num` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '显示顺序', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`config_key`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统配置表'; @@ -112,7 +112,7 @@ CREATE TABLE `t_sys_log` ( `req_url` varchar(256) NOT NULL DEFAULT '' COMMENT '请求地址', `opt_req_param` TEXT DEFAULT NULL COMMENT '操作请求参数', `opt_res_info` TEXT DEFAULT NULL COMMENT '操作响应结果', - `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', PRIMARY KEY (`sys_log_id`) ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '系统操作日志表'; @@ -132,8 +132,8 @@ CREATE TABLE `t_mch_info` ( `init_user_id` BIGINT(20) DEFAULT NULL COMMENT '初始用户ID（创建商户时，允许商户登录的用户）', `created_uid` BIGINT(20) COMMENT '创建者用户ID', `created_by` VARCHAR(64) COMMENT '创建者姓名', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`mch_no`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商户信息表'; @@ -148,8 +148,8 @@ CREATE TABLE `t_mch_app` ( `remark` varchar(128) DEFAULT NULL COMMENT '备注', `created_uid` BIGINT(20) COMMENT '创建者用户ID', `created_by` VARCHAR(64) COMMENT '创建者姓名', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`app_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商户应用表'; @@ -166,8 +166,8 @@ CREATE TABLE `t_isv_info` ( `remark` VARCHAR(128) DEFAULT NULL COMMENT '备注', `created_uid` BIGINT(20) COMMENT '创建者用户ID', `created_by` VARCHAR(64) COMMENT '创建者姓名', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`isv_no`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务商信息表'; @@ -176,8 +176,8 @@ DROP TABLE IF EXISTS t_pay_way; CREATE TABLE `t_pay_way` ( `way_code` VARCHAR(20) NOT NULL COMMENT '支付方式代码 例如： wxpay_jsapi', `way_name` VARCHAR(20) NOT NULL COMMENT '支付方式名称', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`way_code`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付方式表'; @@ -197,8 +197,8 @@ CREATE TABLE `t_pay_interface_define` ( `bg_color` VARCHAR(20) DEFAULT NULL COMMENT '页面展示：卡片-背景色', `state` TINYINT(6) NOT NULL DEFAULT 1 COMMENT '状态: 0-停用, 1-启用', `remark` VARCHAR(128) DEFAULT NULL COMMENT '备注', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`if_code`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付接口定义表'; @@ -215,10 +215,10 @@ CREATE TABLE `t_pay_interface_config` ( `remark` VARCHAR(128) DEFAULT NULL COMMENT '备注', `created_uid` BIGINT(20) COMMENT '创建者用户ID', `created_by` VARCHAR(64) COMMENT '创建者姓名', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', `updated_uid` BIGINT(20) COMMENT '更新者用户ID', `updated_by` VARCHAR(64) COMMENT '更新者姓名', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`id`), UNIQUE KEY `Uni_InfoType_InfoId_IfCode` (`info_type`, `info_id`, `if_code`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付接口配置参数表'; @@ -235,8 +235,8 @@ CREATE TABLE `t_mch_pay_passage` ( `rate` DECIMAL(20,6) NOT NULL COMMENT '支付方式费率', `risk_config` JSON DEFAULT NULL COMMENT '风控数据', `state` TINYINT(6) NOT NULL COMMENT '状态: 0-停用, 1-启用', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`id`), UNIQUE KEY `Uni_AppId_WayCode` (`app_id`,`if_code`, `way_code`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商户支付通道表'; @@ -283,8 +283,8 @@ CREATE TABLE `t_pay_order` ( `return_url` VARCHAR(128) DEFAULT '' COMMENT '页面跳转地址', `expired_time` DATETIME DEFAULT NULL COMMENT '订单失效时间', `success_time` DATETIME DEFAULT NULL COMMENT '订单支付成功时间', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`pay_order_id`), UNIQUE KEY `Uni_MchNo_MchOrderNo` (`mch_no`, `mch_order_no`), INDEX(`created_at`) @@ -307,8 +307,8 @@ CREATE TABLE `t_mch_notify_record` ( `notify_count_limit` INT(11) NOT NULL DEFAULT '6' COMMENT '最大通知次数, 默认6次', `state` TINYINT(6) NOT NULL DEFAULT '1' COMMENT '通知状态,1-通知中,2-通知成功,3-通知失败', `last_notify_time` DATETIME DEFAULT NULL COMMENT '最后一次通知时间', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`notify_id`), UNIQUE KEY `Uni_OrderId_Type` (`order_id`, `order_type`) ) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8mb4 COMMENT='商户通知记录表'; @@ -327,8 +327,8 @@ CREATE TABLE `t_order_snapshot` ( `channel_req_time` DATETIME DEFAULT NULL COMMENT '向上游请求时间', `channel_resp_data` TEXT DEFAULT NULL COMMENT '上游响应数据', `channel_resp_time` DATETIME DEFAULT NULL COMMENT '上游响应时间', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`order_id`, `order_type`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='订单接口数据快照'; @@ -361,8 +361,8 @@ CREATE TABLE `t_refund_order` ( `ext_param` VARCHAR(64) DEFAULT NULL COMMENT '扩展参数', `success_time` DATETIME DEFAULT NULL COMMENT '订单退款成功时间', `expired_time` DATETIME DEFAULT NULL COMMENT '退款失效时间（失效后系统更改为退款任务关闭状态）', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`refund_order_id`), UNIQUE KEY `Uni_MchNo_MchRefundNo` (`mch_no`, `mch_refund_no`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='退款订单表'; @@ -395,8 +395,8 @@ CREATE TABLE `t_transfer_order` ( `ext_param` VARCHAR(128) DEFAULT NULL COMMENT '商户扩展参数', `notify_url` VARCHAR(128) NOT NULL default '' COMMENT '异步通知地址', `success_time` DATETIME DEFAULT NULL COMMENT '转账成功时间', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`transfer_id`), UNIQUE KEY `Uni_MchNo_MchOrderNo` (`mch_no`, `mch_order_no`), INDEX(`created_at`) @@ -411,8 +411,8 @@ CREATE TABLE `t_mch_division_receiver_group` ( `auto_division_flag` TINYINT(6) NOT NULL DEFAULT 0 COMMENT '自动分账组（当订单分账模式为自动分账，改组将完成分账逻辑） 0-否 1-是', `created_uid` BIGINT(20) NOT NULL COMMENT '创建者用户ID', `created_by` VARCHAR(64) NOT NULL COMMENT '创建者姓名', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`receiver_group_id`) ) ENGINE=InnoDB AUTO_INCREMENT=100001 DEFAULT CHARSET=utf8mb4 COMMENT='分账账号组'; @@ -437,8 +437,8 @@ CREATE TABLE `t_mch_division_receiver` ( `channel_bind_result` TEXT COMMENT '上游绑定返回信息，一般用作查询账号异常时的记录', `channel_ext_info` TEXT COMMENT '渠道特殊信息', `bind_success_time` DATETIME DEFAULT NULL COMMENT '绑定成功时间', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`receiver_id`) ) ENGINE=InnoDB AUTO_INCREMENT=800001 DEFAULT CHARSET=utf8mb4 COMMENT='商户分账接收者账号绑定关系表'; @@ -470,8 +470,8 @@ CREATE TABLE `t_pay_order_division_record` ( `relation_type_name` VARCHAR(30) NOT NULL COMMENT '账号快照》 当选择自定义时，需要录入该字段。 否则为对应的名称', `division_profit` DECIMAL(20,6) NOT NULL COMMENT '账号快照》 配置的实际分账比例', `cal_division_amount` BIGINT(20) NOT NULL COMMENT '计算该接收方的分账金额,单位分', - `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间', - `updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间', + `created_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', + `updated_at` TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (`record_id`) ) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8mb4 COMMENT='分账记录表'; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/DateKit.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/DateKit.java index 1186a58..b7d5402 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/DateKit.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/DateKit.java @@ -15,6 +15,7 @@ */ package com.jeequan.jeepay.core.utils; +import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.SystemClock; import com.jeequan.jeepay.core.exception.BizException; @@ -117,7 +118,7 @@ public class DateKit { time1 = DateUtil.parseDateTime("customDate".equals(dateType) ? (timeStr1 + " 00:00:00" ) : timeStr1); } if(StringUtils.isNotEmpty(timeStr2)){ - time2 = DateUtil.parseDateTime("customDate".equals(dateType) ? (timeStr2 + " 23:59:59" ) : timeStr2); + time2 = DateUtil.parse( ( "customDate".equals(dateType) ? (timeStr2 + " 23:59:59.999" ) : timeStr2 + ".999" ) , DatePattern.NORM_DATETIME_MS_FORMAT); } return new Date[]{time1, time2};