diff --git a/mallinkAdmin/src/main/resources/db/migration/V2021112900001__dynamicId.sql b/mallinkAdmin/src/main/resources/db/migration/V2021112900001__dynamicId.sql index 102a1b9f3..c43b08290 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2021112900001__dynamicId.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2021112900001__dynamicId.sql @@ -19,4 +19,51 @@ CREATE TABLE `sys_config_value` ( `update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `UNIQUE_CONFIG_TENANT` (`config_item_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=ucs2; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=ucs2; + +insert into `sys_config`(`id`,`config_item_key`,`config_item_remark`,`create_date`,`update_date`,`status`) values +(1,'vierfySeconds','核销过期时间,秒','2021-11-29 17:53:23','2021-11-29 17:53:23',0); + +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(1,1,'60','789',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(2,1,'60','1003',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(3,1,'60','1008','1028','2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(4,1,'60','1009',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(5,1,'60','1010',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(6,1,'60','1012',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(7,1,'60','1013',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(8,1,'60','1019',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(9,1,'60','1020','1028','2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(10,1,'60','1021',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(11,1,'60','1022',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(12,1,'60','1023',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(13,1,'60','1024',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(14,1,'60','1025',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(15,1,'60','1026','1025','2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(16,1,'60','1027','1025','2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(17,1,'60','1028',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(18,1,'60','1035','1037','2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(19,1,'60','1036','1037','2021-11-29 17:54:07','2021-11-29 17:54:07'); +insert into `sys_config_value`(`id`,`config_item_id`,`config_item_value`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`) values +(20,1,'60','1037',NULL,'2021-11-29 17:54:07','2021-11-29 17:54:07'); + + + diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 74d5c3f5b..7673ad03b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -213,7 +213,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - SysConfig sysConfig = sysConfigService.getByKey(SysConfigConstant.handle_vierfy_seconds_key, getTenantInfo()); + SysConfig sysConfig = sysConfigService.getByKey(SysConfigConstant.vierfy_seconds_key, getTenantInfo()); if (null == sysConfig || StringUtils.isBlank(sysConfig.getConfigItemValue())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"系统设置[手动核销超时时间未配置]"); } diff --git a/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java b/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java index 0aaa241cd..72c7dbd86 100644 --- a/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java +++ b/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java @@ -2,6 +2,5 @@ package com.iformall.common; public class SysConfigConstant { - public static final String handle_vierfy_seconds_key="handleVierfySeconds"; - public static final String equiment_vierfy_seconds_key="equimentVierfySeconds"; + public static final String vierfy_seconds_key="vierfySeconds"; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index 978e466cd..0c3df95d8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -163,7 +163,6 @@ public class WxCouponOrderCVo extends WxCouponOrder { } - //public static final int expiredSeconds = 60; public static final String arg = "&"; public static String calcuteExpiredCouponOrderId(String couponOrderId,int expiredSeconds) { if (StringUtils.isBlank(couponOrderId)) {