From c06520ab9bf76d808a1a07f7ab2178f7a1db9c50 Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Sun, 31 Mar 2024 18:54:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/oa/entity/GoodsCategory.java | 63 --- .../shop/controller/GoodsAttrController.java | 114 ++++++ .../controller/GoodsAttrResultController.java | 114 ++++++ .../controller/GoodsAttrValueController.java | 114 ++++++ .../controller/GoodsCategoryController.java | 58 ++- .../controller/GoodsCommentController.java | 114 ++++++ .../controller/GoodsController.java | 39 +- .../controller/GoodsCouponController.java | 114 ++++++ .../GoodsDescriptionController.java | 114 ++++++ .../shop/controller/GoodsLogController.java | 114 ++++++ .../controller/GoodsRelationController.java | 114 ++++++ .../shop/controller/GoodsRuleController.java | 114 ++++++ .../gxwebsoft/{oa => shop}/entity/Goods.java | 49 ++- .../com/gxwebsoft/shop/entity/GoodsAttr.java | 49 +++ .../shop/entity/GoodsAttrResult.java | 45 +++ .../gxwebsoft/shop/entity/GoodsAttrValue.java | 96 +++++ .../gxwebsoft/shop/entity/GoodsCategory.java | 92 +++++ .../gxwebsoft/shop/entity/GoodsComment.java | 98 +++++ .../gxwebsoft/shop/entity/GoodsCoupon.java | 58 +++ .../shop/entity/GoodsDescription.java | 40 ++ .../com/gxwebsoft/shop/entity/GoodsLog.java | 85 +++++ .../gxwebsoft/shop/entity/GoodsRelation.java | 51 +++ .../com/gxwebsoft/shop/entity/GoodsRule.java | 37 ++ .../shop/mapper/GoodsAttrMapper.java | 37 ++ .../shop/mapper/GoodsAttrResultMapper.java | 37 ++ .../shop/mapper/GoodsAttrValueMapper.java | 37 ++ .../mapper/GoodsCategoryMapper.java | 10 +- .../shop/mapper/GoodsCommentMapper.java | 37 ++ .../shop/mapper/GoodsCouponMapper.java | 37 ++ .../shop/mapper/GoodsDescriptionMapper.java | 37 ++ .../gxwebsoft/shop/mapper/GoodsLogMapper.java | 37 ++ .../{oa => shop}/mapper/GoodsMapper.java | 8 +- .../shop/mapper/GoodsRelationMapper.java | 37 ++ .../shop/mapper/GoodsRuleMapper.java | 37 ++ .../shop/mapper/xml/GoodsAttrMapper.xml | 48 +++ .../shop/mapper/xml/GoodsAttrResultMapper.xml | 39 ++ .../shop/mapper/xml/GoodsAttrValueMapper.xml | 96 +++++ .../shop/mapper/xml/GoodsCategoryMapper.xml | 90 +++++ .../shop/mapper/xml/GoodsCommentMapper.xml | 96 +++++ .../mapper/xml/GoodsCouponMapper.xml} | 37 +- .../mapper/xml/GoodsDescriptionMapper.xml | 39 ++ .../shop/mapper/xml/GoodsLogMapper.xml | 81 ++++ .../{oa => shop}/mapper/xml/GoodsMapper.xml | 21 +- .../shop/mapper/xml/GoodsRelationMapper.xml | 48 +++ .../shop/mapper/xml/GoodsRuleMapper.xml | 36 ++ .../gxwebsoft/shop/param/GoodsAttrParam.java | 48 +++ .../shop/param/GoodsAttrResultParam.java | 41 ++ .../shop/param/GoodsAttrValueParam.java | 101 +++++ .../shop/param/GoodsCategoryParam.java | 92 +++++ .../shop/param/GoodsCommentParam.java | 98 +++++ .../param/GoodsCouponParam.java} | 39 +- .../shop/param/GoodsDescriptionParam.java | 40 ++ .../gxwebsoft/shop/param/GoodsLogParam.java | 89 +++++ .../{oa => shop}/param/GoodsParam.java | 16 +- .../shop/param/GoodsRelationParam.java | 44 +++ .../gxwebsoft/shop/param/GoodsRuleParam.java | 35 ++ .../shop/service/GoodsAttrResultService.java | 42 ++ .../shop/service/GoodsAttrService.java | 42 ++ .../shop/service/GoodsAttrValueService.java | 42 ++ .../service/GoodsCategoryService.java | 12 +- .../shop/service/GoodsCommentService.java | 42 ++ .../shop/service/GoodsCouponService.java | 42 ++ .../shop/service/GoodsDescriptionService.java | 42 ++ .../shop/service/GoodsLogService.java | 42 ++ .../shop/service/GoodsRelationService.java | 42 ++ .../shop/service/GoodsRuleService.java | 42 ++ .../{oa => shop}/service/GoodsService.java | 8 +- .../impl/GoodsAttrResultServiceImpl.java | 47 +++ .../service/impl/GoodsAttrServiceImpl.java | 47 +++ .../impl/GoodsAttrValueServiceImpl.java | 47 +++ .../impl/GoodsCategoryServiceImpl.java | 18 +- .../service/impl/GoodsCommentServiceImpl.java | 47 +++ .../service/impl/GoodsCouponServiceImpl.java | 47 +++ .../impl/GoodsDescriptionServiceImpl.java | 47 +++ .../service/impl/GoodsLogServiceImpl.java | 47 +++ .../impl/GoodsRelationServiceImpl.java | 47 +++ .../service/impl/GoodsRuleServiceImpl.java | 47 +++ .../service/impl/GoodsServiceImpl.java | 16 +- .../gxwebsoft/generator/ShopGenerator.java | 86 ++++- .../templates/components.edit.vue.btl | 361 ++++++++++++++++++ .../templates/components.search.vue.btl | 42 ++ .../generator/templates/controller.java.btl | 9 +- .../generator/templates/index.ts.btl | 106 +++++ .../generator/templates/index.vue.btl | 211 ++++++++++ .../generator/templates/mapper.xml.btl | 4 + .../generator/templates/model.ts.btl | 43 +++ .../generator/templates/param.java.btl | 1 + 87 files changed, 4994 insertions(+), 235 deletions(-) delete mode 100644 src/main/java/com/gxwebsoft/oa/entity/GoodsCategory.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsAttrController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsAttrResultController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsAttrValueController.java rename src/main/java/com/gxwebsoft/{oa => shop}/controller/GoodsCategoryController.java (61%) create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsCommentController.java rename src/main/java/com/gxwebsoft/{oa => shop}/controller/GoodsController.java (74%) create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsCouponController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsDescriptionController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsLogController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsRelationController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsRuleController.java rename src/main/java/com/gxwebsoft/{oa => shop}/entity/Goods.java (68%) create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsAttr.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsAttrResult.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsAttrValue.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsCategory.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsComment.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsCoupon.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsDescription.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsLog.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsRelation.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsRule.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrResultMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrValueMapper.java rename src/main/java/com/gxwebsoft/{oa => shop}/mapper/GoodsCategoryMapper.java (80%) create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsCommentMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsCouponMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsDescriptionMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsLogMapper.java rename src/main/java/com/gxwebsoft/{oa => shop}/mapper/GoodsMapper.java (83%) create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsRelationMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsRuleMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrResultMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrValueMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCategoryMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCommentMapper.xml rename src/main/java/com/gxwebsoft/{oa/mapper/xml/GoodsCategoryMapper.xml => shop/mapper/xml/GoodsCouponMapper.xml} (64%) create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsDescriptionMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsLogMapper.xml rename src/main/java/com/gxwebsoft/{oa => shop}/mapper/xml/GoodsMapper.xml (78%) create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRelationMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRuleMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsAttrParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsAttrResultParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsAttrValueParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsCategoryParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsCommentParam.java rename src/main/java/com/gxwebsoft/{oa/param/GoodsCategoryParam.java => shop/param/GoodsCouponParam.java} (57%) create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsDescriptionParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsLogParam.java rename src/main/java/com/gxwebsoft/{oa => shop}/param/GoodsParam.java (89%) create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsRelationParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsRuleParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsAttrResultService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsAttrService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsAttrValueService.java rename src/main/java/com/gxwebsoft/{oa => shop}/service/GoodsCategoryService.java (76%) create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsCommentService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsCouponService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsDescriptionService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsLogService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsRelationService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsRuleService.java rename src/main/java/com/gxwebsoft/{oa => shop}/service/GoodsService.java (82%) create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrResultServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrValueServiceImpl.java rename src/main/java/com/gxwebsoft/{oa => shop}/service/impl/GoodsCategoryServiceImpl.java (73%) create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsCommentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsCouponServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsDescriptionServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsLogServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsRelationServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsRuleServiceImpl.java rename src/main/java/com/gxwebsoft/{oa => shop}/service/impl/GoodsServiceImpl.java (74%) create mode 100644 src/test/java/com/gxwebsoft/generator/templates/components.edit.vue.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/components.search.vue.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/index.ts.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/index.vue.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/model.ts.btl diff --git a/src/main/java/com/gxwebsoft/oa/entity/GoodsCategory.java b/src/main/java/com/gxwebsoft/oa/entity/GoodsCategory.java deleted file mode 100644 index 28405cb..0000000 --- a/src/main/java/com/gxwebsoft/oa/entity/GoodsCategory.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * 商品分类表 - * - * @author 科技小王子 - * @since 2024-03-01 12:37:25 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "GoodsCategory对象", description = "商品分类表") -@TableName("oa_goods_category") -public class GoodsCategory implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "category_id", type = IdType.AUTO) - private Integer categoryId; - - @ApiModelProperty(value = "分类名称") - private String name; - - @ApiModelProperty(value = "分类图标") - private String categoryImage; - - @ApiModelProperty(value = "分类编码") - private String code; - - @ApiModelProperty(value = "状态, 0正常, 1隐藏") - private Integer status; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "所有人") - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; - -} diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrController.java new file mode 100644 index 0000000..3796063 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrController.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsAttrService; +import com.gxwebsoft.shop.entity.GoodsAttr; +import com.gxwebsoft.shop.param.GoodsAttrParam; +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品属性表控制器 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Api(tags = "商品属性表管理") +@RestController +@RequestMapping("/api/shop/goods-attr") +public class GoodsAttrController extends BaseController { + @Resource + private GoodsAttrService goodsAttrService; + + @ApiOperation("分页查询商品属性表") + @GetMapping("/page") + public ApiResult> page(GoodsAttrParam param) { + // 使用关联查询 + return success(goodsAttrService.pageRel(param)); + } + + @ApiOperation("查询全部商品属性表") + @GetMapping() + public ApiResult> list(GoodsAttrParam param) { + // 使用关联查询 + return success(goodsAttrService.listRel(param)); + } + + @ApiOperation("根据id查询商品属性表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsAttrService.getByIdRel(id)); + } + + @ApiOperation("添加商品属性表") + @PostMapping() + public ApiResult save(@RequestBody GoodsAttr goodsAttr) { + // 记录当前登录用户id + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // goodsAttr.setUserId(loginUser.getUserId()); + // } + if (goodsAttrService.save(goodsAttr)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商品属性表") + @PutMapping() + public ApiResult update(@RequestBody GoodsAttr goodsAttr) { + if (goodsAttrService.updateById(goodsAttr)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商品属性表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsAttrService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品属性表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsAttrService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品属性表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsAttrService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品属性表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsAttrService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrResultController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrResultController.java new file mode 100644 index 0000000..ee70a68 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrResultController.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsAttrResultService; +import com.gxwebsoft.shop.entity.GoodsAttrResult; +import com.gxwebsoft.shop.param.GoodsAttrResultParam; +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品属性详情表控制器 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Api(tags = "商品属性详情表管理") +@RestController +@RequestMapping("/api/shop/goods-attr-result") +public class GoodsAttrResultController extends BaseController { + @Resource + private GoodsAttrResultService goodsAttrResultService; + + @ApiOperation("分页查询商品属性详情表") + @GetMapping("/page") + public ApiResult> page(GoodsAttrResultParam param) { + // 使用关联查询 + return success(goodsAttrResultService.pageRel(param)); + } + + @ApiOperation("查询全部商品属性详情表") + @GetMapping() + public ApiResult> list(GoodsAttrResultParam param) { + // 使用关联查询 + return success(goodsAttrResultService.listRel(param)); + } + + @ApiOperation("根据id查询商品属性详情表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsAttrResultService.getByIdRel(id)); + } + + @ApiOperation("添加商品属性详情表") + @PostMapping() + public ApiResult save(@RequestBody GoodsAttrResult goodsAttrResult) { + // 记录当前登录用户id + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // goodsAttrResult.setUserId(loginUser.getUserId()); + // } + if (goodsAttrResultService.save(goodsAttrResult)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商品属性详情表") + @PutMapping() + public ApiResult update(@RequestBody GoodsAttrResult goodsAttrResult) { + if (goodsAttrResultService.updateById(goodsAttrResult)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商品属性详情表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsAttrResultService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品属性详情表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsAttrResultService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品属性详情表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsAttrResultService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品属性详情表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsAttrResultService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrValueController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrValueController.java new file mode 100644 index 0000000..79a7f09 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrValueController.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsAttrValueService; +import com.gxwebsoft.shop.entity.GoodsAttrValue; +import com.gxwebsoft.shop.param.GoodsAttrValueParam; +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品属性值表控制器 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Api(tags = "商品属性值表管理") +@RestController +@RequestMapping("/api/shop/goods-attr-value") +public class GoodsAttrValueController extends BaseController { + @Resource + private GoodsAttrValueService goodsAttrValueService; + + @ApiOperation("分页查询商品属性值表") + @GetMapping("/page") + public ApiResult> page(GoodsAttrValueParam param) { + // 使用关联查询 + return success(goodsAttrValueService.pageRel(param)); + } + + @ApiOperation("查询全部商品属性值表") + @GetMapping() + public ApiResult> list(GoodsAttrValueParam param) { + // 使用关联查询 + return success(goodsAttrValueService.listRel(param)); + } + + @ApiOperation("根据id查询商品属性值表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsAttrValueService.getByIdRel(id)); + } + + @ApiOperation("添加商品属性值表") + @PostMapping() + public ApiResult save(@RequestBody GoodsAttrValue goodsAttrValue) { + // 记录当前登录用户id + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // goodsAttrValue.setUserId(loginUser.getUserId()); + // } + if (goodsAttrValueService.save(goodsAttrValue)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商品属性值表") + @PutMapping() + public ApiResult update(@RequestBody GoodsAttrValue goodsAttrValue) { + if (goodsAttrValueService.updateById(goodsAttrValue)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商品属性值表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsAttrValueService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品属性值表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsAttrValueService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品属性值表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsAttrValueService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品属性值表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsAttrValueService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/GoodsCategoryController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsCategoryController.java similarity index 61% rename from src/main/java/com/gxwebsoft/oa/controller/GoodsCategoryController.java rename to src/main/java/com/gxwebsoft/shop/controller/GoodsCategoryController.java index 066ebf4..225a83e 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/GoodsCategoryController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsCategoryController.java @@ -1,10 +1,13 @@ -package com.gxwebsoft.oa.controller; +package com.gxwebsoft.shop.controller; -import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.GoodsCategory; -import com.gxwebsoft.oa.param.GoodsCategoryParam; -import com.gxwebsoft.oa.service.GoodsCategoryService; +import com.gxwebsoft.shop.entity.GoodsCategory; +import com.gxwebsoft.shop.param.GoodsCategoryParam; +import com.gxwebsoft.shop.service.GoodsCategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -13,61 +16,54 @@ import javax.annotation.Resource; import java.util.List; /** - * 商品分类表控制器 + * 商品分类控制器 * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 19:34:16 */ -@Api(tags = "商品分类表管理") +@Api(tags = "商品分类管理") @RestController -@RequestMapping("/api/oa/goods-category") +@RequestMapping("/api/shop/goods-category") public class GoodsCategoryController extends BaseController { @Resource private GoodsCategoryService goodsCategoryService; - @ApiOperation("分页查询商品分类表") + @ApiOperation("分页查询商品分类") @GetMapping("/page") public ApiResult> page(GoodsCategoryParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(goodsCategoryService.page(page, page.getWrapper())); // 使用关联查询 - //return success(goodsCategoryService.pageRel(param)); + return success(goodsCategoryService.pageRel(param)); } - @ApiOperation("查询全部商品分类表") + @ApiOperation("查询全部商品分类") @GetMapping() public ApiResult> list(GoodsCategoryParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(goodsCategoryService.list(page.getOrderWrapper())); // 使用关联查询 - //return success(goodsCategoryService.listRel(param)); + return success(goodsCategoryService.listRel(param)); } - @ApiOperation("根据id查询商品分类表") + @ApiOperation("根据id查询商品分类") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { - return success(goodsCategoryService.getById(id)); // 使用关联查询 - //return success(goodsCategoryService.getByIdRel(id)); + return success(goodsCategoryService.getByIdRel(id)); } - @ApiOperation("添加商品分类表") + @ApiOperation("添加商品分类") @PostMapping() public ApiResult save(@RequestBody GoodsCategory goodsCategory) { // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { + User loginUser = getLoginUser(); + if (loginUser != null) { goodsCategory.setUserId(loginUser.getUserId()); - } + } if (goodsCategoryService.save(goodsCategory)) { return success("添加成功"); } return fail("添加失败"); } - @ApiOperation("修改商品分类表") + @ApiOperation("修改商品分类") @PutMapping() public ApiResult update(@RequestBody GoodsCategory goodsCategory) { if (goodsCategoryService.updateById(goodsCategory)) { @@ -76,7 +72,7 @@ public class GoodsCategoryController extends BaseController { return fail("修改失败"); } - @ApiOperation("删除商品分类表") + @ApiOperation("删除商品分类") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { if (goodsCategoryService.removeById(id)) { @@ -85,7 +81,7 @@ public class GoodsCategoryController extends BaseController { return fail("删除失败"); } - @ApiOperation("批量添加商品分类表") + @ApiOperation("批量添加商品分类") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { if (goodsCategoryService.saveBatch(list)) { @@ -94,7 +90,7 @@ public class GoodsCategoryController extends BaseController { return fail("添加失败"); } - @ApiOperation("批量修改商品分类表") + @ApiOperation("批量修改商品分类") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { if (batchParam.update(goodsCategoryService, "category_id")) { @@ -103,7 +99,7 @@ public class GoodsCategoryController extends BaseController { return fail("修改失败"); } - @ApiOperation("批量删除商品分类表") + @ApiOperation("批量删除商品分类") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { if (goodsCategoryService.removeByIds(ids)) { diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsCommentController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsCommentController.java new file mode 100644 index 0000000..c47b435 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsCommentController.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsCommentService; +import com.gxwebsoft.shop.entity.GoodsComment; +import com.gxwebsoft.shop.param.GoodsCommentParam; +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 评论表控制器 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Api(tags = "评论表管理") +@RestController +@RequestMapping("/api/shop/goods-comment") +public class GoodsCommentController extends BaseController { + @Resource + private GoodsCommentService goodsCommentService; + + @ApiOperation("分页查询评论表") + @GetMapping("/page") + public ApiResult> page(GoodsCommentParam param) { + // 使用关联查询 + return success(goodsCommentService.pageRel(param)); + } + + @ApiOperation("查询全部评论表") + @GetMapping() + public ApiResult> list(GoodsCommentParam param) { + // 使用关联查询 + return success(goodsCommentService.listRel(param)); + } + + @ApiOperation("根据id查询评论表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsCommentService.getByIdRel(id)); + } + + @ApiOperation("添加评论表") + @PostMapping() + public ApiResult save(@RequestBody GoodsComment goodsComment) { + // 记录当前登录用户id + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // goodsComment.setUserId(loginUser.getUserId()); + // } + if (goodsCommentService.save(goodsComment)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改评论表") + @PutMapping() + public ApiResult update(@RequestBody GoodsComment goodsComment) { + if (goodsCommentService.updateById(goodsComment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除评论表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsCommentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加评论表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsCommentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改评论表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsCommentService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除评论表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsCommentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/GoodsController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java similarity index 74% rename from src/main/java/com/gxwebsoft/oa/controller/GoodsController.java rename to src/main/java/com/gxwebsoft/shop/controller/GoodsController.java index 81ac154..956d7a9 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/GoodsController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java @@ -1,12 +1,18 @@ -package com.gxwebsoft.oa.controller; +package com.gxwebsoft.shop.controller; -import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsService; +import com.gxwebsoft.shop.entity.Goods; +import com.gxwebsoft.shop.param.GoodsParam; +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 com.gxwebsoft.oa.entity.Goods; -import com.gxwebsoft.oa.param.GoodsParam; -import com.gxwebsoft.oa.service.GoodsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -16,11 +22,11 @@ import java.util.List; * 商品记录表控制器 * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 20:00:50 */ @Api(tags = "商品记录表管理") @RestController -@RequestMapping("/api/oa/goods") +@RequestMapping("/api/shop/goods") public class GoodsController extends BaseController { @Resource private GoodsService goodsService; @@ -28,39 +34,32 @@ public class GoodsController extends BaseController { @ApiOperation("分页查询商品记录表") @GetMapping("/page") public ApiResult> page(GoodsParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(goodsService.page(page, page.getWrapper())); // 使用关联查询 - //return success(goodsService.pageRel(param)); + return success(goodsService.pageRel(param)); } @ApiOperation("查询全部商品记录表") @GetMapping() public ApiResult> list(GoodsParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(goodsService.list(page.getOrderWrapper())); // 使用关联查询 - //return success(goodsService.listRel(param)); + return success(goodsService.listRel(param)); } @ApiOperation("根据id查询商品记录表") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { - return success(goodsService.getById(id)); // 使用关联查询 - //return success(goodsService.getByIdRel(id)); + return success(goodsService.getByIdRel(id)); } @ApiOperation("添加商品记录表") @PostMapping() public ApiResult save(@RequestBody Goods goods) { // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { + User loginUser = getLoginUser(); + if (loginUser != null) { goods.setUserId(loginUser.getUserId()); - } + } if (goodsService.save(goods)) { return success("添加成功"); } diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsCouponController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsCouponController.java new file mode 100644 index 0000000..c5a6b80 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsCouponController.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsCouponService; +import com.gxwebsoft.shop.entity.GoodsCoupon; +import com.gxwebsoft.shop.param.GoodsCouponParam; +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品优惠券表控制器 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Api(tags = "商品优惠券表管理") +@RestController +@RequestMapping("/api/shop/goods-coupon") +public class GoodsCouponController extends BaseController { + @Resource + private GoodsCouponService goodsCouponService; + + @ApiOperation("分页查询商品优惠券表") + @GetMapping("/page") + public ApiResult> page(GoodsCouponParam param) { + // 使用关联查询 + return success(goodsCouponService.pageRel(param)); + } + + @ApiOperation("查询全部商品优惠券表") + @GetMapping() + public ApiResult> list(GoodsCouponParam param) { + // 使用关联查询 + return success(goodsCouponService.listRel(param)); + } + + @ApiOperation("根据id查询商品优惠券表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsCouponService.getByIdRel(id)); + } + + @ApiOperation("添加商品优惠券表") + @PostMapping() + public ApiResult save(@RequestBody GoodsCoupon goodsCoupon) { + // 记录当前登录用户id + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // goodsCoupon.setUserId(loginUser.getUserId()); + // } + if (goodsCouponService.save(goodsCoupon)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商品优惠券表") + @PutMapping() + public ApiResult update(@RequestBody GoodsCoupon goodsCoupon) { + if (goodsCouponService.updateById(goodsCoupon)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商品优惠券表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsCouponService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品优惠券表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsCouponService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品优惠券表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsCouponService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品优惠券表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsCouponService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsDescriptionController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsDescriptionController.java new file mode 100644 index 0000000..8e23dbf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsDescriptionController.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsDescriptionService; +import com.gxwebsoft.shop.entity.GoodsDescription; +import com.gxwebsoft.shop.param.GoodsDescriptionParam; +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品描述表控制器 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Api(tags = "商品描述表管理") +@RestController +@RequestMapping("/api/shop/goods-description") +public class GoodsDescriptionController extends BaseController { + @Resource + private GoodsDescriptionService goodsDescriptionService; + + @ApiOperation("分页查询商品描述表") + @GetMapping("/page") + public ApiResult> page(GoodsDescriptionParam param) { + // 使用关联查询 + return success(goodsDescriptionService.pageRel(param)); + } + + @ApiOperation("查询全部商品描述表") + @GetMapping() + public ApiResult> list(GoodsDescriptionParam param) { + // 使用关联查询 + return success(goodsDescriptionService.listRel(param)); + } + + @ApiOperation("根据id查询商品描述表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsDescriptionService.getByIdRel(id)); + } + + @ApiOperation("添加商品描述表") + @PostMapping() + public ApiResult save(@RequestBody GoodsDescription goodsDescription) { + // 记录当前登录用户id + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // goodsDescription.setUserId(loginUser.getUserId()); + // } + if (goodsDescriptionService.save(goodsDescription)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商品描述表") + @PutMapping() + public ApiResult update(@RequestBody GoodsDescription goodsDescription) { + if (goodsDescriptionService.updateById(goodsDescription)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商品描述表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsDescriptionService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品描述表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsDescriptionService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品描述表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsDescriptionService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品描述表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsDescriptionService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsLogController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsLogController.java new file mode 100644 index 0000000..ec87425 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsLogController.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsLogService; +import com.gxwebsoft.shop.entity.GoodsLog; +import com.gxwebsoft.shop.param.GoodsLogParam; +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品日志表控制器 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Api(tags = "商品日志表管理") +@RestController +@RequestMapping("/api/shop/goods-log") +public class GoodsLogController extends BaseController { + @Resource + private GoodsLogService goodsLogService; + + @ApiOperation("分页查询商品日志表") + @GetMapping("/page") + public ApiResult> page(GoodsLogParam param) { + // 使用关联查询 + return success(goodsLogService.pageRel(param)); + } + + @ApiOperation("查询全部商品日志表") + @GetMapping() + public ApiResult> list(GoodsLogParam param) { + // 使用关联查询 + return success(goodsLogService.listRel(param)); + } + + @ApiOperation("根据id查询商品日志表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsLogService.getByIdRel(id)); + } + + @ApiOperation("添加商品日志表") + @PostMapping() + public ApiResult save(@RequestBody GoodsLog goodsLog) { + // 记录当前登录用户id + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // goodsLog.setUserId(loginUser.getUserId()); + // } + if (goodsLogService.save(goodsLog)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商品日志表") + @PutMapping() + public ApiResult update(@RequestBody GoodsLog goodsLog) { + if (goodsLogService.updateById(goodsLog)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商品日志表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsLogService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品日志表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsLogService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品日志表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsLogService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品日志表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsLogService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsRelationController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsRelationController.java new file mode 100644 index 0000000..756b106 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsRelationController.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsRelationService; +import com.gxwebsoft.shop.entity.GoodsRelation; +import com.gxwebsoft.shop.param.GoodsRelationParam; +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品点赞和收藏表控制器 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Api(tags = "商品点赞和收藏表管理") +@RestController +@RequestMapping("/api/shop/goods-relation") +public class GoodsRelationController extends BaseController { + @Resource + private GoodsRelationService goodsRelationService; + + @ApiOperation("分页查询商品点赞和收藏表") + @GetMapping("/page") + public ApiResult> page(GoodsRelationParam param) { + // 使用关联查询 + return success(goodsRelationService.pageRel(param)); + } + + @ApiOperation("查询全部商品点赞和收藏表") + @GetMapping() + public ApiResult> list(GoodsRelationParam param) { + // 使用关联查询 + return success(goodsRelationService.listRel(param)); + } + + @ApiOperation("根据id查询商品点赞和收藏表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsRelationService.getByIdRel(id)); + } + + @ApiOperation("添加商品点赞和收藏表") + @PostMapping() + public ApiResult save(@RequestBody GoodsRelation goodsRelation) { + // 记录当前登录用户id + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // goodsRelation.setUserId(loginUser.getUserId()); + // } + if (goodsRelationService.save(goodsRelation)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商品点赞和收藏表") + @PutMapping() + public ApiResult update(@RequestBody GoodsRelation goodsRelation) { + if (goodsRelationService.updateById(goodsRelation)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商品点赞和收藏表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsRelationService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品点赞和收藏表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsRelationService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品点赞和收藏表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsRelationService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品点赞和收藏表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsRelationService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsRuleController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsRuleController.java new file mode 100644 index 0000000..aaa3254 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsRuleController.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.GoodsRuleService; +import com.gxwebsoft.shop.entity.GoodsRule; +import com.gxwebsoft.shop.param.GoodsRuleParam; +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品规则值(规格)表控制器 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Api(tags = "商品规则值(规格)表管理") +@RestController +@RequestMapping("/api/shop/goods-rule") +public class GoodsRuleController extends BaseController { + @Resource + private GoodsRuleService goodsRuleService; + + @ApiOperation("分页查询商品规则值(规格)表") + @GetMapping("/page") + public ApiResult> page(GoodsRuleParam param) { + // 使用关联查询 + return success(goodsRuleService.pageRel(param)); + } + + @ApiOperation("查询全部商品规则值(规格)表") + @GetMapping() + public ApiResult> list(GoodsRuleParam param) { + // 使用关联查询 + return success(goodsRuleService.listRel(param)); + } + + @ApiOperation("根据id查询商品规则值(规格)表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsRuleService.getByIdRel(id)); + } + + @ApiOperation("添加商品规则值(规格)表") + @PostMapping() + public ApiResult save(@RequestBody GoodsRule goodsRule) { + // 记录当前登录用户id + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // goodsRule.setUserId(loginUser.getUserId()); + // } + if (goodsRuleService.save(goodsRule)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商品规则值(规格)表") + @PutMapping() + public ApiResult update(@RequestBody GoodsRule goodsRule) { + if (goodsRuleService.updateById(goodsRule)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商品规则值(规格)表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsRuleService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品规则值(规格)表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsRuleService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品规则值(规格)表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsRuleService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品规则值(规格)表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsRuleService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/entity/Goods.java b/src/main/java/com/gxwebsoft/shop/entity/Goods.java similarity index 68% rename from src/main/java/com/gxwebsoft/oa/entity/Goods.java rename to src/main/java/com/gxwebsoft/shop/entity/Goods.java index 28b60fb..66bbcd5 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/Goods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/Goods.java @@ -1,25 +1,27 @@ -package com.gxwebsoft.oa.entity; +package com.gxwebsoft.shop.entity; -import com.baomidou.mybatisplus.annotation.*; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - /** * 商品记录表 * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 20:00:50 */ @Data @EqualsAndHashCode(callSuper = false) @ApiModel(value = "Goods对象", description = "商品记录表") -@TableName("oa_goods") +@TableName("shop_goods") public class Goods implements Serializable { private static final long serialVersionUID = 1L; @@ -36,6 +38,15 @@ public class Goods implements Serializable { @ApiModelProperty(value = "商品标题") private String title; + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "商品附件") + private String files; + @ApiModelProperty(value = "分类ID") private Integer categoryId; @@ -51,8 +62,14 @@ public class Goods implements Serializable { @ApiModelProperty(value = "销售价格") private BigDecimal salePrice; - @ApiModelProperty(value = "是否推荐") - private Boolean recommend; + @ApiModelProperty(value = "销量") + private Integer sales; + + @ApiModelProperty(value = "库存") + private Integer stock; + + @ApiModelProperty(value = "推荐") + private Integer recommend; @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") private Integer status; @@ -74,17 +91,9 @@ public class Goods implements Serializable { private Integer tenantId; @ApiModelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "分类名称") - @TableField(exist = false) - private String categoryName; - - @ApiModelProperty(value = "分类图标") - @TableField(exist = false) - private String categoryImage; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsAttr.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsAttr.java new file mode 100644 index 0000000..b168499 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsAttr.java @@ -0,0 +1,49 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品属性表 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsAttr对象", description = "商品属性表") +@TableName("shop_goods_attr") +public class GoodsAttr implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "属性名") + private String attrName; + + @ApiModelProperty(value = "属性值") + private String attrValues; + + @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团") + private Boolean type; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrResult.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrResult.java new file mode 100644 index 0000000..8ecd539 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrResult.java @@ -0,0 +1,45 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品属性详情表 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsAttrResult对象", description = "商品属性详情表") +@TableName("shop_goods_attr_result") +public class GoodsAttrResult implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "商品属性参数") + private String result; + + @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团") + private Boolean type; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrValue.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrValue.java new file mode 100644 index 0000000..761b4cc --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrValue.java @@ -0,0 +1,96 @@ +package com.gxwebsoft.shop.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品属性值表 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsAttrValue对象", description = "商品属性值表") +@TableName("shop_goods_attr_value") +public class GoodsAttrValue implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "商品属性索引值 (attr_value|attr_value[|....])") + private String suk; + + @ApiModelProperty(value = "属性对应的库存") + private Integer stock; + + @ApiModelProperty(value = "销量") + private Integer sales; + + @ApiModelProperty(value = "属性金额") + private BigDecimal price; + + @ApiModelProperty(value = "图片") + private String image; + + @ApiModelProperty(value = "唯一值") + private String unique; + + @ApiModelProperty(value = "成本价") + private BigDecimal cost; + + @ApiModelProperty(value = "商品条码") + private String barCode; + + @ApiModelProperty(value = "原价") + private BigDecimal otPrice; + + @ApiModelProperty(value = "重量") + private BigDecimal weight; + + @ApiModelProperty(value = "体积") + private BigDecimal volume; + + @ApiModelProperty(value = "一级返佣") + private BigDecimal brokerage; + + @ApiModelProperty(value = "二级返佣") + private BigDecimal brokerageTwo; + + @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团") + private Boolean type; + + @ApiModelProperty(value = "活动限购数量") + private Integer quota; + + @ApiModelProperty(value = "活动限购数量显示") + private Integer quotaShow; + + @ApiModelProperty(value = "attr_values 创建更新时的属性对应") + private String attrValue; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private LocalDateTime createTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsCategory.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsCategory.java new file mode 100644 index 0000000..4756231 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsCategory.java @@ -0,0 +1,92 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品分类 + * + * @author 科技小王子 + * @since 2024-03-30 19:34:16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsCategory对象", description = "商品分类") +@TableName("shop_goods_category") +public class GoodsCategory implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品分类ID") + @TableId(value = "category_id", type = IdType.AUTO) + private Integer categoryId; + + @ApiModelProperty(value = "分类标识") + private String categoryCode; + + @ApiModelProperty(value = "分类名称") + private String title; + + @ApiModelProperty(value = "类型 0列表 1单页 2外链") + private Integer type; + + @ApiModelProperty(value = "分类图片") + private String image; + + @ApiModelProperty(value = "上级分类ID") + private Integer parentId; + + @ApiModelProperty(value = "路由/链接地址") + private String path; + + @ApiModelProperty(value = "组件路径") + private String component; + + @ApiModelProperty(value = "绑定的页面") + private Integer pageId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "商品数量") + private Integer count; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") + private Integer hide; + + @ApiModelProperty(value = "是否推荐") + private Integer recommend; + + @ApiModelProperty(value = "是否显示在首页") + private Integer showIndex; + + @ApiModelProperty(value = "状态, 0正常, 1禁用") + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsComment.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsComment.java new file mode 100644 index 0000000..d8d4401 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsComment.java @@ -0,0 +1,98 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 评论表 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsComment对象", description = "评论表") +@TableName("shop_goods_comment") +public class GoodsComment implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评论ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "用户ID") + private Integer uid; + + @ApiModelProperty(value = "订单ID") + private Integer oid; + + @ApiModelProperty(value = "商品唯一id") + private String unique; + + @ApiModelProperty(value = "商品id") + private Integer goodsId; + + @ApiModelProperty(value = "某种商品类型(普通商品、秒杀商品）") + private String replyType; + + @ApiModelProperty(value = "商品分数") + private Boolean goodsScore; + + @ApiModelProperty(value = "服务分数") + private Boolean serviceScore; + + @ApiModelProperty(value = "评论内容") + private String comment; + + @ApiModelProperty(value = "评论图片") + private String pics; + + @ApiModelProperty(value = "管理员回复内容") + private String merchantReplyContent; + + @ApiModelProperty(value = "管理员回复时间") + private Integer merchantReplyTime; + + @ApiModelProperty(value = "0未删除1已删除") + private Boolean isDel; + + @ApiModelProperty(value = "0未回复1已回复") + private Boolean isReply; + + @ApiModelProperty(value = "用户名称") + private String nickname; + + @ApiModelProperty(value = "用户头像") + private String avatar; + + @ApiModelProperty(value = "商品规格属性值,多个,号隔开") + private String sku; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsCoupon.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsCoupon.java new file mode 100644 index 0000000..d051c53 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsCoupon.java @@ -0,0 +1,58 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品优惠券表 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsCoupon对象", description = "商品优惠券表") +@TableName("shop_goods_coupon") +public class GoodsCoupon implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "商品id") + private Integer goodsId; + + @ApiModelProperty(value = "优惠劵id") + private Integer issueCouponId; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsDescription.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsDescription.java new file mode 100644 index 0000000..364f553 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsDescription.java @@ -0,0 +1,40 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品描述表 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsDescription对象", description = "商品描述表") +@TableName("shop_goods_description") +public class GoodsDescription implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "商品详情") + private String description; + + @ApiModelProperty(value = "商品类型") + private Boolean type; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsLog.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsLog.java new file mode 100644 index 0000000..601402b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsLog.java @@ -0,0 +1,85 @@ +package com.gxwebsoft.shop.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品日志表 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsLog对象", description = "商品日志表") +@TableName("shop_goods_log") +public class GoodsLog implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "统计ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "类型visit,cart,order,pay,collect,refund") + private String type; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "是否浏览") + private Boolean visitNum; + + @ApiModelProperty(value = "加入购物车数量") + private Integer cartNum; + + @ApiModelProperty(value = "下单数量") + private Integer orderNum; + + @ApiModelProperty(value = "支付数量") + private Integer payNum; + + @ApiModelProperty(value = "支付金额") + private BigDecimal payPrice; + + @ApiModelProperty(value = "商品成本价") + private BigDecimal costPrice; + + @ApiModelProperty(value = "支付用户ID") + private Integer payUid; + + @ApiModelProperty(value = "退款数量") + private Integer refundNum; + + @ApiModelProperty(value = "退款金额") + private BigDecimal refundPrice; + + @ApiModelProperty(value = "收藏") + private Boolean collectNum; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + private Integer status; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsRelation.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsRelation.java new file mode 100644 index 0000000..40f2020 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsRelation.java @@ -0,0 +1,51 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品点赞和收藏表 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsRelation对象", description = "商品点赞和收藏表") +@TableName("shop_goods_relation") +public class GoodsRelation implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "类型(收藏(collect）、点赞(like))") + private String type; + + @ApiModelProperty(value = "某种类型的商品(普通商品、秒杀商品)") + private String category; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsRule.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsRule.java new file mode 100644 index 0000000..b355e49 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsRule.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品规则值(规格)表 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsRule对象", description = "商品规则值(规格)表") +@TableName("shop_goods_rule") +public class GoodsRule implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "规格名称") + private String ruleName; + + @ApiModelProperty(value = "规格值") + private String ruleValue; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrMapper.java new file mode 100644 index 0000000..5235394 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsAttr; +import com.gxwebsoft.shop.param.GoodsAttrParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品属性表Mapper + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsAttrMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsAttrParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsAttrParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrResultMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrResultMapper.java new file mode 100644 index 0000000..75c82f5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrResultMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsAttrResult; +import com.gxwebsoft.shop.param.GoodsAttrResultParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品属性详情表Mapper + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsAttrResultMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsAttrResultParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsAttrResultParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrValueMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrValueMapper.java new file mode 100644 index 0000000..9a5ebf3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrValueMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsAttrValue; +import com.gxwebsoft.shop.param.GoodsAttrValueParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品属性值表Mapper + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsAttrValueMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsAttrValueParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsAttrValueParam param); + +} diff --git a/src/main/java/com/gxwebsoft/oa/mapper/GoodsCategoryMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsCategoryMapper.java similarity index 80% rename from src/main/java/com/gxwebsoft/oa/mapper/GoodsCategoryMapper.java rename to src/main/java/com/gxwebsoft/shop/mapper/GoodsCategoryMapper.java index 16feed8..0c41d52 100644 --- a/src/main/java/com/gxwebsoft/oa/mapper/GoodsCategoryMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsCategoryMapper.java @@ -1,18 +1,18 @@ -package com.gxwebsoft.oa.mapper; +package com.gxwebsoft.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.GoodsCategory; -import com.gxwebsoft.oa.param.GoodsCategoryParam; +import com.gxwebsoft.shop.entity.GoodsCategory; +import com.gxwebsoft.shop.param.GoodsCategoryParam; import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 商品分类表Mapper + * 商品分类Mapper * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 19:34:16 */ public interface GoodsCategoryMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsCommentMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsCommentMapper.java new file mode 100644 index 0000000..0a09cbf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsCommentMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsComment; +import com.gxwebsoft.shop.param.GoodsCommentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 评论表Mapper + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsCommentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsCommentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsCommentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsCouponMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsCouponMapper.java new file mode 100644 index 0000000..fac9505 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsCouponMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsCoupon; +import com.gxwebsoft.shop.param.GoodsCouponParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品优惠券表Mapper + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsCouponMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsCouponParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsCouponParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsDescriptionMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsDescriptionMapper.java new file mode 100644 index 0000000..0a53678 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsDescriptionMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsDescription; +import com.gxwebsoft.shop.param.GoodsDescriptionParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品描述表Mapper + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsDescriptionMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsDescriptionParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsDescriptionParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsLogMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsLogMapper.java new file mode 100644 index 0000000..1fd3684 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsLogMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsLog; +import com.gxwebsoft.shop.param.GoodsLogParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品日志表Mapper + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsLogMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsLogParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsLogParam param); + +} diff --git a/src/main/java/com/gxwebsoft/oa/mapper/GoodsMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java similarity index 83% rename from src/main/java/com/gxwebsoft/oa/mapper/GoodsMapper.java rename to src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java index 48aee78..c6ca610 100644 --- a/src/main/java/com/gxwebsoft/oa/mapper/GoodsMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java @@ -1,9 +1,9 @@ -package com.gxwebsoft.oa.mapper; +package com.gxwebsoft.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.Goods; -import com.gxwebsoft.oa.param.GoodsParam; +import com.gxwebsoft.shop.entity.Goods; +import com.gxwebsoft.shop.param.GoodsParam; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,7 +12,7 @@ import java.util.List; * 商品记录表Mapper * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 20:00:50 */ public interface GoodsMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsRelationMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsRelationMapper.java new file mode 100644 index 0000000..f82c2e9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsRelationMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsRelation; +import com.gxwebsoft.shop.param.GoodsRelationParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品点赞和收藏表Mapper + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsRelationMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsRelationParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsRelationParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsRuleMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsRuleMapper.java new file mode 100644 index 0000000..8933548 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsRuleMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsRule; +import com.gxwebsoft.shop.param.GoodsRuleParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品规则值(规格)表Mapper + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsRuleMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsRuleParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsRuleParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrMapper.xml new file mode 100644 index 0000000..a52d343 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrMapper.xml @@ -0,0 +1,48 @@ + + + + + + + SELECT a.* + FROM shop_goods_attr a + + + AND a.id = #{param.id} + + + AND a.goods_id = #{param.goodsId} + + + AND a.attr_name LIKE CONCAT('%', #{param.attrName}, '%') + + + AND a.attr_values LIKE CONCAT('%', #{param.attrValues}, '%') + + + AND a.type = #{param.type} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrResultMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrResultMapper.xml new file mode 100644 index 0000000..d0c0715 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrResultMapper.xml @@ -0,0 +1,39 @@ + + + + + + + SELECT a.* + FROM shop_goods_attr_result a + + + AND a.id = #{param.id} + + + AND a.goods_id = #{param.goodsId} + + + AND a.result LIKE CONCAT('%', #{param.result}, '%') + + + AND a.type = #{param.type} + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrValueMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrValueMapper.xml new file mode 100644 index 0000000..0c80cdc --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrValueMapper.xml @@ -0,0 +1,96 @@ + + + + + + + SELECT a.* + FROM shop_goods_attr_value a + + + AND a.id = #{param.id} + + + AND a.goods_id = #{param.goodsId} + + + AND a.suk LIKE CONCAT('%', #{param.suk}, '%') + + + AND a.stock = #{param.stock} + + + AND a.sales = #{param.sales} + + + AND a.price = #{param.price} + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.unique LIKE CONCAT('%', #{param.unique}, '%') + + + AND a.cost = #{param.cost} + + + AND a.bar_code LIKE CONCAT('%', #{param.barCode}, '%') + + + AND a.ot_price = #{param.otPrice} + + + AND a.weight = #{param.weight} + + + AND a.volume = #{param.volume} + + + AND a.brokerage = #{param.brokerage} + + + AND a.brokerage_two = #{param.brokerageTwo} + + + AND a.type = #{param.type} + + + AND a.quota = #{param.quota} + + + AND a.quota_show = #{param.quotaShow} + + + AND a.attr_value LIKE CONCAT('%', #{param.attrValue}, '%') + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCategoryMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCategoryMapper.xml new file mode 100644 index 0000000..a1fa939 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCategoryMapper.xml @@ -0,0 +1,90 @@ + + + + + + + SELECT a.* + FROM shop_goods_category a + + + AND a.category_id = #{param.categoryId} + + + AND a.category_code LIKE CONCAT('%', #{param.categoryCode}, '%') + + + AND a.title LIKE CONCAT('%', #{param.title}, '%') + + + AND a.type = #{param.type} + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.parent_id = #{param.parentId} + + + AND a.path LIKE CONCAT('%', #{param.path}, '%') + + + AND a.component LIKE CONCAT('%', #{param.component}, '%') + + + AND a.page_id = #{param.pageId} + + + AND a.user_id = #{param.userId} + + + AND a.count = #{param.count} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.hide = #{param.hide} + + + AND a.recommend = #{param.recommend} + + + AND a.show_index = #{param.showIndex} + + + AND a.status = #{param.status} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCommentMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCommentMapper.xml new file mode 100644 index 0000000..fef85e4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCommentMapper.xml @@ -0,0 +1,96 @@ + + + + + + + SELECT a.* + FROM shop_goods_comment a + + + AND a.id = #{param.id} + + + AND a.uid = #{param.uid} + + + AND a.oid = #{param.oid} + + + AND a.unique LIKE CONCAT('%', #{param.unique}, '%') + + + AND a.goods_id = #{param.goodsId} + + + AND a.reply_type LIKE CONCAT('%', #{param.replyType}, '%') + + + AND a.goods_score = #{param.goodsScore} + + + AND a.service_score = #{param.serviceScore} + + + AND a.comment LIKE CONCAT('%', #{param.comment}, '%') + + + AND a.pics LIKE CONCAT('%', #{param.pics}, '%') + + + AND a.merchant_reply_content LIKE CONCAT('%', #{param.merchantReplyContent}, '%') + + + AND a.merchant_reply_time = #{param.merchantReplyTime} + + + AND a.is_del = #{param.isDel} + + + AND a.is_reply = #{param.isReply} + + + AND a.nickname LIKE CONCAT('%', #{param.nickname}, '%') + + + AND a.avatar LIKE CONCAT('%', #{param.avatar}, '%') + + + AND a.sku LIKE CONCAT('%', #{param.sku}, '%') + + + AND a.status = #{param.status} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.user_id = #{param.userId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/GoodsCategoryMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCouponMapper.xml similarity index 64% rename from src/main/java/com/gxwebsoft/oa/mapper/xml/GoodsCategoryMapper.xml rename to src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCouponMapper.xml index 1021758..c504511 100644 --- a/src/main/java/com/gxwebsoft/oa/mapper/xml/GoodsCategoryMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCouponMapper.xml @@ -1,32 +1,26 @@ - + SELECT a.* - FROM oa_goods_category a + FROM shop_goods_coupon a - - AND a.category_id = #{param.categoryId} + + AND a.id = #{param.id} - - AND a.name LIKE CONCAT('%', #{param.name}, '%') + + AND a.goods_id = #{param.goodsId} - - AND a.code LIKE CONCAT('%', #{param.code}, '%') - - - AND a.status = #{param.status} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + AND a.issue_coupon_id = #{param.issueCouponId} AND a.sort_number = #{param.sortNumber} - - AND a.user_id = #{param.userId} + + AND a.status = #{param.status} AND a.deleted = #{param.deleted} @@ -34,22 +28,29 @@ AND a.deleted = 0 + + AND a.user_id = #{param.userId} + AND a.create_time >= #{param.createTimeStart} AND a.create_time <= #{param.createTimeEnd} + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + - - diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsDescriptionMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsDescriptionMapper.xml new file mode 100644 index 0000000..3732b59 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsDescriptionMapper.xml @@ -0,0 +1,39 @@ + + + + + + + SELECT a.* + FROM shop_goods_description a + + + AND a.id = #{param.id} + + + AND a.goods_id = #{param.goodsId} + + + AND a.description LIKE CONCAT('%', #{param.description}, '%') + + + AND a.type = #{param.type} + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsLogMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsLogMapper.xml new file mode 100644 index 0000000..f1d5c64 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsLogMapper.xml @@ -0,0 +1,81 @@ + + + + + + + SELECT a.* + FROM shop_goods_log a + + + AND a.id = #{param.id} + + + AND a.type LIKE CONCAT('%', #{param.type}, '%') + + + AND a.goods_id = #{param.goodsId} + + + AND a.visit_num = #{param.visitNum} + + + AND a.cart_num = #{param.cartNum} + + + AND a.order_num = #{param.orderNum} + + + AND a.pay_num = #{param.payNum} + + + AND a.pay_price = #{param.payPrice} + + + AND a.cost_price = #{param.costPrice} + + + AND a.pay_uid = #{param.payUid} + + + AND a.refund_num = #{param.refundNum} + + + AND a.refund_price = #{param.refundPrice} + + + AND a.collect_num = #{param.collectNum} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.status = #{param.status} + + + AND a.user_id = #{param.userId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/GoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml similarity index 78% rename from src/main/java/com/gxwebsoft/oa/mapper/xml/GoodsMapper.xml rename to src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml index 9f1271f..2726e28 100644 --- a/src/main/java/com/gxwebsoft/oa/mapper/xml/GoodsMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml @@ -1,12 +1,11 @@ - + - SELECT a.*,b.name,b.avatar - FROM oa_goods a - LEFT JOIN oa_goods_categroy b ON a.goods_id = b.goods_id + SELECT a.* + FROM shop_goods a AND a.goods_id = #{param.goodsId} @@ -20,6 +19,9 @@ AND a.title LIKE CONCAT('%', #{param.title}, '%') + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + AND a.category_id = #{param.categoryId} @@ -35,6 +37,9 @@ AND a.sale_price = #{param.salePrice} + + AND a.recommend = #{param.recommend} + AND a.status = #{param.status} @@ -59,16 +64,20 @@ AND a.create_time <= #{param.createTimeEnd} + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + - - diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRelationMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRelationMapper.xml new file mode 100644 index 0000000..1ba029d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRelationMapper.xml @@ -0,0 +1,48 @@ + + + + + + + SELECT a.* + FROM shop_goods_relation a + + + AND a.id = #{param.id} + + + AND a.user_id = #{param.userId} + + + AND a.goods_id = #{param.goodsId} + + + AND a.type LIKE CONCAT('%', #{param.type}, '%') + + + AND a.category LIKE CONCAT('%', #{param.category}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRuleMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRuleMapper.xml new file mode 100644 index 0000000..120e4f9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRuleMapper.xml @@ -0,0 +1,36 @@ + + + + + + + SELECT a.* + FROM shop_goods_rule a + + + AND a.id = #{param.id} + + + AND a.rule_name LIKE CONCAT('%', #{param.ruleName}, '%') + + + AND a.rule_value LIKE CONCAT('%', #{param.ruleValue}, '%') + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsAttrParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsAttrParam.java new file mode 100644 index 0000000..412695c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsAttrParam.java @@ -0,0 +1,48 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品属性表查询参数 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsAttrParam对象", description = "商品属性表查询参数") +public class GoodsAttrParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "属性名") + private String attrName; + + @ApiModelProperty(value = "属性值") + private String attrValues; + + @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团") + @QueryField(type = QueryType.EQ) + private Boolean type; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsAttrResultParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsAttrResultParam.java new file mode 100644 index 0000000..71cc63e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsAttrResultParam.java @@ -0,0 +1,41 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品属性详情表查询参数 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsAttrResultParam对象", description = "商品属性详情表查询参数") +public class GoodsAttrResultParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "商品属性参数") + private String result; + + @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团") + @QueryField(type = QueryType.EQ) + private Boolean type; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsAttrValueParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsAttrValueParam.java new file mode 100644 index 0000000..c866a2c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsAttrValueParam.java @@ -0,0 +1,101 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品属性值表查询参数 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsAttrValueParam对象", description = "商品属性值表查询参数") +public class GoodsAttrValueParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "商品属性索引值 (attr_value|attr_value[|....])") + private String suk; + + @ApiModelProperty(value = "属性对应的库存") + @QueryField(type = QueryType.EQ) + private Integer stock; + + @ApiModelProperty(value = "销量") + @QueryField(type = QueryType.EQ) + private Integer sales; + + @ApiModelProperty(value = "属性金额") + @QueryField(type = QueryType.EQ) + private BigDecimal price; + + @ApiModelProperty(value = "图片") + private String image; + + @ApiModelProperty(value = "唯一值") + private String unique; + + @ApiModelProperty(value = "成本价") + @QueryField(type = QueryType.EQ) + private BigDecimal cost; + + @ApiModelProperty(value = "商品条码") + private String barCode; + + @ApiModelProperty(value = "原价") + @QueryField(type = QueryType.EQ) + private BigDecimal otPrice; + + @ApiModelProperty(value = "重量") + @QueryField(type = QueryType.EQ) + private BigDecimal weight; + + @ApiModelProperty(value = "体积") + @QueryField(type = QueryType.EQ) + private BigDecimal volume; + + @ApiModelProperty(value = "一级返佣") + @QueryField(type = QueryType.EQ) + private BigDecimal brokerage; + + @ApiModelProperty(value = "二级返佣") + @QueryField(type = QueryType.EQ) + private BigDecimal brokerageTwo; + + @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团") + @QueryField(type = QueryType.EQ) + private Boolean type; + + @ApiModelProperty(value = "活动限购数量") + @QueryField(type = QueryType.EQ) + private Integer quota; + + @ApiModelProperty(value = "活动限购数量显示") + @QueryField(type = QueryType.EQ) + private Integer quotaShow; + + @ApiModelProperty(value = "attr_values 创建更新时的属性对应") + private String attrValue; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsCategoryParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsCategoryParam.java new file mode 100644 index 0000000..a6e383d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsCategoryParam.java @@ -0,0 +1,92 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品分类查询参数 + * + * @author 科技小王子 + * @since 2024-03-30 19:34:16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsCategoryParam对象", description = "商品分类查询参数") +public class GoodsCategoryParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品分类ID") + @QueryField(type = QueryType.EQ) + private Integer categoryId; + + @ApiModelProperty(value = "分类标识") + private String categoryCode; + + @ApiModelProperty(value = "分类名称") + private String title; + + @ApiModelProperty(value = "类型 0列表 1单页 2外链") + @QueryField(type = QueryType.EQ) + private Integer type; + + @ApiModelProperty(value = "分类图片") + private String image; + + @ApiModelProperty(value = "上级分类ID") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "路由/链接地址") + private String path; + + @ApiModelProperty(value = "组件路径") + private String component; + + @ApiModelProperty(value = "绑定的页面") + @QueryField(type = QueryType.EQ) + private Integer pageId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "商品数量") + @QueryField(type = QueryType.EQ) + private Integer count; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") + @QueryField(type = QueryType.EQ) + private Integer hide; + + @ApiModelProperty(value = "是否推荐") + @QueryField(type = QueryType.EQ) + private Integer recommend; + + @ApiModelProperty(value = "是否显示在首页") + @QueryField(type = QueryType.EQ) + private Integer showIndex; + + @ApiModelProperty(value = "状态, 0正常, 1禁用") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsCommentParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsCommentParam.java new file mode 100644 index 0000000..c177c85 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsCommentParam.java @@ -0,0 +1,98 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 评论表查询参数 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsCommentParam对象", description = "评论表查询参数") +public class GoodsCommentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评论ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer uid; + + @ApiModelProperty(value = "订单ID") + @QueryField(type = QueryType.EQ) + private Integer oid; + + @ApiModelProperty(value = "商品唯一id") + private String unique; + + @ApiModelProperty(value = "商品id") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "某种商品类型(普通商品、秒杀商品）") + private String replyType; + + @ApiModelProperty(value = "商品分数") + @QueryField(type = QueryType.EQ) + private Boolean goodsScore; + + @ApiModelProperty(value = "服务分数") + @QueryField(type = QueryType.EQ) + private Boolean serviceScore; + + @ApiModelProperty(value = "评论内容") + private String comment; + + @ApiModelProperty(value = "评论图片") + private String pics; + + @ApiModelProperty(value = "管理员回复内容") + private String merchantReplyContent; + + @ApiModelProperty(value = "管理员回复时间") + @QueryField(type = QueryType.EQ) + private Integer merchantReplyTime; + + @ApiModelProperty(value = "0未删除1已删除") + @QueryField(type = QueryType.EQ) + private Boolean isDel; + + @ApiModelProperty(value = "0未回复1已回复") + @QueryField(type = QueryType.EQ) + private Boolean isReply; + + @ApiModelProperty(value = "用户名称") + private String nickname; + + @ApiModelProperty(value = "用户头像") + private String avatar; + + @ApiModelProperty(value = "商品规格属性值,多个,号隔开") + private String sku; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + +} diff --git a/src/main/java/com/gxwebsoft/oa/param/GoodsCategoryParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsCouponParam.java similarity index 57% rename from src/main/java/com/gxwebsoft/oa/param/GoodsCategoryParam.java rename to src/main/java/com/gxwebsoft/shop/param/GoodsCouponParam.java index 8d6a27c..4a3dec5 100644 --- a/src/main/java/com/gxwebsoft/oa/param/GoodsCategoryParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsCouponParam.java @@ -1,5 +1,6 @@ -package com.gxwebsoft.oa.param; +package com.gxwebsoft.shop.param; +import java.math.BigDecimal; import com.gxwebsoft.common.core.annotation.QueryField; import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; @@ -10,45 +11,43 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 商品分类表查询参数 + * 商品优惠券表查询参数 * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 19:09:56 */ @Data @EqualsAndHashCode(callSuper = false) @JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "GoodsCategoryParam对象", description = "商品分类表查询参数") -public class GoodsCategoryParam extends BaseParam { +@ApiModel(value = "GoodsCouponParam对象", description = "商品优惠券表查询参数") +public class GoodsCouponParam extends BaseParam { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "自增ID") @QueryField(type = QueryType.EQ) - private Integer categoryId; + private Integer id; - @ApiModelProperty(value = "分类名称") - private String name; - - @ApiModelProperty(value = "分类编码") - private String code; - - @ApiModelProperty(value = "状态, 0正常, 1隐藏") + @ApiModelProperty(value = "商品id") @QueryField(type = QueryType.EQ) - private Integer status; + private Integer goodsId; - @ApiModelProperty(value = "备注") - private String comments; + @ApiModelProperty(value = "优惠劵id") + @QueryField(type = QueryType.EQ) + private Integer issueCouponId; - @ApiModelProperty(value = "排序号") + @ApiModelProperty(value = "排序(数字越小越靠前)") @QueryField(type = QueryType.EQ) private Integer sortNumber; - @ApiModelProperty(value = "所有人") + @ApiModelProperty(value = "状态, 0正常, 1冻结") @QueryField(type = QueryType.EQ) - private Integer userId; + private Integer status; @ApiModelProperty(value = "是否删除, 0否, 1是") @QueryField(type = QueryType.EQ) private Integer deleted; + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + } diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsDescriptionParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsDescriptionParam.java new file mode 100644 index 0000000..ebaf0c2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsDescriptionParam.java @@ -0,0 +1,40 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品描述表查询参数 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsDescriptionParam对象", description = "商品描述表查询参数") +public class GoodsDescriptionParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "商品详情") + private String description; + + @ApiModelProperty(value = "商品类型") + @QueryField(type = QueryType.EQ) + private Boolean type; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsLogParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsLogParam.java new file mode 100644 index 0000000..2872ef1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsLogParam.java @@ -0,0 +1,89 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品日志表查询参数 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsLogParam对象", description = "商品日志表查询参数") +public class GoodsLogParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "统计ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "类型visit,cart,order,pay,collect,refund") + private String type; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "是否浏览") + @QueryField(type = QueryType.EQ) + private Boolean visitNum; + + @ApiModelProperty(value = "加入购物车数量") + @QueryField(type = QueryType.EQ) + private Integer cartNum; + + @ApiModelProperty(value = "下单数量") + @QueryField(type = QueryType.EQ) + private Integer orderNum; + + @ApiModelProperty(value = "支付数量") + @QueryField(type = QueryType.EQ) + private Integer payNum; + + @ApiModelProperty(value = "支付金额") + @QueryField(type = QueryType.EQ) + private BigDecimal payPrice; + + @ApiModelProperty(value = "商品成本价") + @QueryField(type = QueryType.EQ) + private BigDecimal costPrice; + + @ApiModelProperty(value = "支付用户ID") + @QueryField(type = QueryType.EQ) + private Integer payUid; + + @ApiModelProperty(value = "退款数量") + @QueryField(type = QueryType.EQ) + private Integer refundNum; + + @ApiModelProperty(value = "退款金额") + @QueryField(type = QueryType.EQ) + private BigDecimal refundPrice; + + @ApiModelProperty(value = "收藏") + @QueryField(type = QueryType.EQ) + private Boolean collectNum; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + +} diff --git a/src/main/java/com/gxwebsoft/oa/param/GoodsParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java similarity index 89% rename from src/main/java/com/gxwebsoft/oa/param/GoodsParam.java rename to src/main/java/com/gxwebsoft/shop/param/GoodsParam.java index de9f73b..b81723b 100644 --- a/src/main/java/com/gxwebsoft/oa/param/GoodsParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java @@ -1,21 +1,20 @@ -package com.gxwebsoft.oa.param; +package com.gxwebsoft.shop.param; -import com.fasterxml.jackson.annotation.JsonInclude; +import java.math.BigDecimal; import com.gxwebsoft.common.core.annotation.QueryField; import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; - /** * 商品记录表查询参数 * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 20:00:50 */ @Data @EqualsAndHashCode(callSuper = false) @@ -38,6 +37,9 @@ public class GoodsParam extends BaseParam { @ApiModelProperty(value = "商品标题") private String title; + @ApiModelProperty(value = "商品详情") + private String content; + @ApiModelProperty(value = "分类ID") @QueryField(type = QueryType.EQ) private Integer categoryId; @@ -56,6 +58,10 @@ public class GoodsParam extends BaseParam { @QueryField(type = QueryType.EQ) private BigDecimal salePrice; + @ApiModelProperty(value = "推荐") + @QueryField(type = QueryType.EQ) + private Integer recommend; + @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") @QueryField(type = QueryType.EQ) private Integer status; diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsRelationParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsRelationParam.java new file mode 100644 index 0000000..735ea4a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsRelationParam.java @@ -0,0 +1,44 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品点赞和收藏表查询参数 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsRelationParam对象", description = "商品点赞和收藏表查询参数") +public class GoodsRelationParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "类型(收藏(collect）、点赞(like))") + private String type; + + @ApiModelProperty(value = "某种类型的商品(普通商品、秒杀商品)") + private String category; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsRuleParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsRuleParam.java new file mode 100644 index 0000000..f2e851b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsRuleParam.java @@ -0,0 +1,35 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品规则值(规格)表查询参数 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsRuleParam对象", description = "商品规则值(规格)表查询参数") +public class GoodsRuleParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "规格名称") + private String ruleName; + + @ApiModelProperty(value = "规格值") + private String ruleValue; + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsAttrResultService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsAttrResultService.java new file mode 100644 index 0000000..502cf65 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsAttrResultService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsAttrResult; +import com.gxwebsoft.shop.param.GoodsAttrResultParam; + +import java.util.List; + +/** + * 商品属性详情表Service + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsAttrResultService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsAttrResultParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsAttrResultParam param); + + /** + * 根据id查询 + * + * @param id 主键 + * @return GoodsAttrResult + */ + GoodsAttrResult getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsAttrService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsAttrService.java new file mode 100644 index 0000000..b885af2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsAttrService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsAttr; +import com.gxwebsoft.shop.param.GoodsAttrParam; + +import java.util.List; + +/** + * 商品属性表Service + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsAttrService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsAttrParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsAttrParam param); + + /** + * 根据id查询 + * + * @param id 主键 + * @return GoodsAttr + */ + GoodsAttr getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsAttrValueService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsAttrValueService.java new file mode 100644 index 0000000..2fdb57d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsAttrValueService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsAttrValue; +import com.gxwebsoft.shop.param.GoodsAttrValueParam; + +import java.util.List; + +/** + * 商品属性值表Service + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsAttrValueService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsAttrValueParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsAttrValueParam param); + + /** + * 根据id查询 + * + * @param id 主键 + * @return GoodsAttrValue + */ + GoodsAttrValue getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/GoodsCategoryService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsCategoryService.java similarity index 76% rename from src/main/java/com/gxwebsoft/oa/service/GoodsCategoryService.java rename to src/main/java/com/gxwebsoft/shop/service/GoodsCategoryService.java index 01d079e..197f068 100644 --- a/src/main/java/com/gxwebsoft/oa/service/GoodsCategoryService.java +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsCategoryService.java @@ -1,17 +1,17 @@ -package com.gxwebsoft.oa.service; +package com.gxwebsoft.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.GoodsCategory; -import com.gxwebsoft.oa.param.GoodsCategoryParam; +import com.gxwebsoft.shop.entity.GoodsCategory; +import com.gxwebsoft.shop.param.GoodsCategoryParam; import java.util.List; /** - * 商品分类表Service + * 商品分类Service * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 19:34:16 */ public interface GoodsCategoryService extends IService { @@ -34,7 +34,7 @@ public interface GoodsCategoryService extends IService { /** * 根据id查询 * - * @param categoryId 自增ID + * @param categoryId 商品分类ID * @return GoodsCategory */ GoodsCategory getByIdRel(Integer categoryId); diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsCommentService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsCommentService.java new file mode 100644 index 0000000..5021bdf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsCommentService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsComment; +import com.gxwebsoft.shop.param.GoodsCommentParam; + +import java.util.List; + +/** + * 评论表Service + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsCommentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsCommentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsCommentParam param); + + /** + * 根据id查询 + * + * @param id 评论ID + * @return GoodsComment + */ + GoodsComment getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsCouponService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsCouponService.java new file mode 100644 index 0000000..bad7e8b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsCouponService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsCoupon; +import com.gxwebsoft.shop.param.GoodsCouponParam; + +import java.util.List; + +/** + * 商品优惠券表Service + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsCouponService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsCouponParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsCouponParam param); + + /** + * 根据id查询 + * + * @param id + * @return GoodsCoupon + */ + GoodsCoupon getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsDescriptionService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsDescriptionService.java new file mode 100644 index 0000000..a2f1aed --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsDescriptionService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsDescription; +import com.gxwebsoft.shop.param.GoodsDescriptionParam; + +import java.util.List; + +/** + * 商品描述表Service + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsDescriptionService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsDescriptionParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsDescriptionParam param); + + /** + * 根据id查询 + * + * @param id + * @return GoodsDescription + */ + GoodsDescription getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsLogService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsLogService.java new file mode 100644 index 0000000..c210807 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsLogService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsLog; +import com.gxwebsoft.shop.param.GoodsLogParam; + +import java.util.List; + +/** + * 商品日志表Service + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsLogService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsLogParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsLogParam param); + + /** + * 根据id查询 + * + * @param id 统计ID + * @return GoodsLog + */ + GoodsLog getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsRelationService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsRelationService.java new file mode 100644 index 0000000..a052e0e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsRelationService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsRelation; +import com.gxwebsoft.shop.param.GoodsRelationParam; + +import java.util.List; + +/** + * 商品点赞和收藏表Service + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsRelationService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsRelationParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsRelationParam param); + + /** + * 根据id查询 + * + * @param id id + * @return GoodsRelation + */ + GoodsRelation getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsRuleService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsRuleService.java new file mode 100644 index 0000000..d85a3c7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsRuleService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsRule; +import com.gxwebsoft.shop.param.GoodsRuleParam; + +import java.util.List; + +/** + * 商品规则值(规格)表Service + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +public interface GoodsRuleService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsRuleParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsRuleParam param); + + /** + * 根据id查询 + * + * @param id + * @return GoodsRule + */ + GoodsRule getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/GoodsService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsService.java similarity index 82% rename from src/main/java/com/gxwebsoft/oa/service/GoodsService.java rename to src/main/java/com/gxwebsoft/shop/service/GoodsService.java index 085f650..f4f28a0 100644 --- a/src/main/java/com/gxwebsoft/oa/service/GoodsService.java +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsService.java @@ -1,9 +1,9 @@ -package com.gxwebsoft.oa.service; +package com.gxwebsoft.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.Goods; -import com.gxwebsoft.oa.param.GoodsParam; +import com.gxwebsoft.shop.entity.Goods; +import com.gxwebsoft.shop.param.GoodsParam; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 商品记录表Service * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 20:00:50 */ public interface GoodsService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrResultServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrResultServiceImpl.java new file mode 100644 index 0000000..6d60f62 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrResultServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsAttrResultMapper; +import com.gxwebsoft.shop.service.GoodsAttrResultService; +import com.gxwebsoft.shop.entity.GoodsAttrResult; +import com.gxwebsoft.shop.param.GoodsAttrResultParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品属性详情表Service实现 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Service +public class GoodsAttrResultServiceImpl extends ServiceImpl implements GoodsAttrResultService { + + @Override + public PageResult pageRel(GoodsAttrResultParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsAttrResultParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsAttrResult getByIdRel(Integer id) { + GoodsAttrResultParam param = new GoodsAttrResultParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrServiceImpl.java new file mode 100644 index 0000000..5102c5d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsAttrMapper; +import com.gxwebsoft.shop.service.GoodsAttrService; +import com.gxwebsoft.shop.entity.GoodsAttr; +import com.gxwebsoft.shop.param.GoodsAttrParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品属性表Service实现 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Service +public class GoodsAttrServiceImpl extends ServiceImpl implements GoodsAttrService { + + @Override + public PageResult pageRel(GoodsAttrParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsAttrParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsAttr getByIdRel(Integer id) { + GoodsAttrParam param = new GoodsAttrParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrValueServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrValueServiceImpl.java new file mode 100644 index 0000000..dd3d666 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrValueServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsAttrValueMapper; +import com.gxwebsoft.shop.service.GoodsAttrValueService; +import com.gxwebsoft.shop.entity.GoodsAttrValue; +import com.gxwebsoft.shop.param.GoodsAttrValueParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品属性值表Service实现 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Service +public class GoodsAttrValueServiceImpl extends ServiceImpl implements GoodsAttrValueService { + + @Override + public PageResult pageRel(GoodsAttrValueParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsAttrValueParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsAttrValue getByIdRel(Integer id) { + GoodsAttrValueParam param = new GoodsAttrValueParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/GoodsCategoryServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCategoryServiceImpl.java similarity index 73% rename from src/main/java/com/gxwebsoft/oa/service/impl/GoodsCategoryServiceImpl.java rename to src/main/java/com/gxwebsoft/shop/service/impl/GoodsCategoryServiceImpl.java index 5d4b203..51f67ee 100644 --- a/src/main/java/com/gxwebsoft/oa/service/impl/GoodsCategoryServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCategoryServiceImpl.java @@ -1,10 +1,10 @@ -package com.gxwebsoft.oa.service.impl; +package com.gxwebsoft.shop.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.GoodsCategoryMapper; -import com.gxwebsoft.oa.service.GoodsCategoryService; -import com.gxwebsoft.oa.entity.GoodsCategory; -import com.gxwebsoft.oa.param.GoodsCategoryParam; +import com.gxwebsoft.shop.mapper.GoodsCategoryMapper; +import com.gxwebsoft.shop.service.GoodsCategoryService; +import com.gxwebsoft.shop.entity.GoodsCategory; +import com.gxwebsoft.shop.param.GoodsCategoryParam; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; import org.springframework.stereotype.Service; @@ -12,10 +12,10 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * 商品分类表Service实现 + * 商品分类Service实现 * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 19:34:16 */ @Service public class GoodsCategoryServiceImpl extends ServiceImpl implements GoodsCategoryService { @@ -23,7 +23,7 @@ public class GoodsCategoryServiceImpl extends ServiceImpl pageRel(GoodsCategoryParam param) { PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number asc, create_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -33,7 +33,7 @@ public class GoodsCategoryServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param); // 排序 PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number asc, create_time desc"); return page.sortRecords(list); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCommentServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCommentServiceImpl.java new file mode 100644 index 0000000..39ac7ac --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCommentServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsCommentMapper; +import com.gxwebsoft.shop.service.GoodsCommentService; +import com.gxwebsoft.shop.entity.GoodsComment; +import com.gxwebsoft.shop.param.GoodsCommentParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 评论表Service实现 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Service +public class GoodsCommentServiceImpl extends ServiceImpl implements GoodsCommentService { + + @Override + public PageResult pageRel(GoodsCommentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsCommentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsComment getByIdRel(Integer id) { + GoodsCommentParam param = new GoodsCommentParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCouponServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCouponServiceImpl.java new file mode 100644 index 0000000..312d970 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCouponServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsCouponMapper; +import com.gxwebsoft.shop.service.GoodsCouponService; +import com.gxwebsoft.shop.entity.GoodsCoupon; +import com.gxwebsoft.shop.param.GoodsCouponParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品优惠券表Service实现 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Service +public class GoodsCouponServiceImpl extends ServiceImpl implements GoodsCouponService { + + @Override + public PageResult pageRel(GoodsCouponParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsCouponParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsCoupon getByIdRel(Integer id) { + GoodsCouponParam param = new GoodsCouponParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsDescriptionServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsDescriptionServiceImpl.java new file mode 100644 index 0000000..b3ac941 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsDescriptionServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsDescriptionMapper; +import com.gxwebsoft.shop.service.GoodsDescriptionService; +import com.gxwebsoft.shop.entity.GoodsDescription; +import com.gxwebsoft.shop.param.GoodsDescriptionParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品描述表Service实现 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Service +public class GoodsDescriptionServiceImpl extends ServiceImpl implements GoodsDescriptionService { + + @Override + public PageResult pageRel(GoodsDescriptionParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsDescriptionParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsDescription getByIdRel(Integer id) { + GoodsDescriptionParam param = new GoodsDescriptionParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsLogServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsLogServiceImpl.java new file mode 100644 index 0000000..8ff8ed5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsLogServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsLogMapper; +import com.gxwebsoft.shop.service.GoodsLogService; +import com.gxwebsoft.shop.entity.GoodsLog; +import com.gxwebsoft.shop.param.GoodsLogParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品日志表Service实现 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Service +public class GoodsLogServiceImpl extends ServiceImpl implements GoodsLogService { + + @Override + public PageResult pageRel(GoodsLogParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsLogParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsLog getByIdRel(Integer id) { + GoodsLogParam param = new GoodsLogParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsRelationServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsRelationServiceImpl.java new file mode 100644 index 0000000..a36a8a9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsRelationServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsRelationMapper; +import com.gxwebsoft.shop.service.GoodsRelationService; +import com.gxwebsoft.shop.entity.GoodsRelation; +import com.gxwebsoft.shop.param.GoodsRelationParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品点赞和收藏表Service实现 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Service +public class GoodsRelationServiceImpl extends ServiceImpl implements GoodsRelationService { + + @Override + public PageResult pageRel(GoodsRelationParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsRelationParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsRelation getByIdRel(Integer id) { + GoodsRelationParam param = new GoodsRelationParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsRuleServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsRuleServiceImpl.java new file mode 100644 index 0000000..1ead63f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsRuleServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsRuleMapper; +import com.gxwebsoft.shop.service.GoodsRuleService; +import com.gxwebsoft.shop.entity.GoodsRule; +import com.gxwebsoft.shop.param.GoodsRuleParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品规则值(规格)表Service实现 + * + * @author 科技小王子 + * @since 2024-03-30 19:09:56 + */ +@Service +public class GoodsRuleServiceImpl extends ServiceImpl implements GoodsRuleService { + + @Override + public PageResult pageRel(GoodsRuleParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsRuleParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsRule getByIdRel(Integer id) { + GoodsRuleParam param = new GoodsRuleParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/GoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java similarity index 74% rename from src/main/java/com/gxwebsoft/oa/service/impl/GoodsServiceImpl.java rename to src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java index bf67422..6d5daca 100644 --- a/src/main/java/com/gxwebsoft/oa/service/impl/GoodsServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java @@ -1,10 +1,10 @@ -package com.gxwebsoft.oa.service.impl; +package com.gxwebsoft.shop.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.GoodsMapper; -import com.gxwebsoft.oa.service.GoodsService; -import com.gxwebsoft.oa.entity.Goods; -import com.gxwebsoft.oa.param.GoodsParam; +import com.gxwebsoft.shop.mapper.GoodsMapper; +import com.gxwebsoft.shop.service.GoodsService; +import com.gxwebsoft.shop.entity.Goods; +import com.gxwebsoft.shop.param.GoodsParam; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * 商品记录表Service实现 * * @author 科技小王子 - * @since 2024-03-01 12:37:25 + * @since 2024-03-30 20:00:50 */ @Service public class GoodsServiceImpl extends ServiceImpl implements GoodsService { @@ -23,7 +23,7 @@ public class GoodsServiceImpl extends ServiceImpl implements @Override public PageResult pageRel(GoodsParam param) { PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number asc, create_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -33,7 +33,7 @@ public class GoodsServiceImpl extends ServiceImpl implements List list = baseMapper.selectListRel(param); // 排序 PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number asc, create_time desc"); return page.sortRecords(list); } diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java index ae880ed..efdc765 100644 --- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -1,5 +1,6 @@ package com.gxwebsoft.generator; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.generator.AutoGenerator; @@ -26,6 +27,10 @@ public class ShopGenerator { //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 // 输出目录 private static final String OUTPUT_DIR = "/src/main/java"; + // Vue文件输出位置 + private static final String OUTPUT_LOCATION_VUE = "/Users/gxwebsoft/VUE/com.gxwebsoft.core-web"; + // Vue文件输出目录 + private static final String OUTPUT_DIR_VUE = "/src"; // 作者名称 private static final String AUTHOR = "科技小王子"; // 是否在xml中添加二级缓存配置 @@ -42,16 +47,16 @@ public class ShopGenerator { // 需要生成的表 private static final String[] TABLE_NAMES = new String[]{ "shop_goods", - "shop_goods_attr", - "shop_goods_attr_result", - "shop_goods_attr_value", - "shop_goods_category", - "shop_goods_coupon", - "shop_goods_description", - "shop_goods_log", - "shop_goods_relation", - "shop_goods_comment", - "shop_goods_rule" +// "shop_goods_attr", +// "shop_goods_attr_result", +// "shop_goods_attr_value", +// "shop_goods_category", +// "shop_goods_coupon", +// "shop_goods_description", +// "shop_goods_log", +// "shop_goods_relation", +// "shop_goods_comment", +// "shop_goods_rule" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{ @@ -78,9 +83,9 @@ public class ShopGenerator { "BigDecimal" }; // 是否添加权限注解 - private static final boolean AUTH_ANNOTATION = true; + private static final boolean AUTH_ANNOTATION = false; // 是否添加日志注解 - private static final boolean LOG_ANNOTATION = true; + private static final boolean LOG_ANNOTATION = false; // controller的mapping前缀 private static final String CONTROLLER_MAPPING_PREFIX = "/api"; // 模板所在位置 @@ -167,6 +172,63 @@ public class ShopGenerator { + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; } }); + /** + * 以下是生成VUE项目代码 + * 生成文件的路径 /api/shop/goods/index.ts + */ + templatePath = TEMPLATES_DIR + "/index.ts.btl"; + + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION_VUE + OUTPUT_DIR_VUE + + "/api/" + pc.getModuleName() + "/" + + tableInfo.getEntityPath() + "/" + "index.ts"; + } + }); + // 生成TS文件 (/api/shop/goods/model/index.ts) + templatePath = TEMPLATES_DIR + "/model.ts.btl"; + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION_VUE + OUTPUT_DIR_VUE + + "/api/" + pc.getModuleName() + "/" + + tableInfo.getEntityPath() + "/model/" + "index.ts"; + } + }); + // 生成Vue文件(/views/shop/goods/index.vue) + templatePath = TEMPLATES_DIR + "/index.vue.btl"; + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION_VUE + OUTPUT_DIR_VUE + + "/views/" + pc.getModuleName() + "/" + + tableInfo.getEntityPath() + "/" + "index.vue"; + } + }); + + // 生成components文件(/views/shop/goods/components/edit.vue) + templatePath = TEMPLATES_DIR + "/components.edit.vue.btl"; + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION_VUE + OUTPUT_DIR_VUE + + "/views/" + pc.getModuleName() + "/" + + tableInfo.getEntityPath() + "/components/" + tableInfo.getEntityPath() + "Edit.vue"; + } + }); + + // 生成components文件(/views/shop/goods/components/search.vue) + templatePath = TEMPLATES_DIR + "/components.search.vue.btl"; + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION_VUE + OUTPUT_DIR_VUE + + "/views/" + pc.getModuleName() + "/" + + tableInfo.getEntityPath() + "/components/" + "search.vue"; + } + }); + cfg.setFileOutConfigList(focList); mpg.setCfg(cfg); diff --git a/src/test/java/com/gxwebsoft/generator/templates/components.edit.vue.btl b/src/test/java/com/gxwebsoft/generator/templates/components.edit.vue.btl new file mode 100644 index 0000000..0b4d064 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/components.edit.vue.btl @@ -0,0 +1,361 @@ + + + + + diff --git a/src/test/java/com/gxwebsoft/generator/templates/components.search.vue.btl b/src/test/java/com/gxwebsoft/generator/templates/components.search.vue.btl new file mode 100644 index 0000000..82fea9d --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/components.search.vue.btl @@ -0,0 +1,42 @@ + + + + diff --git a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl index 39fab37..108d46c 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl @@ -22,6 +22,7 @@ import ${cfg.packageName!}.common.core.web.PageResult; import ${cfg.packageName!}.common.core.web.PageParam; import ${cfg.packageName!}.common.core.web.BatchParam; import ${cfg.packageName!}.common.core.annotation.OperationLog; +import ${cfg.packageName!}.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -118,10 +119,10 @@ public class ${table.controllerName} { @PostMapping() public ApiResult save(@RequestBody ${entity} ${table.entityPath}) { // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - ${table.entityPath}.setUserId(loginUser.getUserId()); - } + // User loginUser = getLoginUser(); + // if (loginUser != null) { + // ${table.entityPath}.setUserId(loginUser.getUserId()); + // } if (${serviceIns}.save(${table.entityPath})) { return success("添加成功"); } diff --git a/src/test/java/com/gxwebsoft/generator/templates/index.ts.btl b/src/test/java/com/gxwebsoft/generator/templates/index.ts.btl new file mode 100644 index 0000000..9d0b5e9 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/index.ts.btl @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +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 + '/shop/${controllerMappingHyphen}/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询${table.comment!}列表 + */ +export async function list${entity}(params?: ${entity}Param) { + const res = await request.get>( + MODULES_API_URL + '/shop/${controllerMappingHyphen}', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加${table.comment!} + */ +export async function add${entity}(data: ${entity}) { + const res = await request.post>( + MODULES_API_URL + '/shop/${controllerMappingHyphen}', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改${table.comment!} + */ +export async function update${entity}(data: ${entity}) { + const res = await request.put>( + MODULES_API_URL + '/shop/${controllerMappingHyphen}', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除${table.comment!} + */ +export async function remove${entity}(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/${controllerMappingHyphen}/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除${table.comment!} + */ +export async function removeBatch${entity}(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/${controllerMappingHyphen}/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询${table.comment!} + */ +export async function get${entity}(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/${controllerMappingHyphen}/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl b/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl new file mode 100644 index 0000000..d41645e --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl @@ -0,0 +1,211 @@ + + + + + + + diff --git a/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl b/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl index 6786c0d..974917f 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl @@ -80,6 +80,10 @@ <% } %> <% } %> + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + diff --git a/src/test/java/com/gxwebsoft/generator/templates/model.ts.btl b/src/test/java/com/gxwebsoft/generator/templates/model.ts.btl new file mode 100644 index 0000000..b0b99db --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/model.ts.btl @@ -0,0 +1,43 @@ +import type { PageParam } from '@/api'; + +/** + * ${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; +} diff --git a/src/test/java/com/gxwebsoft/generator/templates/param.java.btl b/src/test/java/com/gxwebsoft/generator/templates/param.java.btl index 9c30504..9aee6e5 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/param.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/param.java.btl @@ -1,5 +1,6 @@ package ${cfg.packageName!}.${package.ModuleName}.param; +import java.math.BigDecimal; import ${cfg.packageName!}.common.core.annotation.QueryField; import ${cfg.packageName!}.common.core.annotation.QueryType; import ${cfg.packageName!}.common.core.web.BaseParam;