From 5fadff101c9f6b70c763bc6a0f9743d9acc77dfc 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 11:59:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor(shop):=20=E9=87=8D=E6=9E=84=20Shop=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新了多个类的作者日期 -修正了 ShopDealerOrder 中的日期类型 - 删除了 ShopDealerOrderMapper.xml 文件 - 调整了 ShopExpress 相关代码 - 更新了多个服务类和参数类的作者日期 - 修改了 ShopGenerator 中的输出路径 --- .../shop/controller/ShopDealerOrderController.java | 2 +- .../shop/controller/ShopExpressController.java | 4 ++-- .../com/gxwebsoft/shop/entity/ShopDealerOrder.java | 8 +++++--- .../java/com/gxwebsoft/shop/entity/ShopExpress.java | 4 +--- .../shop/mapper/ShopDealerOrderMapper.java | 2 +- .../gxwebsoft/shop/mapper/ShopExpressMapper.java | 2 +- .../gxwebsoft/shop/param/ShopDealerOrderParam.java | 2 +- .../com/gxwebsoft/shop/param/ShopExpressParam.java | 3 +-- .../shop/service/ShopDealerOrderService.java | 2 +- .../gxwebsoft/shop/service/ShopExpressService.java | 2 +- .../service/impl/ShopDealerOrderServiceImpl.java | 2 +- .../shop/service/impl/ShopExpressServiceImpl.java | 2 +- .../java/com/gxwebsoft/generator/ShopGenerator.java | 13 ++++++------- 13 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java index 46d7a1f..9356f7e 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java @@ -22,7 +22,7 @@ import java.util.List; * 分销商订单记录表控制器 * * @author 科技小王子 - * @since 2025-08-11 23:51:41 + * @since 2025-08-12 11:55:18 */ @Tag(name = "分销商订单记录表管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopExpressController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopExpressController.java index 8755025..562dd24 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopExpressController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopExpressController.java @@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -22,7 +22,7 @@ import java.util.List; * 物流公司控制器 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 11:52:07 */ @Tag(name = "物流公司管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java index 85cd027..5a1a1c8 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java @@ -5,6 +5,8 @@ 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; import lombok.EqualsAndHashCode; @@ -13,7 +15,7 @@ import lombok.EqualsAndHashCode; * 分销商订单记录表 * * @author 科技小王子 - * @since 2025-08-11 23:51:41 + * @since 2025-08-12 11:55:18 */ @Data @EqualsAndHashCode(callSuper = false) @@ -65,9 +67,9 @@ public class ShopDealerOrder implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private LocalDateTime createTime; + private Date createTime; @Schema(description = "修改时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopExpress.java b/src/main/java/com/gxwebsoft/shop/entity/ShopExpress.java index 10789c1..b243a04 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopExpress.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopExpress.java @@ -2,12 +2,10 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; 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; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +14,7 @@ import lombok.EqualsAndHashCode; * 物流公司 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 11:52:07 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java index 537eb61..928b066 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 分销商订单记录表Mapper * * @author 科技小王子 - * @since 2025-08-11 23:51:41 + * @since 2025-08-12 11:55:18 */ public interface ShopDealerOrderMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressMapper.java index e73101f..910ff55 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 物流公司Mapper * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 11:52:07 */ public interface ShopExpressMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderParam.java index f146876..39eaae2 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商订单记录表查询参数 * * @author 科技小王子 - * @since 2025-08-11 23:51:41 + * @since 2025-08-12 11:55:18 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopExpressParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopExpressParam.java index 0a30355..4d59003 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopExpressParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopExpressParam.java @@ -6,7 +6,6 @@ import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +13,7 @@ import lombok.EqualsAndHashCode; * 物流公司查询参数 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 11:52:07 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java index f5fcc3f..8390e29 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java @@ -11,7 +11,7 @@ import java.util.List; * 分销商订单记录表Service * * @author 科技小王子 - * @since 2025-08-11 23:51:41 + * @since 2025-08-12 11:55:18 */ public interface ShopDealerOrderService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopExpressService.java b/src/main/java/com/gxwebsoft/shop/service/ShopExpressService.java index f8f30d6..e7e3182 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopExpressService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopExpressService.java @@ -11,7 +11,7 @@ import java.util.List; * 物流公司Service * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 11:52:07 */ public interface ShopExpressService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java index e2c1626..6d52474 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 分销商订单记录表Service实现 * * @author 科技小王子 - * @since 2025-08-11 23:51:41 + * @since 2025-08-12 11:55:18 */ @Service public class ShopDealerOrderServiceImpl extends ServiceImpl implements ShopDealerOrderService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressServiceImpl.java index 9ca35c3..e374ae1 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 物流公司Service实现 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 11:52:07 */ @Service public class ShopExpressServiceImpl extends ServiceImpl implements ShopExpressService { diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java index 6927bcd..707de09 100644 --- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -24,12 +24,12 @@ public class ShopGenerator { // 输出位置 private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 - // 输出目录 + // JAVA输出目录 private static final String OUTPUT_DIR = "/src/main/java"; // Vue文件输出位置 - private static final String OUTPUT_LOCATION_VUE = "/Users/liangxin/Project/Html/web/mp-vue"; - // Vue文件输出目录 - private static final String OUTPUT_LOCATION_UNIAPP = "/Users/liangxin/Project/Html/miniProgram/template-10550"; + private static final String OUTPUT_LOCATION_VUE = "/Users/gxwebsoft/VUE/web/mp-vue"; + // UniApp文件输出目录 + private static final String OUTPUT_LOCATION_UNIAPP = "/Users/gxwebsoft/VUE/template-10550"; // Vue文件输出目录 private static final String OUTPUT_DIR_VUE = "/src"; // 作者名称 @@ -91,7 +91,6 @@ public class ShopGenerator { // "shop_user_coupon", // "shop_cart", // "shop_count", -// "shop_express", // "shop_order_delivery", // "shop_order_delivery_goods", // "shop_order_extract", @@ -99,8 +98,8 @@ public class ShopGenerator { // "shop_goods_income_config" // "shop_express", // "shop_express_template", -// "shop_express_template_detail" - "shop_gift" +// "shop_express_template_detail", +// "shop_gift" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{