From 8e02044e4efe63a97f47b769b445f1a9631ecd24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 12 Aug 2025 13:00:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor(date):=20=E5=B0=86=20Date=20=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9B=BF=E6=8D=A2=E4=B8=BA=20LocalDateTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个实体类中将 Date 字段改为 LocalDateTime - 更新相关服务类中的日期处理方法，使用 LocalDateTime 替代 Date - 优化部分代码，利用 LocalDateTime 的特性进行日期运算 --- clean_duplicate_imports.sh | 41 ++++ final_verification.sh | 49 ++++ fix_dateutil_issues.sh | 53 +++++ .../bszx/controller/BszxPayController.java | 2 +- .../com/gxwebsoft/bszx/entity/BszxBm.java | 4 +- .../com/gxwebsoft/bszx/entity/BszxGrade.java | 2 +- .../com/gxwebsoft/bszx/entity/BszxPay.java | 4 +- .../gxwebsoft/bszx/entity/BszxPayRanking.java | 4 +- .../bszx/service/impl/BszxBmServiceImpl.java | 2 +- .../cms/controller/CmsWebsiteController.java | 7 +- .../java/com/gxwebsoft/cms/entity/CmsAd.java | 4 +- .../com/gxwebsoft/cms/entity/CmsAdRecord.java | 5 +- .../com/gxwebsoft/cms/entity/CmsArticle.java | 11 +- .../cms/entity/CmsArticleCategory.java | 7 +- .../cms/entity/CmsArticleComment.java | 7 +- .../cms/entity/CmsArticleContent.java | 5 +- .../gxwebsoft/cms/entity/CmsArticleCount.java | 5 +- .../gxwebsoft/cms/entity/CmsArticleLike.java | 5 +- .../com/gxwebsoft/cms/entity/CmsDesign.java | 5 +- .../gxwebsoft/cms/entity/CmsDesignRecord.java | 5 +- .../com/gxwebsoft/cms/entity/CmsDomain.java | 7 +- .../com/gxwebsoft/cms/entity/CmsForm.java | 5 +- .../gxwebsoft/cms/entity/CmsFormRecord.java | 5 +- .../com/gxwebsoft/cms/entity/CmsLang.java | 7 +- .../com/gxwebsoft/cms/entity/CmsLangLog.java | 5 +- .../com/gxwebsoft/cms/entity/CmsLink.java | 5 +- .../com/gxwebsoft/cms/entity/CmsModel.java | 7 +- .../gxwebsoft/cms/entity/CmsNavigation.java | 5 +- .../gxwebsoft/cms/entity/CmsStatistics.java | 5 +- .../com/gxwebsoft/cms/entity/CmsTemplate.java | 6 +- .../com/gxwebsoft/cms/entity/CmsWebsite.java | 8 +- .../gxwebsoft/cms/entity/CmsWebsiteField.java | 5 +- .../cms/entity/CmsWebsiteSetting.java | 6 +- .../cms/param/CmsArticleImportParam.java | 4 +- .../service/impl/CmsWebsiteServiceImpl.java | 21 +- .../core/service/CertificateService.java | 28 ++- .../common/core/utils/CacheClient.java | 1 - .../common/core/utils/RedisUtil.java | 1 - .../system/controller/CompanyController.java | 5 +- .../common/system/entity/Company.java | 10 +- .../common/system/entity/CompanyComment.java | 4 +- .../common/system/entity/CompanyContent.java | 4 +- .../common/system/entity/CompanyGit.java | 8 +- .../system/entity/CompanyParameter.java | 4 +- .../common/system/entity/CompanyUrl.java | 4 +- .../gxwebsoft/common/system/entity/Dict.java | 6 +- .../common/system/entity/DictData.java | 6 +- .../common/system/entity/Dictionary.java | 6 +- .../common/system/entity/DictionaryData.java | 6 +- .../common/system/entity/EmailRecord.java | 6 +- .../common/system/entity/FileRecord.java | 6 +- .../common/system/entity/KVEntity.java | 2 +- .../common/system/entity/LoginRecord.java | 6 +- .../gxwebsoft/common/system/entity/Menu.java | 6 +- .../common/system/entity/OperationRecord.java | 6 +- .../common/system/entity/Organization.java | 6 +- .../common/system/entity/Payment.java | 6 +- .../gxwebsoft/common/system/entity/Plug.java | 6 +- .../gxwebsoft/common/system/entity/Role.java | 6 +- .../common/system/entity/RoleMenu.java | 6 +- .../common/system/entity/Setting.java | 6 +- .../common/system/entity/Tenant.java | 6 +- .../gxwebsoft/common/system/entity/User.java | 11 +- .../common/system/entity/UserBalanceLog.java | 6 +- .../common/system/entity/UserCollection.java | 4 +- .../common/system/entity/UserFile.java | 6 +- .../common/system/entity/UserInfo.java | 11 +- .../common/system/entity/UserReferee.java | 6 +- .../common/system/entity/UserRole.java | 6 +- .../common/system/param/UserParam.java | 4 +- .../java/com/gxwebsoft/docs/entity/Docs.java | 4 +- .../gxwebsoft/docs/entity/DocsContent.java | 6 +- .../com/gxwebsoft/docs/entity/DocsUser.java | 4 +- .../controller/HjmViolationController.java | 2 +- .../WxNotificationTestController.java | 2 +- .../java/com/gxwebsoft/hjm/entity/Gps.java | 2 +- .../com/gxwebsoft/hjm/entity/HjmBxLog.java | 5 +- .../java/com/gxwebsoft/hjm/entity/HjmCar.java | 6 +- .../com/gxwebsoft/hjm/entity/HjmChoices.java | 6 +- .../com/gxwebsoft/hjm/entity/HjmCourses.java | 6 +- .../com/gxwebsoft/hjm/entity/HjmExamLog.java | 6 +- .../com/gxwebsoft/hjm/entity/HjmFence.java | 6 +- .../com/gxwebsoft/hjm/entity/HjmGpsLog.java | 3 +- .../gxwebsoft/hjm/entity/HjmQuestions.java | 6 +- .../gxwebsoft/hjm/entity/HjmViolation.java | 6 +- .../service/impl/HjmViolationServiceImpl.java | 2 +- .../controller/HouseTestDataController.java | 2 +- .../gxwebsoft/house/entity/HouseFiles.java | 2 +- .../com/gxwebsoft/house/entity/HouseInfo.java | 8 +- .../gxwebsoft/house/entity/HouseLikeLog.java | 6 +- .../house/entity/HouseReservation.java | 10 +- .../com/gxwebsoft/house/entity/HouseUser.java | 8 +- .../gxwebsoft/house/entity/HouseViewsLog.java | 6 +- .../oa/controller/OaAssetsSslController.java | 2 +- .../java/com/gxwebsoft/oa/entity/OaApp.java | 9 +- .../com/gxwebsoft/oa/entity/OaAppField.java | 4 +- .../com/gxwebsoft/oa/entity/OaAppRenew.java | 8 +- .../com/gxwebsoft/oa/entity/OaAppUrl.java | 4 +- .../com/gxwebsoft/oa/entity/OaAppUser.java | 4 +- .../com/gxwebsoft/oa/entity/OaAssets.java | 10 +- .../com/gxwebsoft/oa/entity/OaAssetsCode.java | 6 +- .../gxwebsoft/oa/entity/OaAssetsDomain.java | 10 +- .../gxwebsoft/oa/entity/OaAssetsEmail.java | 10 +- .../gxwebsoft/oa/entity/OaAssetsMysql.java | 11 +- .../gxwebsoft/oa/entity/OaAssetsServer.java | 10 +- .../com/gxwebsoft/oa/entity/OaAssetsSite.java | 8 +- .../oa/entity/OaAssetsSoftwareCert.java | 11 +- .../com/gxwebsoft/oa/entity/OaAssetsSsl.java | 11 +- .../oa/entity/OaAssetsTrademark.java | 11 +- .../com/gxwebsoft/oa/entity/OaAssetsUser.java | 4 +- .../gxwebsoft/oa/entity/OaAssetsVhost.java | 10 +- .../com/gxwebsoft/oa/entity/OaCompany.java | 10 +- .../gxwebsoft/oa/entity/OaCompanyField.java | 4 +- .../gxwebsoft/oa/entity/OaCompanyUser.java | 4 +- .../java/com/gxwebsoft/oa/entity/OaLink.java | 4 +- .../com/gxwebsoft/oa/entity/OaProduct.java | 6 +- .../gxwebsoft/oa/entity/OaProductTabs.java | 6 +- .../java/com/gxwebsoft/oa/entity/OaTask.java | 6 +- .../com/gxwebsoft/oa/entity/OaTaskCount.java | 6 +- .../com/gxwebsoft/oa/entity/OaTaskUser.java | 4 +- .../service/impl/OaAssetsSslServiceImpl.java | 8 +- .../controller/ProjectRenewController.java | 4 +- .../com/gxwebsoft/project/entity/Project.java | 8 +- .../project/entity/ProjectCollection.java | 4 +- .../project/entity/ProjectField.java | 6 +- .../project/entity/ProjectRenew.java | 10 +- .../gxwebsoft/project/entity/ProjectUrl.java | 4 +- .../gxwebsoft/project/entity/ProjectUser.java | 4 +- .../service/impl/ProjectServiceImpl.java | 11 +- .../com/gxwebsoft/pwl/entity/PwlProject.java | 6 +- .../pwl/param/PwlProjectImportParam.java | 2 +- .../shop/controller/ShopOrderController.java | 4 +- .../controller/ShopUserCouponController.java | 1 - .../com/gxwebsoft/shop/entity/ShopBrand.java | 4 +- .../com/gxwebsoft/shop/entity/ShopCart.java | 6 +- .../shop/entity/ShopChatConversation.java | 6 +- .../shop/entity/ShopChatMessage.java | 6 +- .../com/gxwebsoft/shop/entity/ShopCount.java | 4 +- .../com/gxwebsoft/shop/entity/ShopCoupon.java | 5 +- .../shop/entity/ShopDealerOrder.java | 5 +- .../shop/entity/ShopGoodsComment.java | 6 +- .../shop/entity/ShopGoodsIncomeConfig.java | 6 +- .../gxwebsoft/shop/entity/ShopGoodsLog.java | 6 +- .../shop/entity/ShopGoodsRelation.java | 6 +- .../shop/entity/ShopMerchantAccount.java | 4 +- .../shop/entity/ShopMerchantApply.java | 6 +- .../shop/entity/ShopMerchantType.java | 4 +- .../com/gxwebsoft/shop/entity/ShopOrder.java | 16 +- .../shop/entity/ShopOrderDelivery.java | 6 +- .../shop/entity/ShopOrderDeliveryGoods.java | 6 +- .../shop/entity/ShopOrderExtract.java | 6 +- .../gxwebsoft/shop/entity/ShopOrderGoods.java | 8 +- .../gxwebsoft/shop/entity/ShopOrderInfo.java | 8 +- .../shop/entity/ShopOrderInfoLog.java | 4 +- .../shop/entity/ShopRechargeOrder.java | 6 +- .../com/gxwebsoft/shop/entity/ShopSplash.java | 6 +- .../shop/entity/ShopUserAddress.java | 4 +- .../shop/entity/ShopUserBalanceLog.java | 6 +- .../shop/entity/ShopUserCollection.java | 4 +- .../shop/enums/OrderStatusEnum.class | Bin 0 -> 2066 bytes .../service/impl/ShopOrderServiceImpl.java | 2 +- update_datetime_fields.sh | 27 +++ verify_datetime_compatibility.sh | 70 ++++++ verify_expiration_time_fixes.sh | 85 +++++++ 时间格式统一修改报告.md | 125 ++++++++++ 证书服务修复验证.md | 214 ++++++++++++++++++ 166 files changed, 1123 insertions(+), 482 deletions(-) create mode 100755 clean_duplicate_imports.sh create mode 100755 final_verification.sh create mode 100755 fix_dateutil_issues.sh create mode 100644 src/main/java/com/gxwebsoft/shop/enums/OrderStatusEnum.class create mode 100755 update_datetime_fields.sh create mode 100755 verify_datetime_compatibility.sh create mode 100755 verify_expiration_time_fixes.sh create mode 100644 时间格式统一修改报告.md create mode 100644 证书服务修复验证.md diff --git a/clean_duplicate_imports.sh b/clean_duplicate_imports.sh new file mode 100755 index 0000000..e702ee5 --- /dev/null +++ b/clean_duplicate_imports.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +# 清理重复的LocalDateTime导入 + +echo "开始清理重复的LocalDateTime导入..." + +# 获取所有包含重复LocalDateTime导入的Java文件 +files=$(find src/main/java -name "*.java" -exec grep -l "import java.time.LocalDateTime" {} \;) + +for file in $files; do + echo "检查文件: $file" + + # 检查是否有重复的LocalDateTime导入 + count=$(grep -c "import java.time.LocalDateTime" "$file") + + if [ "$count" -gt 1 ]; then + echo "发现重复导入，正在修复: $file" + + # 创建临时文件 + temp_file=$(mktemp) + + # 移除重复的LocalDateTime导入，只保留第一个 + awk ' + /import java\.time\.LocalDateTime/ { + if (!seen) { + print + seen = 1 + } + next + } + { print } + ' "$file" > "$temp_file" + + # 替换原文件 + mv "$temp_file" "$file" + + echo "修复完成: $file" + fi +done + +echo "清理重复导入完成！" diff --git a/final_verification.sh b/final_verification.sh new file mode 100755 index 0000000..ec7b9ae --- /dev/null +++ b/final_verification.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +echo "=== 时间格式统一修复最终验证 ===" +echo + +echo "1. 检查是否还有实体类使用Date类型的字段..." +echo "查找 'private Date' 字段：" +find src/main/java -name "*.java" -path "*/entity/*" -exec grep -Hn "private Date " {} \; | head -10 + +echo +echo "2. 检查是否还有重复的LocalDateTime导入..." +echo "查找重复导入：" +find src/main/java -name "*.java" -exec sh -c 'count=$(grep -c "import java.time.LocalDateTime" "$1"); if [ "$count" -gt 1 ]; then echo "$1: $count 次导入"; fi' _ {} \; + +echo +echo "3. 检查工具类中合理的Date使用..." +echo "工具类中的Date使用（这些是合理的）：" +find src/main/java -name "*Util.java" -o -name "*Utils.java" -o -name "*Helper.java" | xargs grep -l "Date" | head -5 + +echo +echo "4. 检查证书相关类的修复状态..." +echo "证书服务类：" +if grep -q "convertToLocalDateTime" src/main/java/com/gxwebsoft/common/core/service/CertificateService.java; then + echo "✅ CertificateService.java - 已修复" +else + echo "❌ CertificateService.java - 需要检查" +fi + +echo +echo "5. 检查JWT工具类..." +if grep -q "import java.util.Date" src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java; then + echo "✅ JwtUtil.java - 正确使用Date" +else + echo "❌ JwtUtil.java - 需要检查" +fi + +echo +echo "6. 统计修复结果..." +echo "实体类总数：" +find src/main/java -name "*.java" -path "*/entity/*" | wc -l + +echo "使用LocalDateTime的实体类数：" +find src/main/java -name "*.java" -path "*/entity/*" -exec grep -l "LocalDateTime" {} \; | wc -l + +echo "使用Date的实体类数：" +find src/main/java -name "*.java" -path "*/entity/*" -exec grep -l "import java.util.Date" {} \; | wc -l + +echo +echo "=== 验证完成 ===" diff --git a/fix_dateutil_issues.sh b/fix_dateutil_issues.sh new file mode 100755 index 0000000..8388738 --- /dev/null +++ b/fix_dateutil_issues.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +echo "=== 修复DateUtil与LocalDateTime的兼容性问题 ===" +echo + +# 查找所有使用DateUtil.date()的文件 +files=$(find src/main/java -name "*.java" -exec grep -l "DateUtil.date()" {} \;) + +echo "发现以下文件使用了DateUtil.date()：" +for file in $files; do + echo " - $file" +done + +echo +echo "开始修复..." + +for file in $files; do + echo "处理文件: $file" + + # 检查文件是否导入了LocalDateTime + if grep -q "import java.time.LocalDateTime" "$file"; then + echo " 发现LocalDateTime导入，检查是否需要修复..." + + # 查找可能的问题模式 + if grep -q "\.set.*Time(DateUtil\.date())" "$file"; then + echo " 发现setXxxTime(DateUtil.date())模式，需要修复" + # 替换setXxxTime(DateUtil.date())为setXxxTime(LocalDateTime.now()) + sed -i '' 's/\.set\([^(]*Time\)(DateUtil\.date())/\.set\1(LocalDateTime.now())/g' "$file" + echo " ✅ 已修复setXxxTime方法调用" + fi + + if grep -q "\.compareTo(DateUtil\.date())" "$file"; then + echo " 发现compareTo(DateUtil.date())模式，需要手动检查" + echo " ⚠️ 请手动检查此文件中的compareTo调用" + fi + + if grep -q "DateUtil\.offsetDay.*\.compareTo(DateUtil\.date())" "$file"; then + echo " 发现复杂的日期比较模式，需要手动修复" + echo " ⚠️ 请手动检查此文件中的日期比较逻辑" + fi + else + echo " 未发现LocalDateTime导入，可能是合理的Date使用" + fi + + echo +done + +echo "=== 修复完成 ===" +echo +echo "请注意：" +echo "1. 自动修复了简单的setXxxTime(DateUtil.date())调用" +echo "2. 复杂的日期比较逻辑需要手动检查和修复" +echo "3. 建议运行测试确保修复正确" diff --git a/src/main/java/com/gxwebsoft/bszx/controller/BszxPayController.java b/src/main/java/com/gxwebsoft/bszx/controller/BszxPayController.java index 7e8d9c7..15c824e 100644 --- a/src/main/java/com/gxwebsoft/bszx/controller/BszxPayController.java +++ b/src/main/java/com/gxwebsoft/bszx/controller/BszxPayController.java @@ -293,7 +293,7 @@ public class BszxPayController extends BaseController { order.setPayStatus(true); order.setTransactionId(transactionId); order.setPayPrice(new BigDecimal(NumberUtil.decimalFormat("0.00", total * 0.01))); - order.setExpirationTime(DateUtil.offset(DateUtil.date(), DateField.YEAR, 10)); + order.setExpirationTime(LocalDateTime.now().plusYears(10)); System.out.println("实际付款金额 = " + order.getPayPrice()); return "SUCCESS"; } diff --git a/src/main/java/com/gxwebsoft/bszx/entity/BszxBm.java b/src/main/java/com/gxwebsoft/bszx/entity/BszxBm.java index 8179b6a..d22ec71 100644 --- a/src/main/java/com/gxwebsoft/bszx/entity/BszxBm.java +++ b/src/main/java/com/gxwebsoft/bszx/entity/BszxBm.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import com.gxwebsoft.cms.entity.CmsArticle; import io.swagger.v3.oas.annotations.media.Schema; @@ -133,7 +133,7 @@ public class BszxBm implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "文章对象") @TableField(exist = false) diff --git a/src/main/java/com/gxwebsoft/bszx/entity/BszxGrade.java b/src/main/java/com/gxwebsoft/bszx/entity/BszxGrade.java index 7563ad3..6eacb08 100644 --- a/src/main/java/com/gxwebsoft/bszx/entity/BszxGrade.java +++ b/src/main/java/com/gxwebsoft/bszx/entity/BszxGrade.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/gxwebsoft/bszx/entity/BszxPay.java b/src/main/java/com/gxwebsoft/bszx/entity/BszxPay.java index 2dd778f..73242b8 100644 --- a/src/main/java/com/gxwebsoft/bszx/entity/BszxPay.java +++ b/src/main/java/com/gxwebsoft/bszx/entity/BszxPay.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import com.gxwebsoft.cms.entity.CmsArticle; import com.gxwebsoft.shop.entity.ShopOrder; @@ -124,7 +124,7 @@ public class BszxPay implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "文章") @TableField(exist = false) diff --git a/src/main/java/com/gxwebsoft/bszx/entity/BszxPayRanking.java b/src/main/java/com/gxwebsoft/bszx/entity/BszxPayRanking.java index 659c860..ca3f373 100644 --- a/src/main/java/com/gxwebsoft/bszx/entity/BszxPayRanking.java +++ b/src/main/java/com/gxwebsoft/bszx/entity/BszxPayRanking.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -60,6 +60,6 @@ public class BszxPayRanking implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/bszx/service/impl/BszxBmServiceImpl.java b/src/main/java/com/gxwebsoft/bszx/service/impl/BszxBmServiceImpl.java index c52f9a0..e739f63 100644 --- a/src/main/java/com/gxwebsoft/bszx/service/impl/BszxBmServiceImpl.java +++ b/src/main/java/com/gxwebsoft/bszx/service/impl/BszxBmServiceImpl.java @@ -32,7 +32,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; /** diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java index 6e7700b..3e6600b 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java @@ -216,12 +216,13 @@ public class CmsWebsiteController extends BaseController { HashMap serverTime = buildServerTime(); website.setServerTime(serverTime); + LocalDateTime now = LocalDateTime.now(); // 即将过期(一周内过期的) - website.setSoon(DateUtil.offsetDay(website.getExpirationTime(), -30).compareTo(DateUtil.date())); + website.setSoon(website.getExpirationTime().minusDays(30).compareTo(now)); // 是否过期 -1已过期 大于0 未过期 - website.setExpired(website.getExpirationTime().compareTo(DateUtil.date())); + website.setExpired(website.getExpirationTime().compareTo(now)); // 剩余天数 - website.setExpiredDays(DateUtil.betweenDay(website.getExpirationTime(), DateUtil.date(), false)); + website.setExpiredDays((int) java.time.temporal.ChronoUnit.DAYS.between(now, website.getExpirationTime())); redisUtil.set(key, website, 1L, TimeUnit.DAYS); return success(website); diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsAd.java b/src/main/java/com/gxwebsoft/cms/entity/CmsAd.java index 5d6aaa5..5d258e7 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsAd.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsAd.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.List; @@ -94,7 +94,7 @@ public class CmsAd implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; public JSONArray getImageList() { return JSON.parseArray(this.images); diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsAdRecord.java b/src/main/java/com/gxwebsoft/cms/entity/CmsAdRecord.java index 31a541a..7cd90a8 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsAdRecord.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsAdRecord.java @@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -52,6 +51,6 @@ public class CmsAdRecord implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java index bd5d9d5..c33827c 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java @@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -87,10 +86,10 @@ public class CmsArticle implements Serializable { private BigDecimal price; @Schema(description = "开始时间") - private Date startTime; + private LocalDateTime startTime; @Schema(description = "到期时间") - private Date endTime; + private LocalDateTime endTime; @Schema(description = "来源") private String source; @@ -226,10 +225,10 @@ public class CmsArticle implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; @Schema(description = "是否更新") @TableField(exist = false) diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCategory.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCategory.java index aee4a5a..9c5a0b9 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCategory.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCategory.java @@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -84,9 +83,9 @@ public class CmsArticleCategory implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleComment.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleComment.java index b5c7cf2..de82fa2 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleComment.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleComment.java @@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -69,9 +68,9 @@ public class CmsArticleComment implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleContent.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleContent.java index fc9de9f..b0105f7 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleContent.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleContent.java @@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -36,6 +35,6 @@ public class CmsArticleContent implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCount.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCount.java index 2f44b54..bf49ca0 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCount.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCount.java @@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -37,6 +36,6 @@ public class CmsArticleCount implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleLike.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleLike.java index 2f88528..7e375d8 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleLike.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleLike.java @@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -37,6 +36,6 @@ public class CmsArticleLike implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java index a562ef1..ceffe63 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java @@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -117,6 +116,6 @@ public class CmsDesign implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDesignRecord.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDesignRecord.java index 9aeb8f4..f76cf1f 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsDesignRecord.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDesignRecord.java @@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -70,6 +69,6 @@ public class CmsDesignRecord implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDomain.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDomain.java index b607a04..6a5d726 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsDomain.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDomain.java @@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -63,9 +62,9 @@ public class CmsDomain implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsForm.java b/src/main/java/com/gxwebsoft/cms/entity/CmsForm.java index 2e01083..cfbfcd6 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsForm.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsForm.java @@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -85,6 +84,6 @@ public class CmsForm implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsFormRecord.java b/src/main/java/com/gxwebsoft/cms/entity/CmsFormRecord.java index 59e5166..0be6187 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsFormRecord.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsFormRecord.java @@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -63,6 +62,6 @@ public class CmsFormRecord implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsLang.java b/src/main/java/com/gxwebsoft/cms/entity/CmsLang.java index c023797..773eda9 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsLang.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsLang.java @@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -51,9 +50,9 @@ public class CmsLang implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsLangLog.java b/src/main/java/com/gxwebsoft/cms/entity/CmsLangLog.java index df96e3d..c5196f9 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsLangLog.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsLangLog.java @@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -40,6 +39,6 @@ public class CmsLangLog implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsLink.java b/src/main/java/com/gxwebsoft/cms/entity/CmsLink.java index b996595..ed2544d 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsLink.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsLink.java @@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -70,7 +69,7 @@ public class CmsLink implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "栏目名称") @TableField(exist = false) diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsModel.java b/src/main/java/com/gxwebsoft/cms/entity/CmsModel.java index 84ce47c..77ee550 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsModel.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsModel.java @@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -87,9 +86,9 @@ public class CmsModel implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java b/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java index a09ad56..44ba89d 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java @@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import java.util.List; import io.swagger.v3.oas.annotations.media.Schema; @@ -169,7 +168,7 @@ public class CmsNavigation implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "页面名称") diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsStatistics.java b/src/main/java/com/gxwebsoft/cms/entity/CmsStatistics.java index 78079a3..c31c785 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsStatistics.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsStatistics.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -116,9 +115,9 @@ public class CmsStatistics implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsTemplate.java b/src/main/java/com/gxwebsoft/cms/entity/CmsTemplate.java index e006705..6c2df08 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsTemplate.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsTemplate.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -87,9 +87,9 @@ public class CmsTemplate implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsite.java b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsite.java index db03298..02309c7 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsite.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsite.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.HashMap; @@ -85,7 +85,7 @@ public class CmsWebsite implements Serializable { private Integer version; @Schema(description = "服务到期时间") - private Date expirationTime; + private LocalDateTime expirationTime; @Schema(description = "是否到期") @TableField(exist = false) @@ -243,10 +243,10 @@ public class CmsWebsite implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; @Schema(description = "预设字段") @TableField(exist = false) diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteField.java b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteField.java index 568747b..807b605 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteField.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteField.java @@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -66,6 +65,6 @@ public class CmsWebsiteField implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteSetting.java b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteSetting.java index 836ba8d..2e46d0e 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteSetting.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteSetting.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -78,9 +78,9 @@ public class CmsWebsiteSetting implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsArticleImportParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsArticleImportParam.java index 27852f7..d39650f 100644 --- a/src/main/java/com/gxwebsoft/cms/param/CmsArticleImportParam.java +++ b/src/main/java/com/gxwebsoft/cms/param/CmsArticleImportParam.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 用户导入参数 @@ -55,7 +55,7 @@ public class CmsArticleImportParam implements Serializable { private String author; @Excel(name = "发布时间") - private Date createTime; + private LocalDateTime createTime; @Excel(name = "类型") private Integer type; diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java index dee3ade..d52ac48 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java @@ -1,9 +1,6 @@ package com.gxwebsoft.cms.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.cms.entity.*; import com.gxwebsoft.cms.mapper.*; @@ -11,20 +8,16 @@ import com.gxwebsoft.cms.param.*; import com.gxwebsoft.cms.service.*; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Company; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.service.CompanyService; import com.gxwebsoft.common.system.service.UserService; -import com.gxwebsoft.oa.service.OaCompanyService; import com.gxwebsoft.project.entity.Project; import com.gxwebsoft.project.service.ProjectService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; /** * 网站信息记录表Service实现 @@ -79,10 +72,11 @@ public class CmsWebsiteServiceImpl extends ServiceImpl list = baseMapper.selectPageRel(page, param); list.forEach(d -> { + LocalDateTime now = LocalDateTime.now(); // 即将过期(一周内过期的) - d.setSoon(DateUtil.offsetDay(d.getExpirationTime(), -30).compareTo(DateUtil.date())); + d.setSoon(d.getExpirationTime().minusDays(30).compareTo(now)); // 是否过期 -1已过期 大于0 未过期 - d.setStatus(d.getExpirationTime().compareTo(DateUtil.date())); + d.setStatus(d.getExpirationTime().compareTo(now)); }); return new PageResult<>(list, page.getTotal()); } @@ -109,10 +103,11 @@ public class CmsWebsiteServiceImpl extends ServiceImpl list = baseMapper.selectPageRelAll(page, param); list.forEach(d -> { + LocalDateTime now = LocalDateTime.now(); // 即将过期(一周内过期的) - d.setSoon(DateUtil.offsetDay(d.getExpirationTime(), -30).compareTo(DateUtil.date())); + d.setSoon(d.getExpirationTime().minusDays(30).compareTo(now)); // 是否过期 -1已过期 大于0 未过期 - d.setStatus(d.getExpirationTime().compareTo(DateUtil.date())); + d.setStatus(d.getExpirationTime().compareTo(now)); }); return new PageResult<>(list, page.getTotal()); } @@ -130,7 +125,7 @@ public class CmsWebsiteServiceImpl extends ServiceImpl list = baseMapper.selectPageRel(page, param); list.forEach(d -> { + LocalDateTime now = LocalDateTime.now(); // 即将过期(一周内过期的) - d.setSoon(DateUtil.offsetDay(d.getEndTime(), -7).compareTo(DateUtil.date())); + d.setSoon(d.getEndTime().minusDays(7).compareTo(now)); // 是否过期 -1已过期 大于0 未过期 - d.setStatus(d.getEndTime().compareTo(DateUtil.date())); + d.setStatus(d.getEndTime().compareTo(now)); }); return new PageResult<>(list, page.getTotal()); } diff --git a/src/main/java/com/gxwebsoft/project/controller/ProjectRenewController.java b/src/main/java/com/gxwebsoft/project/controller/ProjectRenewController.java index b8910c6..acd7fe0 100644 --- a/src/main/java/com/gxwebsoft/project/controller/ProjectRenewController.java +++ b/src/main/java/com/gxwebsoft/project/controller/ProjectRenewController.java @@ -107,10 +107,10 @@ public class ProjectRenewController extends BaseController { final Project project = projectService.getOne(new LambdaQueryWrapper().eq(Project::getAppId, renew.getAppId())); if (renew.getDays() > 0) { // 按天续费 - project.setExpirationTime(DateUtil.offset(project.getExpirationTime(), DateField.DAY_OF_YEAR, -renew.getDays())); + project.setExpirationTime(project.getExpirationTime().minusDays(renew.getDays())); } else { // 按年续费 - project.setExpirationTime(DateUtil.offset(project.getExpirationTime(), DateField.MONTH, -12 * renew.getDuration())); + project.setExpirationTime(project.getExpirationTime().minusMonths(12 * renew.getDuration())); // 回退上一年的续费金额 final List renews = projectRenewService.list(new LambdaQueryWrapper().eq(ProjectRenew::getAppId, renew.getAppId()).orderByDesc(ProjectRenew::getAppRenewId).last("limit 2")); if(renews.size() > 1){ diff --git a/src/main/java/com/gxwebsoft/project/entity/Project.java b/src/main/java/com/gxwebsoft/project/entity/Project.java index d90e043..3a50f79 100644 --- a/src/main/java/com/gxwebsoft/project/entity/Project.java +++ b/src/main/java/com/gxwebsoft/project/entity/Project.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; import java.util.Set; @@ -201,7 +201,7 @@ public class Project implements Serializable { private Integer recommend; @Schema(description = "到期时间") - private Date expirationTime; + private LocalDateTime expirationTime; @Schema(description = "所属年份") private Integer year; @@ -267,10 +267,10 @@ public class Project implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; @Schema(description = "是否收藏") @TableField(exist = false) diff --git a/src/main/java/com/gxwebsoft/project/entity/ProjectCollection.java b/src/main/java/com/gxwebsoft/project/entity/ProjectCollection.java index a89e0d0..001b534 100644 --- a/src/main/java/com/gxwebsoft/project/entity/ProjectCollection.java +++ b/src/main/java/com/gxwebsoft/project/entity/ProjectCollection.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -37,6 +37,6 @@ public class ProjectCollection implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/project/entity/ProjectField.java b/src/main/java/com/gxwebsoft/project/entity/ProjectField.java index 5dbb298..12370f7 100644 --- a/src/main/java/com/gxwebsoft/project/entity/ProjectField.java +++ b/src/main/java/com/gxwebsoft/project/entity/ProjectField.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -72,9 +72,9 @@ public class ProjectField implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/project/entity/ProjectRenew.java b/src/main/java/com/gxwebsoft/project/entity/ProjectRenew.java index cdf6228..d7e81dd 100644 --- a/src/main/java/com/gxwebsoft/project/entity/ProjectRenew.java +++ b/src/main/java/com/gxwebsoft/project/entity/ProjectRenew.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import io.swagger.v3.oas.annotations.media.Schema; @@ -72,14 +72,14 @@ public class ProjectRenew implements Serializable { private String comments; @Schema(description = "开始时间") - private Date startTime; + private LocalDateTime startTime; @Schema(description = "到期时间") - private Date endTime; + private LocalDateTime endTime; @Schema(description = "到期时间") @TableField(exist = false) - private Date expirationTime; + private LocalDateTime expirationTime; @Schema(description = "状态, 0正常, 1 即将过期") private Integer soon; @@ -117,6 +117,6 @@ public class ProjectRenew implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/project/entity/ProjectUrl.java b/src/main/java/com/gxwebsoft/project/entity/ProjectUrl.java index 712ca30..f51d1da 100644 --- a/src/main/java/com/gxwebsoft/project/entity/ProjectUrl.java +++ b/src/main/java/com/gxwebsoft/project/entity/ProjectUrl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -52,7 +52,7 @@ public class ProjectUrl implements Serializable { private Integer status; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "租户id") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/project/entity/ProjectUser.java b/src/main/java/com/gxwebsoft/project/entity/ProjectUser.java index ca38708..1167d44 100644 --- a/src/main/java/com/gxwebsoft/project/entity/ProjectUser.java +++ b/src/main/java/com/gxwebsoft/project/entity/ProjectUser.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.Set; import io.swagger.v3.oas.annotations.media.Schema; @@ -51,6 +51,6 @@ public class ProjectUser implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/gxwebsoft/project/service/impl/ProjectServiceImpl.java index 6ab3841..565dac1 100644 --- a/src/main/java/com/gxwebsoft/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/gxwebsoft/project/service/impl/ProjectServiceImpl.java @@ -200,10 +200,10 @@ public class ProjectServiceImpl extends ServiceImpl impl if(project.getExpirationTime() != null){ if (projectRenew.getDays() != null) { // 按天续费 - project.setExpirationTime(DateUtil.offset(project.getExpirationTime(), DateField.DAY_OF_YEAR, projectRenew.getDays())); + project.setExpirationTime(project.getExpirationTime().plusDays(projectRenew.getDays())); } else { // 按年续费 - project.setExpirationTime(DateUtil.offset(project.getExpirationTime(), DateField.MONTH, 12 * projectRenew.getDuration().intValue())); + project.setExpirationTime(project.getExpirationTime().plusMonths(12 * projectRenew.getDuration().intValue())); // 更新下一年的续费金额 project.setRenewMoney(projectRenew.getPayPrice()); project.setShowExpiration(true); @@ -251,12 +251,13 @@ public class ProjectServiceImpl extends ServiceImpl impl } // 应用成员 d.setProjectUsers(projectUserService.list(new LambdaQueryWrapper().eq(ProjectUser::getAppId, d.getAppId()))); + LocalDateTime now = LocalDateTime.now(); // 即将过期(30天内过期的) - d.setSoon(DateUtil.offsetDay(d.getExpirationTime(), -30).compareTo(DateUtil.date())); + d.setSoon(d.getExpirationTime().minusDays(30).compareTo(now)); // 是否过期 -1已过期 大于0 未过期 - d.setExpired(d.getExpirationTime().compareTo(DateUtil.date())); + d.setExpired(d.getExpirationTime().compareTo(now)); // 剩余天数 - d.setExpiredDays(DateUtil.betweenDay(d.getExpirationTime(), DateUtil.date(), false)); + d.setExpiredDays((int) java.time.temporal.ChronoUnit.DAYS.between(now, d.getExpirationTime())); // 续费次数 d.setRenewCount((long) projectRenewService.count(new LambdaQueryWrapper().eq(ProjectRenew::getAppId, d.getAppId()).eq(ProjectRenew::getDeleted, 0))); }); diff --git a/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java b/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java index cc2abe1..43b0a72 100644 --- a/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java +++ b/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import com.gxwebsoft.common.core.utils.JSONUtil; import io.swagger.v3.oas.annotations.media.Schema; @@ -174,10 +174,10 @@ public class PwlProject implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; // public Object getDraftUser() { // return JSON.parse(draftUser); diff --git a/src/main/java/com/gxwebsoft/pwl/param/PwlProjectImportParam.java b/src/main/java/com/gxwebsoft/pwl/param/PwlProjectImportParam.java index f3878c2..b0b2517 100644 --- a/src/main/java/com/gxwebsoft/pwl/param/PwlProjectImportParam.java +++ b/src/main/java/com/gxwebsoft/pwl/param/PwlProjectImportParam.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 用户导入参数 diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 908a7e8..547726a 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -350,12 +350,12 @@ public class ShopOrderController extends BaseController { // 2. 未支付则处理更新订单状态 if (order.getPayStatus().equals(false)) { // 5. TODO 处理订单状态 - order.setPayTime(DateUtil.date()); + order.setPayTime(LocalDateTime.now()); order.setExpirationTime(order.getCreateTime()); order.setPayStatus(true); order.setTransactionId(transactionId); order.setPayPrice(new BigDecimal(NumberUtil.decimalFormat("0.00", total * 0.01))); - order.setExpirationTime(DateUtil.offset(DateUtil.date(), DateField.YEAR, 10)); + order.setExpirationTime(LocalDateTime.now().plusYears(10)); System.out.println("实际付款金额 = " + order.getPayPrice()); shopOrderService.updateByOutTradeNo(order); return "SUCCESS"; diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopUserCouponController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopUserCouponController.java index 0c69e67..1750038 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopUserCouponController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopUserCouponController.java @@ -31,7 +31,6 @@ import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.Calendar; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopBrand.java b/src/main/java/com/gxwebsoft/shop/entity/ShopBrand.java index 635ca09..3decc10 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopBrand.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopBrand.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -45,6 +45,6 @@ public class ShopBrand implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopCart.java b/src/main/java/com/gxwebsoft/shop/entity/ShopCart.java index a2a552b..a716be6 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopCart.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopCart.java @@ -3,7 +3,7 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -84,9 +84,9 @@ public class ShopCart implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopChatConversation.java b/src/main/java/com/gxwebsoft/shop/entity/ShopChatConversation.java index 370e530..fbd5bdd 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopChatConversation.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopChatConversation.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -52,9 +52,9 @@ public class ShopChatConversation implements Serializable { private Integer tenantId; @Schema(description = "注册时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopChatMessage.java b/src/main/java/com/gxwebsoft/shop/entity/ShopChatMessage.java index 01db408..f6ab0c3 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopChatMessage.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopChatMessage.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -67,9 +67,9 @@ public class ShopChatMessage implements Serializable { private Integer tenantId; @Schema(description = "注册时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopCount.java b/src/main/java/com/gxwebsoft/shop/entity/ShopCount.java index c7f0a85..9ab3ffe 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopCount.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopCount.java @@ -4,7 +4,7 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -58,6 +58,6 @@ public class ShopCount implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java b/src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java index f9f2c5c..a8f5c88 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; import java.util.List; import io.swagger.v3.oas.annotations.media.Schema; @@ -88,10 +87,10 @@ public class ShopCoupon implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; @Schema(description = "发放总数量(-1表示无限制)") private Integer totalCount; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java index 5a1a1c8..f5d930c 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; -import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -67,9 +66,9 @@ public class ShopDealerOrder implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsComment.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsComment.java index 1d85263..acc1754 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsComment.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsComment.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -88,9 +88,9 @@ public class ShopGoodsComment implements Serializable { private Integer tenantId; @Schema(description = "注册时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "更新时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsIncomeConfig.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsIncomeConfig.java index 9d14dbe..be4c1e7 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsIncomeConfig.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsIncomeConfig.java @@ -3,7 +3,7 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -53,9 +53,9 @@ public class ShopGoodsIncomeConfig implements Serializable { private Integer tenantId; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsLog.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsLog.java index ffe9679..5cd0dff 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsLog.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsLog.java @@ -3,7 +3,7 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -75,9 +75,9 @@ public class ShopGoodsLog implements Serializable { private Integer tenantId; @Schema(description = "注册时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsRelation.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsRelation.java index a0be61e..471ef7b 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsRelation.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsRelation.java @@ -3,7 +3,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -42,9 +42,9 @@ public class ShopGoodsRelation implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "更新时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantAccount.java b/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantAccount.java index e369e1a..dac4713 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantAccount.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantAccount.java @@ -3,7 +3,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -57,7 +57,7 @@ public class ShopMerchantAccount implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "密码") @TableField(exist = false) diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantApply.java b/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantApply.java index 554fdb7..5aa06ec 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantApply.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantApply.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -100,7 +100,7 @@ public class ShopMerchantApply implements Serializable { private String reason; @Schema(description = "审核完成时间") - private Date completedTime; + private LocalDateTime completedTime; @Schema(description = "审核状态") private Boolean checkStatus; @@ -126,6 +126,6 @@ public class ShopMerchantApply implements Serializable { private String logo; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantType.java b/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantType.java index 3739d90..c65d348 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantType.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopMerchantType.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -41,6 +41,6 @@ public class ShopMerchantType implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index fb7d817..a334d65 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -4,7 +4,7 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.List; @@ -166,7 +166,7 @@ public class ShopOrder implements Serializable { private String deliveryNote; @Schema(description = "发货时间") - private Date deliveryTime; + private LocalDateTime deliveryTime; @Schema(description = "优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡") private Integer couponType; @@ -193,16 +193,16 @@ public class ShopOrder implements Serializable { private String invoiceNo; @Schema(description = "支付时间") - private Date payTime; + private LocalDateTime payTime; @Schema(description = "退款时间") - private Date refundTime; + private LocalDateTime refundTime; @Schema(description = "申请退款时间") - private Date refundApplyTime; + private LocalDateTime refundApplyTime; @Schema(description = "过期时间") - private Date expirationTime; + private LocalDateTime expirationTime; @Schema(description = "对账情况：0=未对账；1=已对账；3=已对账，金额对不上；4=未查询到该订单") private Integer checkBill; @@ -254,10 +254,10 @@ public class ShopOrder implements Serializable { private Integer tenantId; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "自提码") private String selfTakeCode; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderDelivery.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderDelivery.java index e3c28df..61afa99 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderDelivery.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderDelivery.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -55,9 +55,9 @@ public class ShopOrderDelivery implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderDeliveryGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderDeliveryGoods.java index 95efb6a..b030fb5 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderDeliveryGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderDeliveryGoods.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -52,9 +52,9 @@ public class ShopOrderDeliveryGoods implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderExtract.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderExtract.java index ea26d42..2653bfa 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderExtract.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderExtract.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -49,9 +49,9 @@ public class ShopOrderExtract implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderGoods.java index d9288b9..6ec26e1 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderGoods.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalTime; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -88,7 +88,7 @@ public class ShopOrderGoods implements Serializable { private Long timeFlag; @Schema(description = "过期时间") - private Date expirationTime; + private LocalDateTime expirationTime; @Schema(description = "排序号") private Integer sortNumber; @@ -103,9 +103,9 @@ public class ShopOrderGoods implements Serializable { private Integer tenantId; @Schema(description = "更新时间") - private Date updateTime; + private LocalDateTime updateTime; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderInfo.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderInfo.java index 5eafbf9..d54f9c4 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderInfo.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderInfo.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalTime; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -98,7 +98,7 @@ public class ShopOrderInfo implements Serializable { private Long timeFlag; @Schema(description = "过期时间") - private Date expirationTime; + private LocalDateTime expirationTime; @Schema(description = "备注") private String comments; @@ -110,9 +110,9 @@ public class ShopOrderInfo implements Serializable { private Integer tenantId; @Schema(description = "更新时间") - private Date updateTime; + private LocalDateTime updateTime; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderInfoLog.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderInfoLog.java index dbc1148..edd59e5 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderInfoLog.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderInfoLog.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -40,6 +40,6 @@ public class ShopOrderInfoLog implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopRechargeOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopRechargeOrder.java index ef0634b..93cb27f 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopRechargeOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopRechargeOrder.java @@ -3,7 +3,7 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -92,9 +92,9 @@ public class ShopRechargeOrder implements Serializable { private Integer tenantId; @Schema(description = "注册时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopSplash.java b/src/main/java/com/gxwebsoft/shop/entity/ShopSplash.java index 1932f84..ebf7256 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopSplash.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopSplash.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -54,9 +54,9 @@ public class ShopSplash implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java b/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java index 249911f..150098a 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java @@ -3,7 +3,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -73,6 +73,6 @@ public class ShopUserAddress implements Serializable { private Integer tenantId; @Schema(description = "注册时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopUserBalanceLog.java b/src/main/java/com/gxwebsoft/shop/entity/ShopUserBalanceLog.java index ffc9119..8ebea42 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopUserBalanceLog.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopUserBalanceLog.java @@ -3,7 +3,7 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -71,9 +71,9 @@ public class ShopUserBalanceLog implements Serializable { private Integer tenantId; @Schema(description = "注册时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopUserCollection.java b/src/main/java/com/gxwebsoft/shop/entity/ShopUserCollection.java index b82fb90..d7ce763 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopUserCollection.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopUserCollection.java @@ -2,7 +2,7 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -38,6 +38,6 @@ public class ShopUserCollection implements Serializable { private Integer tenantId; @Schema(description = "注册时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/src/main/java/com/gxwebsoft/shop/enums/OrderStatusEnum.class b/src/main/java/com/gxwebsoft/shop/enums/OrderStatusEnum.class new file mode 100644 index 0000000000000000000000000000000000000000..48a4a6c36ea74e14b9b7573c1bff54b9d41a67b2 GIT binary patch literal 2066 zcmb7_%Trr*6vw|eulpmtz-@T6P)ZfCCZRO8TC|2zVsg=FAjsumtV%<;q`{DMl2BbT zqjkD)raIGwj+-u=u?xr6^Z_Fy)3tv`VanRQ)t?e&_i+=brre_wO43 zF5s#PhXQ}5xD?8M@wqiuE-q9;*+*X?bnelgPm4Fd1bNNjFg-@0}8$@=#Kn!tNIWb@{CPapg&&@3=o)49F2 zeQQO)Coo>Odc-_HE6NRPPUH&K*z(exRhmrC<*9{3 z``lUJ;KNKQo4IU(mO_b~`R&gB>$a(;tX0{`sqMMJuUqYC#CU$5e>G|?qxW<$ldp}e z(;uK49<()9j`!ff>lg|v@S4TtQpOs|$$M$tv+hpI@f()P_6c<^xF55@Shw zizRI-mb8>u(hg!t8;2$B7?!kF$dgaLP%P<<0rXC}TIg9NziC{icysjBLsEXcRh)Q) zmmZ_{9z7|@(6@)rJfwdL^Uw4hOuarOxCZ}YDF4=X$d?8V_CEk8)kE0?`?^+fI@tdZ zXM-KChZy+nSsWi+^t+Yfwc!xjaTrHn5piIFVr6lq7W+6!nXNnc0B84x?WCg|7WYvd z*sI#Dd*%4oRA)Fka8Ymg14_zSh0{#As!+|8yGpG~d8%kMQ)(5unG#jBm?@o5I|*VP zBnWnydxLl&@EP*8Ab)X7fYo&h;d{&JSVP!1yo$H)!^y~SIVBolq%wNf?UE?Y$jj(` zk6WSyqeez!sz;(EBc0I)LX~KOQ46C<-6JHMV%E-VMpt#V{g7b?!;f^Kv-Ks0U2FK{ yK2GfRDhMxiKt&6ccakRKJUu6R^u%p(+B^0=u#eV=3BHz~l literal 0 HcmV?d00001 diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index 3f4fbba..e28df96 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -236,7 +236,7 @@ public class ShopOrderServiceImpl extends ServiceImpl