From ce26010d295249c933e59b05c75ba4b12f466832 Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Wed, 3 Apr 2024 18:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=95=86=E5=93=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84=E5=A4=9A=E8=A7=84=E6=A0=BC=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GoodsAttrResultController.java | 114 ------ .../controller/GoodsAttrValueController.java | 114 ------ .../controller/GoodsCommentController.java | 114 ------ .../shop/controller/GoodsController.java | 178 +++++---- .../controller/GoodsCouponController.java | 114 ------ .../GoodsDescriptionController.java | 114 ------ .../controller/GoodsRelationController.java | 114 ------ .../shop/controller/GoodsRuleController.java | 114 ------ ...ontroller.java => GoodsSkuController.java} | 70 ++-- ...ntroller.java => GoodsSpecController.java} | 70 ++-- .../shop/controller/SpecController.java | 109 ++++++ .../shop/controller/SpecValueController.java | 109 ++++++ .../java/com/gxwebsoft/shop/entity/Goods.java | 22 +- .../shop/entity/GoodsAttrResult.java | 45 --- .../gxwebsoft/shop/entity/GoodsAttrValue.java | 96 ----- .../gxwebsoft/shop/entity/GoodsCategory.java | 6 +- .../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/GoodsSku.java | 78 ++++ .../entity/{GoodsAttr.java => GoodsSpec.java} | 36 +- .../java/com/gxwebsoft/shop/entity/Spec.java | 53 +++ .../entity/{GoodsRule.java => SpecValue.java} | 29 +- .../shop/mapper/GoodsAttrResultMapper.java | 37 -- .../shop/mapper/GoodsAttrValueMapper.java | 37 -- .../shop/mapper/GoodsCommentMapper.java | 37 -- .../shop/mapper/GoodsCouponMapper.java | 37 -- .../shop/mapper/GoodsDescriptionMapper.java | 37 -- .../shop/mapper/GoodsRelationMapper.java | 37 -- ...oodsLogMapper.java => GoodsSkuMapper.java} | 18 +- .../{GoodsRuleMapper.java => SpecMapper.java} | 18 +- ...dsAttrMapper.java => SpecValueMapper.java} | 18 +- .../shop/mapper/xml/GoodsAttrMapper.xml | 48 --- .../shop/mapper/xml/GoodsAttrValueMapper.xml | 96 ----- .../shop/mapper/xml/GoodsCommentMapper.xml | 96 ----- .../shop/mapper/xml/GoodsCouponMapper.xml | 57 --- .../mapper/xml/GoodsDescriptionMapper.xml | 39 -- ...{GoodsLogMapper.xml => GoodsSkuMapper.xml} | 58 ++- ...trResultMapper.xml => GoodsSpecMapper.xml} | 18 +- .../{GoodsRuleMapper.xml => SpecMapper.xml} | 27 +- ...RelationMapper.xml => SpecValueMapper.xml} | 26 +- .../shop/param/GoodsAttrResultParam.java | 41 -- .../shop/param/GoodsAttrValueParam.java | 101 ----- .../shop/param/GoodsCommentParam.java | 98 ----- .../shop/param/GoodsCouponParam.java | 53 --- .../gxwebsoft/shop/param/GoodsLogParam.java | 89 ----- .../shop/param/GoodsRelationParam.java | 44 --- .../gxwebsoft/shop/param/GoodsSkuParam.java | 76 ++++ ...oodsAttrParam.java => GoodsSpecParam.java} | 24 +- ...dsDescriptionParam.java => SpecParam.java} | 23 +- ...oodsRuleParam.java => SpecValueParam.java} | 20 +- .../shop/service/GoodsAttrResultService.java | 42 -- .../shop/service/GoodsAttrService.java | 42 -- .../shop/service/GoodsAttrValueService.java | 42 -- .../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 -- .../shop/service/GoodsSkuService.java | 42 ++ .../shop/service/GoodsSpecService.java | 42 ++ .../gxwebsoft/shop/service/SpecService.java | 42 ++ .../shop/service/SpecValueService.java | 42 ++ .../impl/GoodsAttrResultServiceImpl.java | 47 --- .../service/impl/GoodsAttrServiceImpl.java | 47 --- .../impl/GoodsAttrValueServiceImpl.java | 47 --- .../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/GoodsSkuServiceImpl.java | 47 +++ .../service/impl/GoodsSpecServiceImpl.java | 47 +++ .../shop/service/impl/SpecServiceImpl.java | 60 +++ .../service/impl/SpecValueServiceImpl.java | 47 +++ .../gxwebsoft/generator/ShopGenerator.java | 10 +- .../templates/components.edit.vue.btl | 236 +----------- .../generator/templates/index.vue.btl | 17 +- .../generatorVue/ShopVueGenerator.java | 185 --------- .../engine/BeetlTemplateEnginePlus.java | 50 --- .../templates/components.edit.vue.btl | 361 ------------------ .../generatorVue/templates/index.ts.btl | 106 ----- .../generatorVue/templates/index.vue.btl | 242 ------------ .../generatorVue/templates/model.ts.btl | 42 -- .../generatorVue/templates/search.vue.btl | 42 -- 89 files changed, 1190 insertions(+), 4612 deletions(-) delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsAttrResultController.java delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsAttrValueController.java delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsCommentController.java delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsCouponController.java delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsDescriptionController.java delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsRelationController.java delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsRuleController.java rename src/main/java/com/gxwebsoft/shop/controller/{GoodsLogController.java => GoodsSkuController.java} (53%) rename src/main/java/com/gxwebsoft/shop/controller/{GoodsAttrController.java => GoodsSpecController.java} (53%) create mode 100644 src/main/java/com/gxwebsoft/shop/controller/SpecController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/SpecValueController.java delete mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsAttrResult.java delete mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsAttrValue.java delete mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsComment.java delete mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsCoupon.java delete mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsDescription.java delete mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsLog.java delete mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsRelation.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsSku.java rename src/main/java/com/gxwebsoft/shop/entity/{GoodsAttr.java => GoodsSpec.java} (56%) create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Spec.java rename src/main/java/com/gxwebsoft/shop/entity/{GoodsRule.java => SpecValue.java} (52%) delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrResultMapper.java delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrValueMapper.java delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsCommentMapper.java delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsCouponMapper.java delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsDescriptionMapper.java delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsRelationMapper.java rename src/main/java/com/gxwebsoft/shop/mapper/{GoodsLogMapper.java => GoodsSkuMapper.java} (52%) rename src/main/java/com/gxwebsoft/shop/mapper/{GoodsRuleMapper.java => SpecMapper.java} (50%) rename src/main/java/com/gxwebsoft/shop/mapper/{GoodsAttrMapper.java => SpecValueMapper.java} (53%) delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrMapper.xml delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrValueMapper.xml delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCommentMapper.xml delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCouponMapper.xml delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsDescriptionMapper.xml rename src/main/java/com/gxwebsoft/shop/mapper/xml/{GoodsLogMapper.xml => GoodsSkuMapper.xml} (51%) rename src/main/java/com/gxwebsoft/shop/mapper/xml/{GoodsAttrResultMapper.xml => GoodsSpecMapper.xml} (68%) rename src/main/java/com/gxwebsoft/shop/mapper/xml/{GoodsRuleMapper.xml => SpecMapper.xml} (50%) rename src/main/java/com/gxwebsoft/shop/mapper/xml/{GoodsRelationMapper.xml => SpecValueMapper.xml} (61%) delete mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsAttrResultParam.java delete mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsAttrValueParam.java delete mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsCommentParam.java delete mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsCouponParam.java delete mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsLogParam.java delete mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsRelationParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsSkuParam.java rename src/main/java/com/gxwebsoft/shop/param/{GoodsAttrParam.java => GoodsSpecParam.java} (70%) rename src/main/java/com/gxwebsoft/shop/param/{GoodsDescriptionParam.java => SpecParam.java} (54%) rename src/main/java/com/gxwebsoft/shop/param/{GoodsRuleParam.java => SpecValueParam.java} (63%) delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsAttrResultService.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsAttrService.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsAttrValueService.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsCommentService.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsCouponService.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsDescriptionService.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsLogService.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsRelationService.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsRuleService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsSkuService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsSpecService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/SpecService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/SpecValueService.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrResultServiceImpl.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrServiceImpl.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrValueServiceImpl.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsCommentServiceImpl.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsCouponServiceImpl.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsDescriptionServiceImpl.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsLogServiceImpl.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsRelationServiceImpl.java delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsRuleServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsSkuServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsSpecServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/SpecServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/SpecValueServiceImpl.java delete mode 100644 src/test/java/com/gxwebsoft/generatorVue/ShopVueGenerator.java delete mode 100644 src/test/java/com/gxwebsoft/generatorVue/engine/BeetlTemplateEnginePlus.java delete mode 100644 src/test/java/com/gxwebsoft/generatorVue/templates/components.edit.vue.btl delete mode 100644 src/test/java/com/gxwebsoft/generatorVue/templates/index.ts.btl delete mode 100644 src/test/java/com/gxwebsoft/generatorVue/templates/index.vue.btl delete mode 100644 src/test/java/com/gxwebsoft/generatorVue/templates/model.ts.btl delete mode 100644 src/test/java/com/gxwebsoft/generatorVue/templates/search.vue.btl diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrResultController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrResultController.java deleted file mode 100644 index ee70a68..0000000 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrResultController.java +++ /dev/null @@ -1,114 +0,0 @@ -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 deleted file mode 100644 index 79a7f09..0000000 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrValueController.java +++ /dev/null @@ -1,114 +0,0 @@ -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/shop/controller/GoodsCommentController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsCommentController.java deleted file mode 100644 index c47b435..0000000 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsCommentController.java +++ /dev/null @@ -1,114 +0,0 @@ -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/shop/controller/GoodsController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java index 956d7a9..007603c 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java @@ -1,6 +1,11 @@ package com.gxwebsoft.shop.controller; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.entity.GoodsSku; +import com.gxwebsoft.shop.entity.GoodsSpec; +import com.gxwebsoft.shop.entity.SpecValue; import com.gxwebsoft.shop.service.GoodsService; import com.gxwebsoft.shop.entity.Goods; import com.gxwebsoft.shop.param.GoodsParam; @@ -10,13 +15,18 @@ 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.shop.service.GoodsSkuService; +import com.gxwebsoft.shop.service.GoodsSpecService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.tomcat.util.buf.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; /** * 商品记录表控制器 @@ -28,87 +38,117 @@ import java.util.List; @RestController @RequestMapping("/api/shop/goods") public class GoodsController extends BaseController { - @Resource - private GoodsService goodsService; + @Resource + private GoodsService goodsService; + @Resource + private GoodsSpecService goodsSpecService; + @Resource + private GoodsSkuService goodsSkuService; - @ApiOperation("分页查询商品记录表") - @GetMapping("/page") - public ApiResult> page(GoodsParam param) { - // 使用关联查询 - return success(goodsService.pageRel(param)); - } + @ApiOperation("分页查询商品记录表") + @GetMapping("/page") + public ApiResult> page(GoodsParam param) { + // 使用关联查询 + return success(goodsService.pageRel(param)); + } - @ApiOperation("查询全部商品记录表") - @GetMapping() - public ApiResult> list(GoodsParam param) { - // 使用关联查询 - return success(goodsService.listRel(param)); - } + @ApiOperation("查询全部商品记录表") + @GetMapping() + public ApiResult> list(GoodsParam param) { + // 使用关联查询 + return success(goodsService.listRel(param)); + } - @ApiOperation("根据id查询商品记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(goodsService.getByIdRel(id)); - } - @ApiOperation("添加商品记录表") - @PostMapping() - public ApiResult save(@RequestBody Goods goods) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - goods.setUserId(loginUser.getUserId()); - } - if (goodsService.save(goods)) { - return success("添加成功"); - } - return fail("添加失败"); - } + @Transactional(rollbackFor = {Exception.class}) + @ApiOperation("根据id查询商品记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(goodsService.getByIdRel(id)); + } - @ApiOperation("修改商品记录表") - @PutMapping() - public ApiResult update(@RequestBody Goods goods) { - if (goodsService.updateById(goods)) { - return success("修改成功"); - } - return fail("修改失败"); + @ApiOperation("添加商品记录表") + @PostMapping() + public ApiResult save(@RequestBody Goods goods) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + goods.setUserId(loginUser.getUserId()); } + if (goodsService.save(goods)) { - @ApiOperation("删除商品记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (goodsService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } + // 保存商品规格 + final List goodsSpecs = goods.getGoodsSpecs(); + goodsSpecs.forEach(d -> { + d.setGoodsId(goods.getGoodsId()); + final List collect = d.getValueList().stream().map(SpecValue::getSpecValue).collect(Collectors.toList()); + d.setSpecValues(StringUtils.join(collect, ',')); + }); + goodsSpecService.saveBatch(goodsSpecs); - @ApiOperation("批量添加商品记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (goodsService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); + // 保存商品sku表 + final List goodsSkus = goods.getGoodsSkus(); + goodsSkus.forEach(d -> { + d.setGoodsId(goods.getGoodsId()); + }); + goodsSkuService.saveBatch(goodsSkus); + return success("添加成功"); } + return fail("添加失败"); + } - @ApiOperation("批量修改商品记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(goodsService, "goods_id")) { - return success("修改成功"); - } - return fail("修改失败"); + @ApiOperation("修改商品记录表") + @PutMapping() + public ApiResult update(@RequestBody Goods goods) { + if (goodsService.updateById(goods)) { + // 更新spec规格表 + if (goodsSpecService.remove(new LambdaQueryWrapper().eq(GoodsSpec::getGoodsId, goods.getGoodsId()))) { + goodsSpecService.saveBatch(goods.getGoodsSpecs()); + } + // 更新sku表 + if (goodsSkuService.remove(new LambdaQueryWrapper().eq(GoodsSku::getGoodsId, goods.getGoodsId()))) { + goodsSkuService.saveBatch(goods.getGoodsSkus()); + } + return success("修改成功"); } + return fail("修改失败"); + } - @ApiOperation("批量删除商品记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (goodsService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); + @ApiOperation("删除商品记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsService.removeById(id)) { + return success("删除成功"); } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsService, "goods_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } } diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsCouponController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsCouponController.java deleted file mode 100644 index c5a6b80..0000000 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsCouponController.java +++ /dev/null @@ -1,114 +0,0 @@ -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 deleted file mode 100644 index 8e23dbf..0000000 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsDescriptionController.java +++ /dev/null @@ -1,114 +0,0 @@ -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/GoodsRelationController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsRelationController.java deleted file mode 100644 index 756b106..0000000 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsRelationController.java +++ /dev/null @@ -1,114 +0,0 @@ -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 deleted file mode 100644 index aaa3254..0000000 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsRuleController.java +++ /dev/null @@ -1,114 +0,0 @@ -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/shop/controller/GoodsLogController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsSkuController.java similarity index 53% rename from src/main/java/com/gxwebsoft/shop/controller/GoodsLogController.java rename to src/main/java/com/gxwebsoft/shop/controller/GoodsSkuController.java index ec87425..1bbc616 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsLogController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsSkuController.java @@ -1,9 +1,9 @@ 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.shop.service.GoodsSkuService; +import com.gxwebsoft.shop.entity.GoodsSku; +import com.gxwebsoft.shop.param.GoodsSkuParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.core.web.PageParam; @@ -19,93 +19,93 @@ import javax.annotation.Resource; import java.util.List; /** - * 商品日志表控制器 + * 商品sku列表控制器 * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-03 16:06:23 */ -@Api(tags = "商品日志表管理") +@Api(tags = "商品sku列表管理") @RestController -@RequestMapping("/api/shop/goods-log") -public class GoodsLogController extends BaseController { +@RequestMapping("/api/shop/goods-sku") +public class GoodsSkuController extends BaseController { @Resource - private GoodsLogService goodsLogService; + private GoodsSkuService goodsSkuService; - @ApiOperation("分页查询商品日志表") + @ApiOperation("分页查询商品sku列表") @GetMapping("/page") - public ApiResult> page(GoodsLogParam param) { + public ApiResult> page(GoodsSkuParam param) { // 使用关联查询 - return success(goodsLogService.pageRel(param)); + return success(goodsSkuService.pageRel(param)); } - @ApiOperation("查询全部商品日志表") + @ApiOperation("查询全部商品sku列表") @GetMapping() - public ApiResult> list(GoodsLogParam param) { + public ApiResult> list(GoodsSkuParam param) { // 使用关联查询 - return success(goodsLogService.listRel(param)); + return success(goodsSkuService.listRel(param)); } - @ApiOperation("根据id查询商品日志表") + @ApiOperation("根据id查询商品sku列表") @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { + public ApiResult get(@PathVariable("id") Integer id) { // 使用关联查询 - return success(goodsLogService.getByIdRel(id)); + return success(goodsSkuService.getByIdRel(id)); } - @ApiOperation("添加商品日志表") + @ApiOperation("添加商品sku列表") @PostMapping() - public ApiResult save(@RequestBody GoodsLog goodsLog) { + public ApiResult save(@RequestBody GoodsSku goodsSku) { // 记录当前登录用户id // User loginUser = getLoginUser(); // if (loginUser != null) { - // goodsLog.setUserId(loginUser.getUserId()); + // goodsSku.setUserId(loginUser.getUserId()); // } - if (goodsLogService.save(goodsLog)) { + if (goodsSkuService.save(goodsSku)) { return success("添加成功"); } return fail("添加失败"); } - @ApiOperation("修改商品日志表") + @ApiOperation("修改商品sku列表") @PutMapping() - public ApiResult update(@RequestBody GoodsLog goodsLog) { - if (goodsLogService.updateById(goodsLog)) { + public ApiResult update(@RequestBody GoodsSku goodsSku) { + if (goodsSkuService.updateById(goodsSku)) { return success("修改成功"); } return fail("修改失败"); } - @ApiOperation("删除商品日志表") + @ApiOperation("删除商品sku列表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { - if (goodsLogService.removeById(id)) { + if (goodsSkuService.removeById(id)) { return success("删除成功"); } return fail("删除失败"); } - @ApiOperation("批量添加商品日志表") + @ApiOperation("批量添加商品sku列表") @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (goodsLogService.saveBatch(list)) { + public ApiResult saveBatch(@RequestBody List list) { + if (goodsSkuService.saveBatch(list)) { return success("添加成功"); } return fail("添加失败"); } - @ApiOperation("批量修改商品日志表") + @ApiOperation("批量修改商品sku列表") @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(goodsLogService, "id")) { + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsSkuService, "id")) { return success("修改成功"); } return fail("修改失败"); } - @ApiOperation("批量删除商品日志表") + @ApiOperation("批量删除商品sku列表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { - if (goodsLogService.removeByIds(ids)) { + if (goodsSkuService.removeByIds(ids)) { return success("删除成功"); } return fail("删除失败"); diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsSpecController.java similarity index 53% rename from src/main/java/com/gxwebsoft/shop/controller/GoodsAttrController.java rename to src/main/java/com/gxwebsoft/shop/controller/GoodsSpecController.java index 3796063..55f7632 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/GoodsAttrController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsSpecController.java @@ -1,9 +1,9 @@ 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.shop.service.GoodsSpecService; +import com.gxwebsoft.shop.entity.GoodsSpec; +import com.gxwebsoft.shop.param.GoodsSpecParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.core.web.PageParam; @@ -19,93 +19,93 @@ import javax.annotation.Resource; import java.util.List; /** - * 商品属性表控制器 + * 商品多规格控制器 * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-03 16:06:23 */ -@Api(tags = "商品属性表管理") +@Api(tags = "商品多规格管理") @RestController -@RequestMapping("/api/shop/goods-attr") -public class GoodsAttrController extends BaseController { +@RequestMapping("/api/shop/goods-spec") +public class GoodsSpecController extends BaseController { @Resource - private GoodsAttrService goodsAttrService; + private GoodsSpecService goodsSpecService; - @ApiOperation("分页查询商品属性表") + @ApiOperation("分页查询商品多规格") @GetMapping("/page") - public ApiResult> page(GoodsAttrParam param) { + public ApiResult> page(GoodsSpecParam param) { // 使用关联查询 - return success(goodsAttrService.pageRel(param)); + return success(goodsSpecService.pageRel(param)); } - @ApiOperation("查询全部商品属性表") + @ApiOperation("查询全部商品多规格") @GetMapping() - public ApiResult> list(GoodsAttrParam param) { + public ApiResult> list(GoodsSpecParam param) { // 使用关联查询 - return success(goodsAttrService.listRel(param)); + return success(goodsSpecService.listRel(param)); } - @ApiOperation("根据id查询商品属性表") + @ApiOperation("根据id查询商品多规格") @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { + public ApiResult get(@PathVariable("id") Integer id) { // 使用关联查询 - return success(goodsAttrService.getByIdRel(id)); + return success(goodsSpecService.getByIdRel(id)); } - @ApiOperation("添加商品属性表") + @ApiOperation("添加商品多规格") @PostMapping() - public ApiResult save(@RequestBody GoodsAttr goodsAttr) { + public ApiResult save(@RequestBody GoodsSpec goodsSpec) { // 记录当前登录用户id // User loginUser = getLoginUser(); // if (loginUser != null) { - // goodsAttr.setUserId(loginUser.getUserId()); + // goodsSpec.setUserId(loginUser.getUserId()); // } - if (goodsAttrService.save(goodsAttr)) { + if (goodsSpecService.save(goodsSpec)) { return success("添加成功"); } return fail("添加失败"); } - @ApiOperation("修改商品属性表") + @ApiOperation("修改商品多规格") @PutMapping() - public ApiResult update(@RequestBody GoodsAttr goodsAttr) { - if (goodsAttrService.updateById(goodsAttr)) { + public ApiResult update(@RequestBody GoodsSpec goodsSpec) { + if (goodsSpecService.updateById(goodsSpec)) { return success("修改成功"); } return fail("修改失败"); } - @ApiOperation("删除商品属性表") + @ApiOperation("删除商品多规格") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { - if (goodsAttrService.removeById(id)) { + if (goodsSpecService.removeById(id)) { return success("删除成功"); } return fail("删除失败"); } - @ApiOperation("批量添加商品属性表") + @ApiOperation("批量添加商品多规格") @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (goodsAttrService.saveBatch(list)) { + public ApiResult saveBatch(@RequestBody List list) { + if (goodsSpecService.saveBatch(list)) { return success("添加成功"); } return fail("添加失败"); } - @ApiOperation("批量修改商品属性表") + @ApiOperation("批量修改商品多规格") @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(goodsAttrService, "id")) { + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsSpecService, "id")) { return success("修改成功"); } return fail("修改失败"); } - @ApiOperation("批量删除商品属性表") + @ApiOperation("批量删除商品多规格") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { - if (goodsAttrService.removeByIds(ids)) { + if (goodsSpecService.removeByIds(ids)) { return success("删除成功"); } return fail("删除失败"); diff --git a/src/main/java/com/gxwebsoft/shop/controller/SpecController.java b/src/main/java/com/gxwebsoft/shop/controller/SpecController.java new file mode 100644 index 0000000..79fd0e7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/SpecController.java @@ -0,0 +1,109 @@ +package com.gxwebsoft.shop.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.shop.entity.Spec; +import com.gxwebsoft.shop.param.SpecParam; +import com.gxwebsoft.shop.service.SpecService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品规格控制器 + * + * @author 科技小王子 + * @since 2024-04-01 09:29:43 + */ +@Api(tags = "商品规格管理") +@RestController +@RequestMapping("/api/shop/spec") +public class SpecController extends BaseController { + @Resource + private SpecService specService; + + @ApiOperation("分页查询商品规格") + @GetMapping("/page") + public ApiResult> page(SpecParam param) { + // 使用关联查询 + return success(specService.pageRel(param)); + } + + @ApiOperation("查询全部商品规格") + @GetMapping() + public ApiResult> list(SpecParam param) { + // 使用关联查询 + return success(specService.listRel(param)); + } + + @ApiOperation("根据id查询商品规格") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(specService.getByIdRel(id)); + } + + @ApiOperation("添加商品规格") + @PostMapping() + public ApiResult save(@RequestBody Spec spec) { + if (specService.count(new LambdaQueryWrapper().eq(Spec::getSpecName,spec.getSpecName())) > 0) { + return fail("规格名称已存在"); + } + if (specService.save(spec)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商品规格") + @PutMapping() + public ApiResult update(@RequestBody Spec spec) { + if (specService.updateById(spec)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商品规格") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (specService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商品规格") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (specService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商品规格") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(specService, "spec_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商品规格") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (specService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/SpecValueController.java b/src/main/java/com/gxwebsoft/shop/controller/SpecValueController.java new file mode 100644 index 0000000..6a05842 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/SpecValueController.java @@ -0,0 +1,109 @@ +package com.gxwebsoft.shop.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.shop.entity.SpecValue; +import com.gxwebsoft.shop.param.SpecValueParam; +import com.gxwebsoft.shop.service.SpecValueService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 规格值控制器 + * + * @author 科技小王子 + * @since 2024-04-01 09:49:15 + */ +@Api(tags = "规格值管理") +@RestController +@RequestMapping("/api/shop/spec-value") +public class SpecValueController extends BaseController { + @Resource + private SpecValueService specValueService; + + @ApiOperation("分页查询规格值") + @GetMapping("/page") + public ApiResult> page(SpecValueParam param) { + // 使用关联查询 + return success(specValueService.pageRel(param)); + } + + @ApiOperation("查询全部规格值") + @GetMapping() + public ApiResult> list(SpecValueParam param) { + // 使用关联查询 + return success(specValueService.listRel(param)); + } + + @ApiOperation("根据id查询规格值") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(specValueService.getByIdRel(id)); + } + + @ApiOperation("添加规格值") + @PostMapping() + public ApiResult save(@RequestBody SpecValue specValue) { + if (specValueService.count(new LambdaQueryWrapper().eq(SpecValue::getSpecId,specValue.getSpecId()).eq(SpecValue::getSpecValue,specValue.getSpecValue())) > 0) { + return fail("规格值已存在"); + } + if (specValueService.save(specValue)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改规格值") + @PutMapping() + public ApiResult update(@RequestBody SpecValue specValue) { + if (specValueService.updateById(specValue)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除规格值") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (specValueService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加规格值") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (specValueService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改规格值") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(specValueService, "spec_value_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除规格值") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (specValueService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/Goods.java b/src/main/java/com/gxwebsoft/shop/entity/Goods.java index 66bbcd5..99d74b9 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/Goods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/Goods.java @@ -1,12 +1,14 @@ 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 com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; +import java.util.Date; +import java.util.List; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -91,9 +93,17 @@ public class Goods implements Serializable { private Integer tenantId; @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; + private Date updateTime; + + @ApiModelProperty(value = "商品规格") + @TableField(exist = false) + private List goodsSpecs; + + @ApiModelProperty(value = "商品sku列表") + @TableField(exist = false) + private List goodsSkus; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrResult.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrResult.java deleted file mode 100644 index 8ecd539..0000000 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrResult.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 761b4cc..0000000 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsAttrValue.java +++ /dev/null @@ -1,96 +0,0 @@ -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 index 4756231..9426502 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsCategory.java +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsCategory.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; +import java.util.Date; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -84,9 +86,9 @@ public class GoodsCategory implements Serializable { private Integer tenantId; @ApiModelProperty(value = "注册时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsComment.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsComment.java deleted file mode 100644 index d8d4401..0000000 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsComment.java +++ /dev/null @@ -1,98 +0,0 @@ -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 deleted file mode 100644 index d051c53..0000000 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsCoupon.java +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index 364f553..0000000 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsDescription.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 601402b..0000000 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsLog.java +++ /dev/null @@ -1,85 +0,0 @@ -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 deleted file mode 100644 index 40f2020..0000000 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsRelation.java +++ /dev/null @@ -1,51 +0,0 @@ -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/GoodsSku.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsSku.java new file mode 100644 index 0000000..497c985 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsSku.java @@ -0,0 +1,78 @@ +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 java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品sku列表 + * + * @author 科技小王子 + * @since 2024-04-03 16:06:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsSku对象", description = "商品sku列表") +@TableName("shop_goods_sku") +public class GoodsSku 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 goodsId; + + @ApiModelProperty(value = "规格组ID") + private Integer specId; + + @ApiModelProperty(value = "规格值ID") + private Integer specValueId; + + @ApiModelProperty(value = "规格值0") + private String specValue0; + + @ApiModelProperty(value = "规格值1") + private String specValue1; + + @ApiModelProperty(value = "规格值2") + private String specValue2; + + @ApiModelProperty(value = "商品图片") + private String image; + + @ApiModelProperty(value = "商品价格") + private BigDecimal price; + + @ApiModelProperty(value = "市场价格") + private BigDecimal salePrice; + + @ApiModelProperty(value = "库存") + private Integer stock; + + @ApiModelProperty(value = "sku编码") + private String skuNo; + + @ApiModelProperty(value = "状态, 0正常, 1异常") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsAttr.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsSpec.java similarity index 56% rename from src/main/java/com/gxwebsoft/shop/entity/GoodsAttr.java rename to src/main/java/com/gxwebsoft/shop/entity/GoodsSpec.java index b168499..caa75fa 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsAttr.java +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsSpec.java @@ -1,26 +1,28 @@ package com.gxwebsoft.shop.entity; +import com.baomidou.mybatisplus.annotation.TableField; 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 java.util.List; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; /** - * 商品属性表 + * 商品多规格 * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-03 16:06:23 */ @Data @EqualsAndHashCode(callSuper = false) -@ApiModel(value = "GoodsAttr对象", description = "商品属性表") -@TableName("shop_goods_attr") -public class GoodsAttr implements Serializable { +@ApiModel(value = "GoodsSpec对象", description = "商品多规格") +@TableName("shop_goods_spec") +public class GoodsSpec implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") @@ -30,19 +32,25 @@ public class GoodsAttr implements Serializable { @ApiModelProperty(value = "商品ID") private Integer goodsId; - @ApiModelProperty(value = "属性名") - private String attrName; + @ApiModelProperty(value = "规格ID") + private Integer specId; - @ApiModelProperty(value = "属性值") - private String attrValues; + @ApiModelProperty(value = "规格名称") + private String specName; + + @ApiModelProperty(value = "规则值ID") + private Integer specValueId; + + @ApiModelProperty(value = "规格值") + private String specValues; + + @ApiModelProperty(value = "规格值") + @TableField(exist = false) + private List valueList; @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/Spec.java b/src/main/java/com/gxwebsoft/shop/entity/Spec.java new file mode 100644 index 0000000..87e2c0c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Spec.java @@ -0,0 +1,53 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +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 java.util.Date; +import java.util.List; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品规格组记录表 + * + * @author 科技小王子 + * @since 2024-04-01 09:29:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Spec对象", description = "商品规格组记录表") +@TableName("shop_spec") +public class Spec implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "规格组ID") + @TableId(value = "spec_id", type = IdType.AUTO) + private Integer specId; + + @ApiModelProperty(value = "规格组名称") + private String specName; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "状态, 0正常, 1禁用") + private Integer status; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "规则值列表") + @TableField(exist = false) + private List specValues; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsRule.java b/src/main/java/com/gxwebsoft/shop/entity/SpecValue.java similarity index 52% rename from src/main/java/com/gxwebsoft/shop/entity/GoodsRule.java rename to src/main/java/com/gxwebsoft/shop/entity/SpecValue.java index b355e49..73202ce 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/GoodsRule.java +++ b/src/main/java/com/gxwebsoft/shop/entity/SpecValue.java @@ -3,33 +3,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.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; /** - * 商品规则值(规格)表 + * 规格值 * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-01 09:49:15 */ @Data @EqualsAndHashCode(callSuper = false) -@ApiModel(value = "GoodsRule对象", description = "商品规则值(规格)表") -@TableName("shop_goods_rule") -public class GoodsRule implements Serializable { +@ApiModel(value = "SpecValue对象", description = "规格值") +@TableName("shop_spec_value") +public class SpecValue implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "规格名称") - private String ruleName; + @ApiModelProperty(value = "规格值ID") + @TableId(value = "spec_value_id", type = IdType.AUTO) + private Integer specValueId; @ApiModelProperty(value = "规格值") - private String ruleValue; + private String specValue; + + @ApiModelProperty(value = "规格组ID") + private Integer specId; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; @ApiModelProperty(value = "租户id") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrResultMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrResultMapper.java deleted file mode 100644 index 75c82f5..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrResultMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 9a5ebf3..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrValueMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -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/shop/mapper/GoodsCommentMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsCommentMapper.java deleted file mode 100644 index 0a09cbf..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsCommentMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index fac9505..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsCouponMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 0a53678..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsDescriptionMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -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/GoodsRelationMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsRelationMapper.java deleted file mode 100644 index f82c2e9..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsRelationMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -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/GoodsLogMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsSkuMapper.java similarity index 52% rename from src/main/java/com/gxwebsoft/shop/mapper/GoodsLogMapper.java rename to src/main/java/com/gxwebsoft/shop/mapper/GoodsSkuMapper.java index 1fd3684..a2ba9da 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsLogMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsSkuMapper.java @@ -2,29 +2,29 @@ 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 com.gxwebsoft.shop.entity.GoodsSku; +import com.gxwebsoft.shop.param.GoodsSkuParam; import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 商品日志表Mapper + * 商品sku列表Mapper * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-03 16:06:23 */ -public interface GoodsLogMapper extends BaseMapper { +public interface GoodsSkuMapper extends BaseMapper { /** * 分页查询 * * @param page 分页对象 * @param param 查询参数 - * @return List + * @return List */ - List selectPageRel(@Param("page") IPage page, - @Param("param") GoodsLogParam param); + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsSkuParam param); /** * 查询全部 @@ -32,6 +32,6 @@ public interface GoodsLogMapper extends BaseMapper { * @param param 查询参数 * @return List */ - List selectListRel(@Param("param") GoodsLogParam param); + List selectListRel(@Param("param") GoodsSkuParam param); } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsRuleMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/SpecMapper.java similarity index 50% rename from src/main/java/com/gxwebsoft/shop/mapper/GoodsRuleMapper.java rename to src/main/java/com/gxwebsoft/shop/mapper/SpecMapper.java index 8933548..0a405a1 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsRuleMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/SpecMapper.java @@ -2,29 +2,29 @@ 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 com.gxwebsoft.shop.entity.Spec; +import com.gxwebsoft.shop.param.SpecParam; import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 商品规则值(规格)表Mapper + * 商品规格组记录表Mapper * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-01 09:29:43 */ -public interface GoodsRuleMapper extends BaseMapper { +public interface SpecMapper extends BaseMapper { /** * 分页查询 * * @param page 分页对象 * @param param 查询参数 - * @return List + * @return List */ - List selectPageRel(@Param("page") IPage page, - @Param("param") GoodsRuleParam param); + List selectPageRel(@Param("page") IPage page, + @Param("param") SpecParam param); /** * 查询全部 @@ -32,6 +32,6 @@ public interface GoodsRuleMapper extends BaseMapper { * @param param 查询参数 * @return List */ - List selectListRel(@Param("param") GoodsRuleParam param); + List selectListRel(@Param("param") SpecParam param); } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/SpecValueMapper.java similarity index 53% rename from src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrMapper.java rename to src/main/java/com/gxwebsoft/shop/mapper/SpecValueMapper.java index 5235394..b3e282a 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsAttrMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/SpecValueMapper.java @@ -2,29 +2,29 @@ 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 com.gxwebsoft.shop.entity.SpecValue; +import com.gxwebsoft.shop.param.SpecValueParam; import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 商品属性表Mapper + * 规格值Mapper * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-01 09:49:15 */ -public interface GoodsAttrMapper extends BaseMapper { +public interface SpecValueMapper extends BaseMapper { /** * 分页查询 * * @param page 分页对象 * @param param 查询参数 - * @return List + * @return List */ - List selectPageRel(@Param("page") IPage page, - @Param("param") GoodsAttrParam param); + List selectPageRel(@Param("page") IPage page, + @Param("param") SpecValueParam param); /** * 查询全部 @@ -32,6 +32,6 @@ public interface GoodsAttrMapper extends BaseMapper { * @param param 查询参数 * @return List */ - List selectListRel(@Param("param") GoodsAttrParam param); + List selectListRel(@Param("param") SpecValueParam 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 deleted file mode 100644 index a52d343..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - 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/GoodsAttrValueMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrValueMapper.xml deleted file mode 100644 index 0c80cdc..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrValueMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - 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/GoodsCommentMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCommentMapper.xml deleted file mode 100644 index fef85e4..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCommentMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - 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/shop/mapper/xml/GoodsCouponMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCouponMapper.xml deleted file mode 100644 index c504511..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsCouponMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_goods_coupon a - - - AND a.id = #{param.id} - - - AND a.goods_id = #{param.goodsId} - - - AND a.issue_coupon_id = #{param.issueCouponId} - - - AND a.sort_number = #{param.sortNumber} - - - 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/shop/mapper/xml/GoodsDescriptionMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsDescriptionMapper.xml deleted file mode 100644 index 3732b59..0000000 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsDescriptionMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - 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/GoodsSkuMapper.xml similarity index 51% rename from src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsLogMapper.xml rename to src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsSkuMapper.xml index f1d5c64..c8aba52 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsLogMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsSkuMapper.xml @@ -1,59 +1,53 @@ - + SELECT a.* - FROM shop_goods_log a + FROM shop_goods_sku 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.spec_id = #{param.specId} - - AND a.cart_num = #{param.cartNum} + + AND a.spec_value_id = #{param.specValueId} - - AND a.order_num = #{param.orderNum} + + AND a.spec_value_0 LIKE CONCAT('%', #{param.specValue0}, '%') - - AND a.pay_num = #{param.payNum} + + AND a.spec_value_1 LIKE CONCAT('%', #{param.specValue1}, '%') - - AND a.pay_price = #{param.payPrice} + + AND a.spec_value_2 LIKE CONCAT('%', #{param.specValue2}, '%') - - AND a.cost_price = #{param.costPrice} + + AND a.image LIKE CONCAT('%', #{param.image}, '%') - - AND a.pay_uid = #{param.payUid} + + AND a.price = #{param.price} - - AND a.refund_num = #{param.refundNum} + + AND a.sale_price = #{param.salePrice} - - AND a.refund_price = #{param.refundPrice} + + AND a.stock = #{param.stock} - - AND a.collect_num = #{param.collectNum} - - - AND a.sort_number = #{param.sortNumber} + + AND a.sku_no LIKE CONCAT('%', #{param.skuNo}, '%') AND a.status = #{param.status} - - AND a.user_id = #{param.userId} + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') AND a.create_time >= #{param.createTimeStart} @@ -69,12 +63,12 @@ - - diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrResultMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsSpecMapper.xml similarity index 68% rename from src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrResultMapper.xml rename to src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsSpecMapper.xml index d0c0715..e473380 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsAttrResultMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsSpecMapper.xml @@ -1,11 +1,11 @@ - + SELECT a.* - FROM shop_goods_attr_result a + FROM shop_goods_spec a AND a.id = #{param.id} @@ -13,8 +13,14 @@ AND a.goods_id = #{param.goodsId} - - AND a.result LIKE CONCAT('%', #{param.result}, '%') + + AND a.spec_id = #{param.specId} + + + AND a.spec_name LIKE CONCAT('%', #{param.specName}, '%') + + + AND a.value_list LIKE CONCAT('%', #{param.valueList}, '%') AND a.type = #{param.type} @@ -27,12 +33,12 @@ - - diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRuleMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/SpecMapper.xml similarity index 50% rename from src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRuleMapper.xml rename to src/main/java/com/gxwebsoft/shop/mapper/xml/SpecMapper.xml index 120e4f9..f318a72 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRuleMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/SpecMapper.xml @@ -1,35 +1,34 @@ - + SELECT a.* - FROM shop_goods_rule a + FROM shop_spec a - - AND a.id = #{param.id} + + AND a.spec_id = #{param.specId} - - AND a.rule_name LIKE CONCAT('%', #{param.ruleName}, '%') + + AND a.name LIKE CONCAT('%', #{param.name}, '%') - - AND a.rule_value LIKE CONCAT('%', #{param.ruleValue}, '%') + + 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/GoodsRelationMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/SpecValueMapper.xml similarity index 61% rename from src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRelationMapper.xml rename to src/main/java/com/gxwebsoft/shop/mapper/xml/SpecValueMapper.xml index 1ba029d..112fab1 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsRelationMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/SpecValueMapper.xml @@ -1,26 +1,20 @@ - + SELECT a.* - FROM shop_goods_relation a + FROM shop_spec_value a - - AND a.id = #{param.id} + + AND a.spec_value_id = #{param.specValueId} - - AND a.user_id = #{param.userId} + + AND a.name LIKE CONCAT('%', #{param.name}, '%') - - AND a.goods_id = #{param.goodsId} - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.category LIKE CONCAT('%', #{param.category}, '%') + + AND a.spec_id = #{param.specId} AND a.create_time >= #{param.createTimeStart} @@ -36,12 +30,12 @@ - - diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsAttrResultParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsAttrResultParam.java deleted file mode 100644 index 71cc63e..0000000 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsAttrResultParam.java +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index c866a2c..0000000 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsAttrValueParam.java +++ /dev/null @@ -1,101 +0,0 @@ -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/GoodsCommentParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsCommentParam.java deleted file mode 100644 index c177c85..0000000 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsCommentParam.java +++ /dev/null @@ -1,98 +0,0 @@ -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/shop/param/GoodsCouponParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsCouponParam.java deleted file mode 100644 index 4a3dec5..0000000 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsCouponParam.java +++ /dev/null @@ -1,53 +0,0 @@ -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 = "GoodsCouponParam对象", description = "商品优惠券表查询参数") -public class GoodsCouponParam 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 = "优惠劵id") - @QueryField(type = QueryType.EQ) - private Integer issueCouponId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @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/shop/param/GoodsLogParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsLogParam.java deleted file mode 100644 index 2872ef1..0000000 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsLogParam.java +++ /dev/null @@ -1,89 +0,0 @@ -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/shop/param/GoodsRelationParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsRelationParam.java deleted file mode 100644 index 735ea4a..0000000 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsRelationParam.java +++ /dev/null @@ -1,44 +0,0 @@ -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/GoodsSkuParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsSkuParam.java new file mode 100644 index 0000000..213ddb8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsSkuParam.java @@ -0,0 +1,76 @@ +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; + +/** + * 商品sku列表查询参数 + * + * @author 科技小王子 + * @since 2024-04-03 16:06:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsSkuParam对象", description = "商品sku列表查询参数") +public class GoodsSkuParam 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 goodsId; + + @ApiModelProperty(value = "规格组ID") + @QueryField(type = QueryType.EQ) + private Integer specId; + + @ApiModelProperty(value = "规格值ID") + @QueryField(type = QueryType.EQ) + private Integer specValueId; + + @ApiModelProperty(value = "规格值0") + private String specValue0; + + @ApiModelProperty(value = "规格值1") + private String specValue1; + + @ApiModelProperty(value = "规格值2") + private String specValue2; + + @ApiModelProperty(value = "商品图片") + private String image; + + @ApiModelProperty(value = "商品价格") + @QueryField(type = QueryType.EQ) + private BigDecimal price; + + @ApiModelProperty(value = "市场价格") + @QueryField(type = QueryType.EQ) + private BigDecimal salePrice; + + @ApiModelProperty(value = "库存") + @QueryField(type = QueryType.EQ) + private Integer stock; + + @ApiModelProperty(value = "sku编码") + private String skuNo; + + @ApiModelProperty(value = "状态, 0正常, 1异常") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsAttrParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsSpecParam.java similarity index 70% rename from src/main/java/com/gxwebsoft/shop/param/GoodsAttrParam.java rename to src/main/java/com/gxwebsoft/shop/param/GoodsSpecParam.java index 412695c..1c5bde9 100644 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsAttrParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsSpecParam.java @@ -11,16 +11,16 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 商品属性表查询参数 + * 商品多规格查询参数 * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-03 16:06:23 */ @Data @EqualsAndHashCode(callSuper = false) @JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "GoodsAttrParam对象", description = "商品属性表查询参数") -public class GoodsAttrParam extends BaseParam { +@ApiModel(value = "GoodsSpecParam对象", description = "商品多规格查询参数") +public class GoodsSpecParam extends BaseParam { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") @@ -31,18 +31,18 @@ public class GoodsAttrParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer goodsId; - @ApiModelProperty(value = "属性名") - private String attrName; + @ApiModelProperty(value = "规格ID") + @QueryField(type = QueryType.EQ) + private Integer specId; - @ApiModelProperty(value = "属性值") - private String attrValues; + @ApiModelProperty(value = "规格名称") + private String specName; + + @ApiModelProperty(value = "规格值") + private String valueList; @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/GoodsDescriptionParam.java b/src/main/java/com/gxwebsoft/shop/param/SpecParam.java similarity index 54% rename from src/main/java/com/gxwebsoft/shop/param/GoodsDescriptionParam.java rename to src/main/java/com/gxwebsoft/shop/param/SpecParam.java index ebaf0c2..53b17b8 100644 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsDescriptionParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/SpecParam.java @@ -11,30 +11,23 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 商品描述表查询参数 + * 商品规格组记录表查询参数 * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-01 09:29:43 */ @Data @EqualsAndHashCode(callSuper = false) @JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "GoodsDescriptionParam对象", description = "商品描述表查询参数") -public class GoodsDescriptionParam extends BaseParam { +@ApiModel(value = "SpecParam对象", description = "商品规格组记录表查询参数") +public class SpecParam extends BaseParam { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "规格组ID") @QueryField(type = QueryType.EQ) - private Integer id; + private Integer specId; - @ApiModelProperty(value = "商品ID") - @QueryField(type = QueryType.EQ) - private Integer goodsId; - - @ApiModelProperty(value = "商品详情") - private String description; - - @ApiModelProperty(value = "商品类型") - @QueryField(type = QueryType.EQ) - private Boolean type; + @ApiModelProperty(value = "规格组名称") + private String name; } diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsRuleParam.java b/src/main/java/com/gxwebsoft/shop/param/SpecValueParam.java similarity index 63% rename from src/main/java/com/gxwebsoft/shop/param/GoodsRuleParam.java rename to src/main/java/com/gxwebsoft/shop/param/SpecValueParam.java index f2e851b..f773b3b 100644 --- a/src/main/java/com/gxwebsoft/shop/param/GoodsRuleParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/SpecValueParam.java @@ -11,25 +11,27 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 商品规则值(规格)表查询参数 + * 规格值查询参数 * * @author 科技小王子 - * @since 2024-03-30 19:09:56 + * @since 2024-04-01 09:49:15 */ @Data @EqualsAndHashCode(callSuper = false) @JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "GoodsRuleParam对象", description = "商品规则值(规格)表查询参数") -public class GoodsRuleParam extends BaseParam { +@ApiModel(value = "SpecValueParam对象", description = "规格值查询参数") +public class SpecValueParam extends BaseParam { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "规格值ID") @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "规格名称") - private String ruleName; + private Integer specValueId; @ApiModelProperty(value = "规格值") - private String ruleValue; + private String name; + + @ApiModelProperty(value = "规格组ID") + @QueryField(type = QueryType.EQ) + private Integer specId; } diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsAttrResultService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsAttrResultService.java deleted file mode 100644 index 502cf65..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsAttrResultService.java +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index b885af2..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsAttrService.java +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index 2fdb57d..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsAttrValueService.java +++ /dev/null @@ -1,42 +0,0 @@ -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/shop/service/GoodsCommentService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsCommentService.java deleted file mode 100644 index 5021bdf..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsCommentService.java +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index bad7e8b..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsCouponService.java +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index a2f1aed..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsDescriptionService.java +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index c210807..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsLogService.java +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index a052e0e..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsRelationService.java +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index d85a3c7..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/GoodsRuleService.java +++ /dev/null @@ -1,42 +0,0 @@ -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/shop/service/GoodsSkuService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsSkuService.java new file mode 100644 index 0000000..b401ba2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsSkuService.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.GoodsSku; +import com.gxwebsoft.shop.param.GoodsSkuParam; + +import java.util.List; + +/** + * 商品sku列表Service + * + * @author 科技小王子 + * @since 2024-04-03 16:06:23 + */ +public interface GoodsSkuService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsSkuParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsSkuParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return GoodsSku + */ + GoodsSku getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsSpecService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsSpecService.java new file mode 100644 index 0000000..9633e8c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsSpecService.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.GoodsSpec; +import com.gxwebsoft.shop.param.GoodsSpecParam; + +import java.util.List; + +/** + * 商品多规格Service + * + * @author 科技小王子 + * @since 2024-04-03 16:06:23 + */ +public interface GoodsSpecService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsSpecParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsSpecParam param); + + /** + * 根据id查询 + * + * @param id 主键 + * @return GoodsSpec + */ + GoodsSpec getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/SpecService.java b/src/main/java/com/gxwebsoft/shop/service/SpecService.java new file mode 100644 index 0000000..c547bd6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/SpecService.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.Spec; +import com.gxwebsoft.shop.param.SpecParam; + +import java.util.List; + +/** + * 商品规格组记录表Service + * + * @author 科技小王子 + * @since 2024-04-01 09:29:43 + */ +public interface SpecService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(SpecParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(SpecParam param); + + /** + * 根据id查询 + * + * @param specId 规格组ID + * @return Spec + */ + Spec getByIdRel(Integer specId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/SpecValueService.java b/src/main/java/com/gxwebsoft/shop/service/SpecValueService.java new file mode 100644 index 0000000..1c77226 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/SpecValueService.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.SpecValue; +import com.gxwebsoft.shop.param.SpecValueParam; + +import java.util.List; + +/** + * 规格值Service + * + * @author 科技小王子 + * @since 2024-04-01 09:49:15 + */ +public interface SpecValueService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(SpecValueParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(SpecValueParam param); + + /** + * 根据id查询 + * + * @param specValueId 规格值ID + * @return SpecValue + */ + SpecValue getByIdRel(Integer specValueId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrResultServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrResultServiceImpl.java deleted file mode 100644 index 6d60f62..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrResultServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 5102c5d..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index dd3d666..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsAttrValueServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -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/shop/service/impl/GoodsCommentServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCommentServiceImpl.java deleted file mode 100644 index 39ac7ac..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCommentServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 312d970..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsCouponServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index b3ac941..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsDescriptionServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 8ff8ed5..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsLogServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index a36a8a9..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsRelationServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 1ead63f..0000000 --- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsRuleServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -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/shop/service/impl/GoodsSkuServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsSkuServiceImpl.java new file mode 100644 index 0000000..527df42 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsSkuServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsSkuMapper; +import com.gxwebsoft.shop.service.GoodsSkuService; +import com.gxwebsoft.shop.entity.GoodsSku; +import com.gxwebsoft.shop.param.GoodsSkuParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品sku列表Service实现 + * + * @author 科技小王子 + * @since 2024-04-03 16:06:23 + */ +@Service +public class GoodsSkuServiceImpl extends ServiceImpl implements GoodsSkuService { + + @Override + public PageResult pageRel(GoodsSkuParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsSkuParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsSku getByIdRel(Integer id) { + GoodsSkuParam param = new GoodsSkuParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsSpecServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsSpecServiceImpl.java new file mode 100644 index 0000000..474a02b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsSpecServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsSpecMapper; +import com.gxwebsoft.shop.service.GoodsSpecService; +import com.gxwebsoft.shop.entity.GoodsSpec; +import com.gxwebsoft.shop.param.GoodsSpecParam; +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-04-03 16:06:23 + */ +@Service +public class GoodsSpecServiceImpl extends ServiceImpl implements GoodsSpecService { + + @Override + public PageResult pageRel(GoodsSpecParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsSpecParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsSpec getByIdRel(Integer id) { + GoodsSpecParam param = new GoodsSpecParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/SpecServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/SpecServiceImpl.java new file mode 100644 index 0000000..4277bc9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/SpecServiceImpl.java @@ -0,0 +1,60 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.entity.SpecValue; +import com.gxwebsoft.shop.mapper.SpecMapper; +import com.gxwebsoft.shop.param.SpecValueParam; +import com.gxwebsoft.shop.service.SpecService; +import com.gxwebsoft.shop.entity.Spec; +import com.gxwebsoft.shop.param.SpecParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.service.SpecValueService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品规格组记录表Service实现 + * + * @author 科技小王子 + * @since 2024-04-01 09:29:43 + */ +@Service +public class SpecServiceImpl extends ServiceImpl implements SpecService { + @Resource + private SpecValueService specValueService; + + @Override + public PageResult pageRel(SpecParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc"); + List list = baseMapper.selectPageRel(page, param); + list.forEach(item -> { + item.setSpecValues(specValueService.list(new LambdaQueryWrapper().eq(SpecValue::getSpecId,item.getSpecId()))); + }); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(SpecParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc"); + list.forEach(item -> { + item.setSpecValues(specValueService.list(new LambdaQueryWrapper().eq(SpecValue::getSpecId,item.getSpecId()))); + }); + return page.sortRecords(list); + } + + @Override + public Spec getByIdRel(Integer specId) { + SpecParam param = new SpecParam(); + param.setSpecId(specId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/SpecValueServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/SpecValueServiceImpl.java new file mode 100644 index 0000000..901baad --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/SpecValueServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.SpecValueMapper; +import com.gxwebsoft.shop.service.SpecValueService; +import com.gxwebsoft.shop.entity.SpecValue; +import com.gxwebsoft.shop.param.SpecValueParam; +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-04-01 09:49:15 + */ +@Service +public class SpecValueServiceImpl extends ServiceImpl implements SpecValueService { + + @Override + public PageResult pageRel(SpecValueParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(SpecValueParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc"); + return page.sortRecords(list); + } + + @Override + public SpecValue getByIdRel(Integer specValueId) { + SpecValueParam param = new SpecValueParam(); + param.setSpecValueId(specValueId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java index efdc765..a6625e5 100644 --- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -46,10 +46,12 @@ public class ShopGenerator { private static final String MODULE_NAME = "shop"; // 需要生成的表 private static final String[] TABLE_NAMES = new String[]{ - "shop_goods", -// "shop_goods_attr", -// "shop_goods_attr_result", -// "shop_goods_attr_value", +// "shop_spec", +// "shop_spec_value" +// "shop_goods", +// "shop_goods_spec", + "shop_goods_spec_rel", +// "shop_goods_sku", // "shop_goods_category", // "shop_goods_coupon", // "shop_goods_description", 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 index 0b4d064..abd7a35 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/components.edit.vue.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/components.edit.vue.btl @@ -5,7 +5,7 @@ :visible="visible" :maskClosable="false" :maxable="maxable" - :title="isUpdate ? '编辑广告' : '添加广告'" + :title="isUpdate ? '编辑${table.comment!}' : '添加${table.comment!}'" :body-style="{ paddingBottom: '28px' }" @update:visible="updateVisible" @ok="save" @@ -19,101 +19,22 @@ styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' } " > - - - 图片广告 - 幻灯片 - 视频广告 - - - - - - + - + - - - - 开启 - 关闭 + 显示 + 隐藏 @@ -136,15 +57,12 @@ - diff --git a/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl b/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl index d41645e..94406f6 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl @@ -4,7 +4,7 @@ map = new HashMap<>(); - map.put("packageName", PACKAGE_NAME); - map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); - map.put("paramToStringType", PARAM_TO_STRING_TYPE); - map.put("paramEqType", PARAM_EQ_TYPE); - map.put("authAnnotation", AUTH_ANNOTATION); - map.put("logAnnotation", LOG_ANNOTATION); - map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); - this.setMap(map); - } - }; - String templatePath = TEMPLATES_DIR + "/index.ts.btl"; - List focList = new ArrayList<>(); - focList.add(new FileOutConfig(templatePath) { - @Override - public String outputFile(TableInfo tableInfo) { - return OUTPUT_LOCATION + OUTPUT_DIR + "/" - + PACKAGE_NAME.replace(".", "/") - + "/" + pc.getModuleName() + "/api/" - + tableInfo.getEntityPath() + '/' + "index.ts"; - } - }); - templatePath = TEMPLATES_DIR + "/model.ts.btl"; - focList.add(new FileOutConfig(templatePath) { - @Override - public String outputFile(TableInfo tableInfo) { - return OUTPUT_LOCATION + OUTPUT_DIR + "/" - + PACKAGE_NAME.replace(".", "/") - + "/" + pc.getModuleName() + "/api/" - + tableInfo.getEntityPath() + "/model/" + "index.ts"; - } - }); - cfg.setFileOutConfigList(focList); - mpg.setCfg(cfg); - - mpg.execute(); - } - -} diff --git a/src/test/java/com/gxwebsoft/generatorVue/engine/BeetlTemplateEnginePlus.java b/src/test/java/com/gxwebsoft/generatorVue/engine/BeetlTemplateEnginePlus.java deleted file mode 100644 index da2578b..0000000 --- a/src/test/java/com/gxwebsoft/generatorVue/engine/BeetlTemplateEnginePlus.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.gxwebsoft.generatorVue.engine; - -import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder; -import com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine; -import org.beetl.core.Configuration; -import org.beetl.core.GroupTemplate; -import org.beetl.core.Template; -import org.beetl.core.resource.FileResourceLoader; - -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Map; - -/** - * Beetl模板引擎实现文件输出 - * - * @author WebSoft - * @since 2021-09-05 00:30:28 - */ -public class BeetlTemplateEnginePlus extends AbstractTemplateEngine { - private GroupTemplate groupTemplate; - - @Override - public AbstractTemplateEngine init(ConfigBuilder configBuilder) { - super.init(configBuilder); - try { - Configuration cfg = Configuration.defaultConfiguration(); - groupTemplate = new GroupTemplate(new FileResourceLoader(), cfg); - } catch (IOException e) { - logger.error(e.getMessage(), e); - } - return this; - } - - @Override - public void writer(Map objectMap, String templatePath, String outputFile) throws Exception { - Template template = groupTemplate.getTemplate(templatePath); - try (FileOutputStream fileOutputStream = new FileOutputStream(outputFile)) { - template.binding(objectMap); - template.renderTo(fileOutputStream); - } - logger.debug("模板:" + templatePath + "; 文件:" + outputFile); - } - - @Override - public String templateFilePath(String filePath) { - return filePath + ".btl"; - } - -} diff --git a/src/test/java/com/gxwebsoft/generatorVue/templates/components.edit.vue.btl b/src/test/java/com/gxwebsoft/generatorVue/templates/components.edit.vue.btl deleted file mode 100644 index 0b4d064..0000000 --- a/src/test/java/com/gxwebsoft/generatorVue/templates/components.edit.vue.btl +++ /dev/null @@ -1,361 +0,0 @@ - - - - - diff --git a/src/test/java/com/gxwebsoft/generatorVue/templates/index.ts.btl b/src/test/java/com/gxwebsoft/generatorVue/templates/index.ts.btl deleted file mode 100644 index 9d0b5e9..0000000 --- a/src/test/java/com/gxwebsoft/generatorVue/templates/index.ts.btl +++ /dev/null @@ -1,106 +0,0 @@ -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/generatorVue/templates/index.vue.btl b/src/test/java/com/gxwebsoft/generatorVue/templates/index.vue.btl deleted file mode 100644 index b2365b2..0000000 --- a/src/test/java/com/gxwebsoft/generatorVue/templates/index.vue.btl +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - diff --git a/src/test/java/com/gxwebsoft/generatorVue/templates/model.ts.btl b/src/test/java/com/gxwebsoft/generatorVue/templates/model.ts.btl deleted file mode 100644 index f9907a8..0000000 --- a/src/test/java/com/gxwebsoft/generatorVue/templates/model.ts.btl +++ /dev/null @@ -1,42 +0,0 @@ -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.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/generatorVue/templates/search.vue.btl b/src/test/java/com/gxwebsoft/generatorVue/templates/search.vue.btl deleted file mode 100644 index 82fea9d..0000000 --- a/src/test/java/com/gxwebsoft/generatorVue/templates/search.vue.btl +++ /dev/null @@ -1,42 +0,0 @@ - - - -