From cce8c76c86ee1b90722eba5e7f60c941ef74a54d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 11 Aug 2025 23:57:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E6=B7=BB=E5=8A=A0=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8=E7=AE=A1=E7=90=86=E5=92=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 ShopCoupon 和 ShopUserCoupon 实体类 - 实现优惠券和用户优惠券的 CRUD 操作 - 添加分页查询、批量操作等接口 - 集成权限控制和操作日志记录refactor(shop): 重构Shop模块的实体类和映射文件 - 更新了多个实体类的创建时间和修改时间字段类型，从Date改为LocalDateTime - 优化了部分实体类的属性结构，移除了不必要的字段 - 更新了多个Mapper接口的作者信息 - 为ShopUserRefereeController添加了权限控制注解 --- pom.xml | 2 +- .../shop/controller/ShopCouponController.java | 2 +- .../controller/ShopDealerApplyController.java | 2 +- .../ShopDealerCapitalController.java | 2 +- .../controller/ShopDealerOrderController.java | 2 +- .../ShopDealerRefereeController.java | 2 +- .../ShopDealerSettingController.java | 4 +- .../controller/ShopDealerUserController.java | 2 +- .../ShopDealerWithdrawController.java | 2 +- .../controller/ShopUserCouponController.java | 2 +- .../controller/ShopUserRefereeController.java | 18 +++- .../com/gxwebsoft/shop/entity/ShopCoupon.java | 8 +- .../shop/entity/ShopDealerApply.java | 8 +- .../shop/entity/ShopDealerCapital.java | 8 +- .../shop/entity/ShopDealerOrder.java | 8 +- .../shop/entity/ShopDealerReferee.java | 8 +- .../shop/entity/ShopDealerSetting.java | 2 +- .../gxwebsoft/shop/entity/ShopDealerUser.java | 8 +- .../shop/entity/ShopDealerWithdraw.java | 8 +- .../gxwebsoft/shop/entity/ShopUserCoupon.java | 4 +- .../shop/entity/ShopUserReferee.java | 56 +--------- .../shop/mapper/ShopCouponMapper.java | 2 +- .../shop/mapper/ShopDealerApplyMapper.java | 2 +- .../shop/mapper/ShopDealerCapitalMapper.java | 2 +- .../shop/mapper/ShopDealerOrderMapper.java | 2 +- .../shop/mapper/ShopDealerRefereeMapper.java | 2 +- .../shop/mapper/ShopDealerSettingMapper.java | 2 +- .../shop/mapper/ShopDealerUserMapper.java | 2 +- .../shop/mapper/ShopDealerWithdrawMapper.java | 2 +- .../shop/mapper/ShopUserCouponMapper.java | 2 +- .../shop/mapper/ShopUserRefereeMapper.java | 2 +- .../gxwebsoft/shop/param/ShopCouponParam.java | 2 +- .../shop/param/ShopDealerApplyParam.java | 2 +- .../shop/param/ShopDealerCapitalParam.java | 2 +- .../shop/param/ShopDealerOrderParam.java | 2 +- .../shop/param/ShopDealerRefereeParam.java | 2 +- .../shop/param/ShopDealerSettingParam.java | 2 +- .../shop/param/ShopDealerUserParam.java | 2 +- .../shop/param/ShopDealerWithdrawParam.java | 2 +- .../shop/param/ShopUserCouponParam.java | 2 +- .../shop/param/ShopUserRefereeParam.java | 3 +- .../shop/service/ShopCouponService.java | 2 +- .../shop/service/ShopDealerApplyService.java | 2 +- .../service/ShopDealerCapitalService.java | 2 +- .../shop/service/ShopDealerOrderService.java | 2 +- .../service/ShopDealerRefereeService.java | 2 +- .../service/ShopDealerSettingService.java | 2 +- .../shop/service/ShopDealerUserService.java | 2 +- .../service/ShopDealerWithdrawService.java | 2 +- .../shop/service/ShopUserCouponService.java | 2 +- .../shop/service/ShopUserRefereeService.java | 2 +- .../service/impl/ShopCouponServiceImpl.java | 2 +- .../impl/ShopDealerApplyServiceImpl.java | 2 +- .../impl/ShopDealerCapitalServiceImpl.java | 2 +- .../impl/ShopDealerOrderServiceImpl.java | 2 +- .../impl/ShopDealerRefereeServiceImpl.java | 2 +- .../impl/ShopDealerSettingServiceImpl.java | 2 +- .../impl/ShopDealerUserServiceImpl.java | 2 +- .../impl/ShopDealerWithdrawServiceImpl.java | 2 +- .../impl/ShopUserCouponServiceImpl.java | 2 +- .../impl/ShopUserRefereeServiceImpl.java | 2 +- .../gxwebsoft/generator/ShopGenerator.java | 11 +- .../generator/templates/index.ts.btl | 17 ++- .../generator/templates/index.ts.uniapp.btl | 101 ++++++++++++++++++ .../generator/templates/model.ts.btl | 2 +- .../generator/templates/model.ts.uniapp.btl | 43 ++++++++ 66 files changed, 257 insertions(+), 156 deletions(-) create mode 100644 src/test/java/com/gxwebsoft/generator/templates/index.ts.uniapp.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/model.ts.uniapp.btl diff --git a/pom.xml b/pom.xml index 94680d7..1374508 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ com.ibeetl beetl - 3.15.10.RELEASE + 3.6.1.RELEASE diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopCouponController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopCouponController.java index ae60c1d..6591f13 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopCouponController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopCouponController.java @@ -22,7 +22,7 @@ import java.util.List; * 优惠券控制器 * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:24 */ @Tag(name = "优惠券管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java index 6802da9..c91e59e 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java @@ -22,7 +22,7 @@ import java.util.List; * 分销商申请记录表控制器 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:50:19 */ @Tag(name = "分销商申请记录表管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java index fcb6fe8..d7ccaf1 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java @@ -22,7 +22,7 @@ import java.util.List; * 分销商资金明细表控制器 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Tag(name = "分销商资金明细表管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java index 14fc443..46d7a1f 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 09:44:39 + * @since 2025-08-11 23:51:41 */ @Tag(name = "分销商订单记录表管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRefereeController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRefereeController.java index 3226f10..0546109 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRefereeController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRefereeController.java @@ -22,7 +22,7 @@ import java.util.List; * 分销商推荐关系表控制器 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Tag(name = "分销商推荐关系表管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerSettingController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerSettingController.java index 39bbb44..039cf2c 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerSettingController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerSettingController.java @@ -6,8 +6,10 @@ import com.gxwebsoft.shop.entity.ShopDealerSetting; import com.gxwebsoft.shop.param.ShopDealerSettingParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; +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.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; @@ -20,7 +22,7 @@ import java.util.List; * 分销商设置表控制器 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Tag(name = "分销商设置表管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java index eab323e..cf0b6c0 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java @@ -22,7 +22,7 @@ import java.util.List; * 分销商用户记录表控制器 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Tag(name = "分销商用户记录表管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java index f9312b3..08cbc23 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java @@ -22,7 +22,7 @@ import java.util.List; * 分销商提现明细表控制器 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Tag(name = "分销商提现明细表管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopUserCouponController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopUserCouponController.java index 73ab99f..3da19e7 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopUserCouponController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopUserCouponController.java @@ -22,7 +22,7 @@ import java.util.List; * 用户优惠券控制器 * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:41 */ @Tag(name = "用户优惠券管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopUserRefereeController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopUserRefereeController.java index 55b0d70..3e9970f 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopUserRefereeController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopUserRefereeController.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-03-05 17:05:28 + * @since 2025-08-11 23:51:41 */ @Tag(name = "用户推荐关系表管理") @RestController @@ -31,6 +31,7 @@ public class ShopUserRefereeController extends BaseController { @Resource private ShopUserRefereeService shopUserRefereeService; + @PreAuthorize("hasAuthority('shop:shopUserReferee:list')") @Operation(summary = "分页查询用户推荐关系表") @GetMapping("/page") public ApiResult> page(ShopUserRefereeParam param) { @@ -38,6 +39,7 @@ public class ShopUserRefereeController extends BaseController { return success(shopUserRefereeService.pageRel(param)); } + @PreAuthorize("hasAuthority('shop:shopUserReferee:list')") @Operation(summary = "查询全部用户推荐关系表") @GetMapping() public ApiResult> list(ShopUserRefereeParam param) { @@ -53,6 +55,8 @@ public class ShopUserRefereeController extends BaseController { return success(shopUserRefereeService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('shop:shopUserReferee:save')") + @OperationLog @Operation(summary = "添加用户推荐关系表") @PostMapping() public ApiResult save(@RequestBody ShopUserReferee shopUserReferee) { @@ -67,6 +71,8 @@ public class ShopUserRefereeController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('shop:shopUserReferee:update')") + @OperationLog @Operation(summary = "修改用户推荐关系表") @PutMapping() public ApiResult update(@RequestBody ShopUserReferee shopUserReferee) { @@ -76,6 +82,8 @@ public class ShopUserRefereeController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('shop:shopUserReferee:remove')") + @OperationLog @Operation(summary = "删除用户推荐关系表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -85,6 +93,8 @@ public class ShopUserRefereeController extends BaseController { return fail("删除失败"); } + @PreAuthorize("hasAuthority('shop:shopUserReferee:save')") + @OperationLog @Operation(summary = "批量添加用户推荐关系表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -94,6 +104,8 @@ public class ShopUserRefereeController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('shop:shopUserReferee:update')") + @OperationLog @Operation(summary = "批量修改用户推荐关系表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -103,6 +115,8 @@ public class ShopUserRefereeController extends BaseController { return fail("修改失败"); } + @PreAuthorize("hasAuthority('shop:shopUserReferee:remove')") + @OperationLog @Operation(summary = "批量删除用户推荐关系表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java b/src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java index c7b6ec6..903f976 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java @@ -7,8 +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 lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +15,7 @@ import lombok.EqualsAndHashCode; * 优惠券 * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:23 */ @Data @EqualsAndHashCode(callSuper = false) @@ -85,10 +83,10 @@ public class ShopCoupon implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Data 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/ShopDealerApply.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java index 4691229..51fd4fb 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java @@ -4,8 +4,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; import lombok.EqualsAndHashCode; @@ -14,7 +12,7 @@ import lombok.EqualsAndHashCode; * 分销商申请记录表 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:50:18 */ @Data @EqualsAndHashCode(callSuper = false) @@ -57,9 +55,9 @@ public class ShopDealerApply 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/ShopDealerCapital.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java index f2f94ba..b0040b2 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java @@ -5,8 +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; import lombok.EqualsAndHashCode; @@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商资金明细表 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) @@ -49,9 +47,9 @@ public class ShopDealerCapital 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/ShopDealerOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java index bc0a4a5..10e5e76 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java @@ -5,8 +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; import lombok.EqualsAndHashCode; @@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商订单记录表 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) @@ -67,9 +65,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/ShopDealerReferee.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java index 00c2847..9e959e9 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java @@ -4,8 +4,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; import lombok.EqualsAndHashCode; @@ -14,7 +12,7 @@ import lombok.EqualsAndHashCode; * 分销商推荐关系表 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) @@ -39,9 +37,9 @@ public class ShopDealerReferee 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/ShopDealerSetting.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerSetting.java index e860109..fd1b2ad 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerSetting.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerSetting.java @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; * 分销商设置表 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java index 4d7ebe7..d76b4e8 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java @@ -5,8 +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; import lombok.EqualsAndHashCode; @@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商用户记录表 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) @@ -70,9 +68,9 @@ public class ShopDealerUser 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/ShopDealerWithdraw.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerWithdraw.java index c380403..36b7ce9 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerWithdraw.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerWithdraw.java @@ -5,8 +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; import lombok.EqualsAndHashCode; @@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商提现明细表 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) @@ -67,9 +65,9 @@ public class ShopDealerWithdraw 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/ShopUserCoupon.java b/src/main/java/com/gxwebsoft/shop/entity/ShopUserCoupon.java index 25fcc2f..603c823 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopUserCoupon.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopUserCoupon.java @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; * 用户优惠券 * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) @@ -24,7 +24,7 @@ public class ShopUserCoupon implements Serializable { @Schema(description = "id") @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; @Schema(description = "优惠券模板ID") private Integer couponId; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopUserReferee.java b/src/main/java/com/gxwebsoft/shop/entity/ShopUserReferee.java index 2d38a76..56b8347 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopUserReferee.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopUserReferee.java @@ -1,16 +1,10 @@ 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.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import com.kuaidi100.sdk.request.samecity.OrderGoods; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,7 +13,7 @@ import lombok.EqualsAndHashCode; * 用户推荐关系表 * * @author 科技小王子 - * @since 2025-03-05 17:05:28 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) @@ -51,53 +45,9 @@ public class ShopUserReferee implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; - - - @Schema(description = "被推荐人的报餐信息") - @TableField(exist = false) - private List order; - - @Schema(description = "被推荐人的报餐菜品") - @TableField(exist = false) - private List orderGoods; - - @Schema(description = "被推荐人昵称") - @TableField(exist = false) - private String nickname; - - @Schema(description = "被推荐人头像") - @TableField(exist = false) - private String avatar; - - @Schema(description = "被推荐人等级ID") - @TableField(exist = false) - private Integer gradeId; - - @Schema(description = "被推荐人等级") - @TableField(exist = false) - private String gradeName; - - @Schema(description = "推荐人昵称") - @TableField(exist = false) - private String dealerName; - - @Schema(description = "推荐人头像") - @TableField(exist = false) - private String dealerAvatar; - - @Schema(description = "推荐人电话") - @TableField(exist = false) - private String dealerPhone; - - @Schema(description = "用户所属门店") - private Long merchantId; - - @Schema(description = "所属门店") - @TableField(exist = false) - private ShopMerchant merchant; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopCouponMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopCouponMapper.java index 8c8dd67..a6a8ff1 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopCouponMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopCouponMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 优惠券Mapper * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:23 */ public interface ShopCouponMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerApplyMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerApplyMapper.java index 32a741a..ce2ee91 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerApplyMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerApplyMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 分销商申请记录表Mapper * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:50:18 */ public interface ShopDealerApplyMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerCapitalMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerCapitalMapper.java index 5484737..d996c07 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerCapitalMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerCapitalMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 分销商资金明细表Mapper * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerCapitalMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java index 7f17bed..537eb61 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 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerOrderMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java index dd3ae23..70ddf37 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 分销商推荐关系表Mapper * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerRefereeMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerSettingMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerSettingMapper.java index 256363f..5d10a6c 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerSettingMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerSettingMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 分销商设置表Mapper * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerSettingMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerUserMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerUserMapper.java index a0553a2..c1b5fd3 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerUserMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerUserMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 分销商用户记录表Mapper * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerUserMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerWithdrawMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerWithdrawMapper.java index ebbfc3a..0d5a427 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerWithdrawMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerWithdrawMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 分销商提现明细表Mapper * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerWithdrawMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopUserCouponMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopUserCouponMapper.java index 715f1a1..07c4c43 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopUserCouponMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopUserCouponMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 用户优惠券Mapper * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:41 */ public interface ShopUserCouponMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopUserRefereeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopUserRefereeMapper.java index 38f679f..207fd90 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopUserRefereeMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopUserRefereeMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 用户推荐关系表Mapper * * @author 科技小王子 - * @since 2025-03-05 17:05:28 + * @since 2025-08-11 23:51:41 */ public interface ShopUserRefereeMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopCouponParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopCouponParam.java index f6f0d0f..58f71f5 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopCouponParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopCouponParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 优惠券查询参数 * * @author 科技小王子 - * @since 2025-08-11 09:41:37 + * @since 2025-08-11 23:51:23 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java index c052729..210c043 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商申请记录表查询参数 * * @author 科技小王子 - * @since 2025-08-11 09:44:38 + * @since 2025-08-11 23:50:17 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerCapitalParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerCapitalParam.java index 8b00181..72e959b 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerCapitalParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerCapitalParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商资金明细表查询参数 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:40 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderParam.java index a596d50..f146876 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 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerRefereeParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerRefereeParam.java index 41514b1..eed72d1 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerRefereeParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerRefereeParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商推荐关系表查询参数 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerSettingParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerSettingParam.java index 45b5b3c..e9f214e 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerSettingParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerSettingParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商设置表查询参数 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java index 616a431..07f4013 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商用户记录表查询参数 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerWithdrawParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerWithdrawParam.java index 4e01571..c053078 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerWithdrawParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerWithdrawParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 分销商提现明细表查询参数 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopUserCouponParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopUserCouponParam.java index 2bea442..3051530 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopUserCouponParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopUserCouponParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 用户优惠券查询参数 * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopUserRefereeParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopUserRefereeParam.java index f3b3294..f0ea733 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopUserRefereeParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopUserRefereeParam.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-03-05 17:05:28 + * @since 2025-08-11 23:51:41 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopCouponService.java b/src/main/java/com/gxwebsoft/shop/service/ShopCouponService.java index 1ab7343..074b62c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopCouponService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopCouponService.java @@ -11,7 +11,7 @@ import java.util.List; * 优惠券Service * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:23 */ public interface ShopCouponService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerApplyService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerApplyService.java index 2a94867..d9bf466 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerApplyService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerApplyService.java @@ -11,7 +11,7 @@ import java.util.List; * 分销商申请记录表Service * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:50:18 */ public interface ShopDealerApplyService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerCapitalService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerCapitalService.java index 443c353..67fb29c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerCapitalService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerCapitalService.java @@ -11,7 +11,7 @@ import java.util.List; * 分销商资金明细表Service * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerCapitalService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java index 1dfd140..f5fcc3f 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 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerOrderService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerRefereeService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerRefereeService.java index 62d170e..f36b263 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerRefereeService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerRefereeService.java @@ -11,7 +11,7 @@ import java.util.List; * 分销商推荐关系表Service * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerRefereeService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerSettingService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerSettingService.java index 52f96a0..b9b1c7b 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerSettingService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerSettingService.java @@ -11,7 +11,7 @@ import java.util.List; * 分销商设置表Service * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerSettingService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java index 341b3b0..c6d5701 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java @@ -11,7 +11,7 @@ import java.util.List; * 分销商用户记录表Service * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerUserService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerWithdrawService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerWithdrawService.java index ee14abd..61731e3 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerWithdrawService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerWithdrawService.java @@ -11,7 +11,7 @@ import java.util.List; * 分销商提现明细表Service * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ public interface ShopDealerWithdrawService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopUserCouponService.java b/src/main/java/com/gxwebsoft/shop/service/ShopUserCouponService.java index 31b7b0d..248b875 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopUserCouponService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopUserCouponService.java @@ -11,7 +11,7 @@ import java.util.List; * 用户优惠券Service * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:41 */ public interface ShopUserCouponService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopUserRefereeService.java b/src/main/java/com/gxwebsoft/shop/service/ShopUserRefereeService.java index 66e00a5..3c727a6 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopUserRefereeService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopUserRefereeService.java @@ -11,7 +11,7 @@ import java.util.List; * 用户推荐关系表Service * * @author 科技小王子 - * @since 2025-03-05 17:05:28 + * @since 2025-08-11 23:51:41 */ public interface ShopUserRefereeService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopCouponServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopCouponServiceImpl.java index 5a9aedd..348b5a1 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopCouponServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopCouponServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 优惠券Service实现 * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:23 */ @Service public class ShopCouponServiceImpl extends ServiceImpl implements ShopCouponService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java index 41e9698..fa2254c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 分销商申请记录表Service实现 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:50:18 */ @Service public class ShopDealerApplyServiceImpl extends ServiceImpl implements ShopDealerApplyService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java index 7fbb57d..242963c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 分销商资金明细表Service实现 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Service public class ShopDealerCapitalServiceImpl extends ServiceImpl implements ShopDealerCapitalService { 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 727a68c..e2c1626 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 09:44:39 + * @since 2025-08-11 23:51:41 */ @Service public class ShopDealerOrderServiceImpl extends ServiceImpl implements ShopDealerOrderService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java index c62806d..a72fa6f 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 分销商推荐关系表Service实现 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Service public class ShopDealerRefereeServiceImpl extends ServiceImpl implements ShopDealerRefereeService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java index 09a4f01..4718052 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 分销商设置表Service实现 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Service public class ShopDealerSettingServiceImpl extends ServiceImpl implements ShopDealerSettingService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index 787c08e..230427d 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 分销商用户记录表Service实现 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Service public class ShopDealerUserServiceImpl extends ServiceImpl implements ShopDealerUserService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerWithdrawServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerWithdrawServiceImpl.java index 3cca992..f8387ab 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerWithdrawServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerWithdrawServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 分销商提现明细表Service实现 * * @author 科技小王子 - * @since 2025-08-11 09:44:39 + * @since 2025-08-11 23:51:41 */ @Service public class ShopDealerWithdrawServiceImpl extends ServiceImpl implements ShopDealerWithdrawService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserCouponServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserCouponServiceImpl.java index 73934f9..70cfde2 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserCouponServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserCouponServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 用户优惠券Service实现 * * @author 科技小王子 - * @since 2025-08-11 09:41:38 + * @since 2025-08-11 23:51:41 */ @Service public class ShopUserCouponServiceImpl extends ServiceImpl implements ShopUserCouponService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserRefereeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserRefereeServiceImpl.java index 5f32afe..910561e 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserRefereeServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserRefereeServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 用户推荐关系表Service实现 * * @author 科技小王子 - * @since 2025-03-05 17:05:28 + * @since 2025-08-11 23:51:41 */ @Service public class ShopUserRefereeServiceImpl extends ServiceImpl implements ShopUserRefereeService { diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java index 1dd164a..f65ba8c 100644 --- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -200,6 +200,9 @@ public class ShopGenerator { map.put("authAnnotation", AUTH_ANNOTATION); map.put("logAnnotation", LOG_ANNOTATION); map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + // 添加项目类型标识，用于模板中的条件判断 + map.put("isUniApp", false); // Vue 项目 + map.put("isVueAdmin", true); // 后台管理项目 this.setMap(map); } }; @@ -228,7 +231,9 @@ public class ShopGenerator { + tableInfo.getEntityPath() + "/" + "index.ts"; } }); - focList.add(new FileOutConfig() { + // UniApp 使用专门的模板 + String uniappTemplatePath = TEMPLATES_DIR + "/index.ts.uniapp.btl"; + focList.add(new FileOutConfig(uniappTemplatePath) { @Override public String outputFile(TableInfo tableInfo) { return OUTPUT_LOCATION_UNIAPP + OUTPUT_DIR_VUE @@ -246,7 +251,9 @@ public class ShopGenerator { + tableInfo.getEntityPath() + "/model/" + "index.ts"; } }); - focList.add(new FileOutConfig(templatePath) { + // UniApp 使用专门的 model 模板 + String uniappModelTemplatePath = TEMPLATES_DIR + "/model.ts.uniapp.btl"; + focList.add(new FileOutConfig(uniappModelTemplatePath) { @Override public String outputFile(TableInfo tableInfo) { return OUTPUT_LOCATION_UNIAPP + OUTPUT_DIR_VUE diff --git a/src/test/java/com/gxwebsoft/generator/templates/index.ts.btl b/src/test/java/com/gxwebsoft/generator/templates/index.ts.btl index 3cddcb6..87cab1d 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/index.ts.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/index.ts.btl @@ -1,14 +1,13 @@ import request from '@/utils/request'; -import type { ApiResult, PageResult } from '@/api/index'; +import type { ApiResult, PageResult } from '@/api'; import type { ${entity}, ${entity}Param } from './model'; -import { MODULES_API_URL } from '@/config/setting'; /** * 分页查询${table.comment!} */ export async function page${entity}(params: ${entity}Param) { const res = await request.get>>( - MODULES_API_URL + '/${package.ModuleName}/${controllerMappingHyphen}/page', + '/${package.ModuleName}/${controllerMappingHyphen}/page', { params } @@ -24,7 +23,7 @@ export async function page${entity}(params: ${entity}Param) { */ export async function list${entity}(params?: ${entity}Param) { const res = await request.get>( - MODULES_API_URL + '/${package.ModuleName}/${controllerMappingHyphen}', + '/${package.ModuleName}/${controllerMappingHyphen}', { params } @@ -40,7 +39,7 @@ export async function list${entity}(params?: ${entity}Param) { */ export async function add${entity}(data: ${entity}) { const res = await request.post>( - MODULES_API_URL + '/${package.ModuleName}/${controllerMappingHyphen}', + '/${package.ModuleName}/${controllerMappingHyphen}', data ); if (res.data.code === 0) { @@ -54,7 +53,7 @@ export async function add${entity}(data: ${entity}) { */ export async function update${entity}(data: ${entity}) { const res = await request.put>( - MODULES_API_URL + '/${package.ModuleName}/${controllerMappingHyphen}', + '/${package.ModuleName}/${controllerMappingHyphen}', data ); if (res.data.code === 0) { @@ -68,7 +67,7 @@ export async function update${entity}(data: ${entity}) { */ export async function remove${entity}(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/${package.ModuleName}/${controllerMappingHyphen}/' + id + '/${package.ModuleName}/${controllerMappingHyphen}/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +80,7 @@ export async function remove${entity}(id?: number) { */ export async function removeBatch${entity}(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/${package.ModuleName}/${controllerMappingHyphen}/batch', + '/${package.ModuleName}/${controllerMappingHyphen}/batch', { data } @@ -97,7 +96,7 @@ export async function removeBatch${entity}(data: (number | undefined)[]) { */ export async function get${entity}(id: number) { const res = await request.get>( - MODULES_API_URL + '/${package.ModuleName}/${controllerMappingHyphen}/' + id + '/${package.ModuleName}/${controllerMappingHyphen}/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/test/java/com/gxwebsoft/generator/templates/index.ts.uniapp.btl b/src/test/java/com/gxwebsoft/generator/templates/index.ts.uniapp.btl new file mode 100644 index 0000000..329db28 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/index.ts.uniapp.btl @@ -0,0 +1,101 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api/index'; +import type { ${entity}, ${entity}Param } from './model'; + +/** + * 分页查询${table.comment!} + */ +export async function page${entity}(params: ${entity}Param) { + const res = await request.get>>( + '/${package.ModuleName}/${controllerMappingHyphen}/page', + params + ); + if (res.code === 0) { + return res.data; + } + return Promise.reject(new Error(res.message)); +} + +/** + * 查询${table.comment!}列表 + */ +export async function list${entity}(params?: ${entity}Param) { + const res = await request.get>( + '/${package.ModuleName}/${controllerMappingHyphen}', + params + ); + if (res.code === 0 && res.data) { + return res.data; + } + return Promise.reject(new Error(res.message)); +} + +/** + * 添加${table.comment!} + */ +export async function add${entity}(data: ${entity}) { + const res = await request.post>( + '/${package.ModuleName}/${controllerMappingHyphen}', + data + ); + if (res.code === 0) { + return res.message; + } + return Promise.reject(new Error(res.message)); +} + +/** + * 修改${table.comment!} + */ +export async function update${entity}(data: ${entity}) { + const res = await request.put>( + '/${package.ModuleName}/${controllerMappingHyphen}', + data + ); + if (res.code === 0) { + return res.message; + } + return Promise.reject(new Error(res.message)); +} + +/** + * 删除${table.comment!} + */ +export async function remove${entity}(id?: number) { + const res = await request.del>( + '/${package.ModuleName}/${controllerMappingHyphen}/' + id + ); + if (res.code === 0) { + return res.message; + } + return Promise.reject(new Error(res.message)); +} + +/** + * 批量删除${table.comment!} + */ +export async function removeBatch${entity}(data: (number | undefined)[]) { + const res = await request.del>( + '/${package.ModuleName}/${controllerMappingHyphen}/batch', + { + data + } + ); + if (res.code === 0) { + return res.message; + } + return Promise.reject(new Error(res.message)); +} + +/** + * 根据id查询${table.comment!} + */ +export async function get${entity}(id: number) { + const res = await request.get>( + '/${package.ModuleName}/${controllerMappingHyphen}/' + id + ); + if (res.code === 0 && res.data) { + return res.data; + } + return Promise.reject(new Error(res.message)); +} diff --git a/src/test/java/com/gxwebsoft/generator/templates/model.ts.btl b/src/test/java/com/gxwebsoft/generator/templates/model.ts.btl index 2bc33b2..b0b99db 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/model.ts.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/model.ts.btl @@ -1,4 +1,4 @@ -import type { PageParam } from '@/api/index'; +import type { PageParam } from '@/api'; /** * ${table.comment!} diff --git a/src/test/java/com/gxwebsoft/generator/templates/model.ts.uniapp.btl b/src/test/java/com/gxwebsoft/generator/templates/model.ts.uniapp.btl new file mode 100644 index 0000000..2bc33b2 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/model.ts.uniapp.btl @@ -0,0 +1,43 @@ +import type { PageParam } from '@/api/index'; + +/** + * ${table.comment!} + */ +export interface ${entity} { +<% /** -----------BEGIN 字段循环遍历----------- **/ %> +<% for(field in table.fields) { %> + <% + var keyPropertyName; + if(field.keyFlag) { + keyPropertyName = field.propertyName; + } + %> + <% /* 主键 */ %> + <% if(field.keyFlag) { %> + <% /* 普通字段 */ %> + <% } else if(isNotEmpty(field.fill)) { %> + <% if(field.convert){ %> + @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill}) + <% }else{ %> + @TableField(fill = FieldFill.${field.fill}) + <% } %> + <% } else if(field.convert) { %> + @TableField("${field.annotationColumnName}") + <% } %> + // ${field.comment} + ${field.propertyName}?: <% if(field.propertyType == 'Integer') { %>number<% }else{ %>string<% } %>; +<% } %> +<% /** -----------END 字段循环遍历----------- **/ %> +} + +/** + * ${table.comment!}搜索条件 + */ +export interface ${entity}Param extends PageParam { +<% for(field in table.fields) { %> +<% if(field.keyFlag) { %> + ${field.propertyName}?: number; + <% } %> +<% } %> + keywords?: string; +}