From 28b064ba8e9730f8d23499d18ff316ef0d63cf4c Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Wed, 23 Mar 2022 21:41:55 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=BF=98=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E5=85=A8=E5=AE=9E=E7=8E=B0=202=E3=80=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=80=E4=BA=9B=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/mall/ware/ware-sku.js | 45 +++++ .../views/mall/product/maintain/manager.vue | 2 +- .../ware/waresku/waresku-add-or-update.vue | 140 +++++++++++++ .../src/views/mall/ware/waresku/waresku.vue | 186 ++++++++++++++++++ .../ProductAttrValueController.java | 84 -------- .../controller/SkuImagesController.java | 84 -------- .../product/controller/SkuInfoController.java | 43 +--- .../SkuSaleAttrValueController.java | 84 -------- .../controller/SpuImagesController.java | 84 -------- .../product/controller/SpuInfoController.java | 34 +--- .../controller/SpuInfoDescController.java | 84 -------- .../service/ProductAttrValueService.java | 5 +- .../product/service/SkuImagesService.java | 4 - .../service/SkuSaleAttrValueService.java | 4 - .../product/service/SpuImagesService.java | 4 - .../product/service/SpuInfoDescService.java | 5 - .../impl/ProductAttrValueServiceImpl.java | 15 -- .../service/impl/SkuImagesServiceImpl.java | 18 +- .../impl/SkuSaleAttrValueServiceImpl.java | 11 +- .../service/impl/SpuImagesServiceImpl.java | 9 - .../service/impl/SpuInfoDescServiceImpl.java | 9 - .../ware/controller/WareSkuController.java | 12 +- .../xjs/mall/ware/service/WareSkuService.java | 2 +- .../ware/service/impl/WareSkuServiceImpl.java | 19 +- 24 files changed, 402 insertions(+), 585 deletions(-) create mode 100644 ruoyi-ui/src/api/mall/ware/ware-sku.js create mode 100644 ruoyi-ui/src/views/mall/ware/waresku/waresku-add-or-update.vue create mode 100644 ruoyi-ui/src/views/mall/ware/waresku/waresku.vue delete mode 100644 xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/ProductAttrValueController.java delete mode 100644 xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuImagesController.java delete mode 100644 xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuSaleAttrValueController.java delete mode 100644 xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuImagesController.java delete mode 100644 xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuInfoDescController.java diff --git a/ruoyi-ui/src/api/mall/ware/ware-sku.js b/ruoyi-ui/src/api/mall/ware/ware-sku.js new file mode 100644 index 00000000..1885d80d --- /dev/null +++ b/ruoyi-ui/src/api/mall/ware/ware-sku.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +//获取仓库库存列表 +export function getWareSkuList(parms) { + return request({ + url: '/mall-ware/ware/waresku/list', + method: 'get', + params: parms + }) +} + +//删除仓库库存 +export function delWareSku(ids) { + return request({ + url: '/mall-ware/ware/waresku/delete', + method: 'delete', + data: ids + }) +} + +//获取仓库库存详情 +export function getWareSku(id) { + return request({ + url: `/mall-ware/ware/waresku/info/${id}`, + method: 'get', + }) +} + +//保存仓库库存 +export function saveWareSku(data) { + return request({ + url: `/mall-ware/ware/waresku/save`, + method: 'post', + data: data, + }) +} + +//修改仓库库存 +export function editWareSku(data) { + return request({ + url: `/mall-ware/ware/waresku/update`, + method: 'put', + data: data, + }) +} diff --git a/ruoyi-ui/src/views/mall/product/maintain/manager.vue b/ruoyi-ui/src/views/mall/product/maintain/manager.vue index 3cc1c4e0..93de5a4e 100644 --- a/ruoyi-ui/src/views/mall/product/maintain/manager.vue +++ b/ruoyi-ui/src/views/mall/product/maintain/manager.vue @@ -161,7 +161,7 @@ export default { //处理更多指令 handleCommand(row, command) { if ("stockSettings" === command) { - this.$router.push({path: "/ware-sku", query: {skuId: row.skuId}}); + this.$router.push({path: "/mall/ware/ware-sku", query: {skuId: row.skuId}}); } }, diff --git a/ruoyi-ui/src/views/mall/ware/waresku/waresku-add-or-update.vue b/ruoyi-ui/src/views/mall/ware/waresku/waresku-add-or-update.vue new file mode 100644 index 00000000..30b8170d --- /dev/null +++ b/ruoyi-ui/src/views/mall/ware/waresku/waresku-add-or-update.vue @@ -0,0 +1,140 @@ + + + diff --git a/ruoyi-ui/src/views/mall/ware/waresku/waresku.vue b/ruoyi-ui/src/views/mall/ware/waresku/waresku.vue new file mode 100644 index 00000000..9c239ed8 --- /dev/null +++ b/ruoyi-ui/src/views/mall/ware/waresku/waresku.vue @@ -0,0 +1,186 @@ + + + diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/ProductAttrValueController.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/ProductAttrValueController.java deleted file mode 100644 index c04278a6..00000000 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/ProductAttrValueController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.xjs.mall.product.controller; - -import java.util.Arrays; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.xjs.mall.product.entity.ProductAttrValueEntity; -import com.xjs.mall.product.service.ProductAttrValueService; -import com.xjs.utils.PageUtils; -import com.xjs.mall.other.R; - - - -/** - * spu属性值 - * - * @author xiejs - * @email 1294405880@qq.com - * @date 2022-03-15 10:16:53 - */ -@RestController -@RequestMapping("product/productattrvalue") -public class ProductAttrValueController { - @Autowired - private ProductAttrValueService productAttrValueService; - - /** - * 列表 - */ - @RequestMapping("/list") - public R list(@RequestParam Map params){ - PageUtils page = productAttrValueService.queryPage(params); - - return R.ok().put("page", page); - } - - - /** - * 信息 - */ - @RequestMapping("/info/{id}") - public R info(@PathVariable("id") Long id){ - ProductAttrValueEntity productAttrValue = productAttrValueService.getById(id); - - return R.ok().put("productAttrValue", productAttrValue); - } - - /** - * 保存 - */ - @RequestMapping("/save") - public R save(@RequestBody ProductAttrValueEntity productAttrValue){ - productAttrValueService.save(productAttrValue); - - return R.ok(); - } - - /** - * 修改 - */ - @RequestMapping("/update") - public R update(@RequestBody ProductAttrValueEntity productAttrValue){ - productAttrValueService.updateById(productAttrValue); - - return R.ok(); - } - - /** - * 删除 - */ - @RequestMapping("/delete") - public R delete(@RequestBody Long[] ids){ - productAttrValueService.removeByIds(Arrays.asList(ids)); - - return R.ok(); - } - -} diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuImagesController.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuImagesController.java deleted file mode 100644 index c199602a..00000000 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuImagesController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.xjs.mall.product.controller; - -import java.util.Arrays; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.xjs.mall.product.entity.SkuImagesEntity; -import com.xjs.mall.product.service.SkuImagesService; -import com.xjs.utils.PageUtils; -import com.xjs.mall.other.R; - - - -/** - * sku图片 - * - * @author xiejs - * @email 1294405880@qq.com - * @date 2022-03-15 10:16:53 - */ -@RestController -@RequestMapping("product/skuimages") -public class SkuImagesController { - @Autowired - private SkuImagesService skuImagesService; - - /** - * 列表 - */ - @RequestMapping("/list") - public R list(@RequestParam Map params){ - PageUtils page = skuImagesService.queryPage(params); - - return R.ok().put("page", page); - } - - - /** - * 信息 - */ - @RequestMapping("/info/{id}") - public R info(@PathVariable("id") Long id){ - SkuImagesEntity skuImages = skuImagesService.getById(id); - - return R.ok().put("skuImages", skuImages); - } - - /** - * 保存 - */ - @RequestMapping("/save") - public R save(@RequestBody SkuImagesEntity skuImages){ - skuImagesService.save(skuImages); - - return R.ok(); - } - - /** - * 修改 - */ - @RequestMapping("/update") - public R update(@RequestBody SkuImagesEntity skuImages){ - skuImagesService.updateById(skuImages); - - return R.ok(); - } - - /** - * 删除 - */ - @RequestMapping("/delete") - public R delete(@RequestBody Long[] ids){ - skuImagesService.removeByIds(Arrays.asList(ids)); - - return R.ok(); - } - -} diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuInfoController.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuInfoController.java index 1949de25..0a078435 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuInfoController.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuInfoController.java @@ -32,7 +32,7 @@ public class SkuInfoController extends MyBaseController { /** * 列表 */ - @RequestMapping("/list") + @GetMapping("/list") @ApiOperation("列表") public R list(@RequestParam Map params){ super.checkParams(params); @@ -41,45 +41,4 @@ public class SkuInfoController extends MyBaseController { return R.ok().put("page", page); } - - /** - * 信息 - */ - @RequestMapping("/info/{skuId}") - public R info(@PathVariable("skuId") Long skuId){ - SkuInfoEntity skuInfo = skuInfoService.getById(skuId); - - return R.ok().put("skuInfo", skuInfo); - } - - /** - * 保存 - */ - @RequestMapping("/save") - public R save(@RequestBody SkuInfoEntity skuInfo){ - skuInfoService.save(skuInfo); - - return R.ok(); - } - - /** - * 修改 - */ - @RequestMapping("/update") - public R update(@RequestBody SkuInfoEntity skuInfo){ - skuInfoService.updateById(skuInfo); - - return R.ok(); - } - - /** - * 删除 - */ - @RequestMapping("/delete") - public R delete(@RequestBody Long[] skuIds){ - skuInfoService.removeByIds(Arrays.asList(skuIds)); - - return R.ok(); - } - } diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuSaleAttrValueController.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuSaleAttrValueController.java deleted file mode 100644 index c2d9ae51..00000000 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SkuSaleAttrValueController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.xjs.mall.product.controller; - -import java.util.Arrays; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.xjs.mall.product.entity.SkuSaleAttrValueEntity; -import com.xjs.mall.product.service.SkuSaleAttrValueService; -import com.xjs.utils.PageUtils; -import com.xjs.mall.other.R; - - - -/** - * sku销售属性&值 - * - * @author xiejs - * @email 1294405880@qq.com - * @date 2022-03-15 10:16:53 - */ -@RestController -@RequestMapping("product/skusaleattrvalue") -public class SkuSaleAttrValueController { - @Autowired - private SkuSaleAttrValueService skuSaleAttrValueService; - - /** - * 列表 - */ - @RequestMapping("/list") - public R list(@RequestParam Map params){ - PageUtils page = skuSaleAttrValueService.queryPage(params); - - return R.ok().put("page", page); - } - - - /** - * 信息 - */ - @RequestMapping("/info/{id}") - public R info(@PathVariable("id") Long id){ - SkuSaleAttrValueEntity skuSaleAttrValue = skuSaleAttrValueService.getById(id); - - return R.ok().put("skuSaleAttrValue", skuSaleAttrValue); - } - - /** - * 保存 - */ - @RequestMapping("/save") - public R save(@RequestBody SkuSaleAttrValueEntity skuSaleAttrValue){ - skuSaleAttrValueService.save(skuSaleAttrValue); - - return R.ok(); - } - - /** - * 修改 - */ - @RequestMapping("/update") - public R update(@RequestBody SkuSaleAttrValueEntity skuSaleAttrValue){ - skuSaleAttrValueService.updateById(skuSaleAttrValue); - - return R.ok(); - } - - /** - * 删除 - */ - @RequestMapping("/delete") - public R delete(@RequestBody Long[] ids){ - skuSaleAttrValueService.removeByIds(Arrays.asList(ids)); - - return R.ok(); - } - -} diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuImagesController.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuImagesController.java deleted file mode 100644 index 2d311047..00000000 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuImagesController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.xjs.mall.product.controller; - -import java.util.Arrays; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.xjs.mall.product.entity.SpuImagesEntity; -import com.xjs.mall.product.service.SpuImagesService; -import com.xjs.utils.PageUtils; -import com.xjs.mall.other.R; - - - -/** - * spu图片 - * - * @author xiejs - * @email 1294405880@qq.com - * @date 2022-03-15 10:16:53 - */ -@RestController -@RequestMapping("product/spuimages") -public class SpuImagesController { - @Autowired - private SpuImagesService spuImagesService; - - /** - * 列表 - */ - @RequestMapping("/list") - public R list(@RequestParam Map params){ - PageUtils page = spuImagesService.queryPage(params); - - return R.ok().put("page", page); - } - - - /** - * 信息 - */ - @RequestMapping("/info/{id}") - public R info(@PathVariable("id") Long id){ - SpuImagesEntity spuImages = spuImagesService.getById(id); - - return R.ok().put("spuImages", spuImages); - } - - /** - * 保存 - */ - @RequestMapping("/save") - public R save(@RequestBody SpuImagesEntity spuImages){ - spuImagesService.save(spuImages); - - return R.ok(); - } - - /** - * 修改 - */ - @RequestMapping("/update") - public R update(@RequestBody SpuImagesEntity spuImages){ - spuImagesService.updateById(spuImages); - - return R.ok(); - } - - /** - * 删除 - */ - @RequestMapping("/delete") - public R delete(@RequestBody Long[] ids){ - spuImagesService.removeByIds(Arrays.asList(ids)); - - return R.ok(); - } - -} diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuInfoController.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuInfoController.java index bbb581b1..579671f2 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuInfoController.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuInfoController.java @@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; import java.util.Map; @@ -34,7 +33,7 @@ public class SpuInfoController extends MyBaseController { /** * 列表 */ - @RequestMapping("/list") + @GetMapping("/list") @ApiOperation("列表") public R list(@RequestParam Map params) { super.checkParams(params); @@ -44,16 +43,6 @@ public class SpuInfoController extends MyBaseController { } - /** - * 信息 - */ - @RequestMapping("/info/{id}") - public R info(@PathVariable("id") Long id) { - SpuInfoEntity spuInfo = spuInfoService.getById(id); - - return R.ok().put("spuInfo", spuInfo); - } - /** * 保存(保存spu关联的所有信息) */ @@ -64,25 +53,4 @@ public class SpuInfoController extends MyBaseController { return R.ok(); } - - /** - * 修改 - */ - @RequestMapping("/update") - public R update(@RequestBody SpuInfoEntity spuInfo) { - spuInfoService.updateById(spuInfo); - - return R.ok(); - } - - /** - * 删除 - */ - @RequestMapping("/delete") - public R delete(@RequestBody Long[] ids) { - spuInfoService.removeByIds(Arrays.asList(ids)); - - return R.ok(); - } - } diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuInfoDescController.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuInfoDescController.java deleted file mode 100644 index a70f70a2..00000000 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/controller/SpuInfoDescController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.xjs.mall.product.controller; - -import java.util.Arrays; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.xjs.mall.product.entity.SpuInfoDescEntity; -import com.xjs.mall.product.service.SpuInfoDescService; -import com.xjs.utils.PageUtils; -import com.xjs.mall.other.R; - - - -/** - * spu信息介绍 - * - * @author xiejs - * @email 1294405880@qq.com - * @date 2022-03-15 10:16:53 - */ -@RestController -@RequestMapping("product/spuinfodesc") -public class SpuInfoDescController { - @Autowired - private SpuInfoDescService spuInfoDescService; - - /** - * 列表 - */ - @RequestMapping("/list") - public R list(@RequestParam Map params){ - PageUtils page = spuInfoDescService.queryPage(params); - - return R.ok().put("page", page); - } - - - /** - * 信息 - */ - @RequestMapping("/info/{spuId}") - public R info(@PathVariable("spuId") Long spuId){ - SpuInfoDescEntity spuInfoDesc = spuInfoDescService.getById(spuId); - - return R.ok().put("spuInfoDesc", spuInfoDesc); - } - - /** - * 保存 - */ - @RequestMapping("/save") - public R save(@RequestBody SpuInfoDescEntity spuInfoDesc){ - spuInfoDescService.save(spuInfoDesc); - - return R.ok(); - } - - /** - * 修改 - */ - @RequestMapping("/update") - public R update(@RequestBody SpuInfoDescEntity spuInfoDesc){ - spuInfoDescService.updateById(spuInfoDesc); - - return R.ok(); - } - - /** - * 删除 - */ - @RequestMapping("/delete") - public R delete(@RequestBody Long[] spuIds){ - spuInfoDescService.removeByIds(Arrays.asList(spuIds)); - - return R.ok(); - } - -} diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/ProductAttrValueService.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/ProductAttrValueService.java index 19f6542b..bd37f492 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/ProductAttrValueService.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/ProductAttrValueService.java @@ -1,12 +1,10 @@ package com.xjs.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.xjs.mall.product.vo.spu.BaseAttrs; -import com.xjs.utils.PageUtils; import com.xjs.mall.product.entity.ProductAttrValueEntity; +import com.xjs.mall.product.vo.spu.BaseAttrs; import java.util.List; -import java.util.Map; /** * spu属性值 @@ -17,7 +15,6 @@ import java.util.Map; */ public interface ProductAttrValueService extends IService { - PageUtils queryPage(Map params); /** * 保存spu的规格参数 diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SkuImagesService.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SkuImagesService.java index a585ecec..f8d3ca4a 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SkuImagesService.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SkuImagesService.java @@ -1,11 +1,8 @@ package com.xjs.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.xjs.utils.PageUtils; import com.xjs.mall.product.entity.SkuImagesEntity; -import java.util.Map; - /** * sku图片 * @@ -15,6 +12,5 @@ import java.util.Map; */ public interface SkuImagesService extends IService { - PageUtils queryPage(Map params); } diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SkuSaleAttrValueService.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SkuSaleAttrValueService.java index 731119b6..c800bbe1 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SkuSaleAttrValueService.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SkuSaleAttrValueService.java @@ -1,11 +1,8 @@ package com.xjs.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.xjs.utils.PageUtils; import com.xjs.mall.product.entity.SkuSaleAttrValueEntity; -import java.util.Map; - /** * sku销售属性&值 * @@ -15,6 +12,5 @@ import java.util.Map; */ public interface SkuSaleAttrValueService extends IService { - PageUtils queryPage(Map params); } diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SpuImagesService.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SpuImagesService.java index 3df98bea..eece0631 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SpuImagesService.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SpuImagesService.java @@ -1,11 +1,9 @@ package com.xjs.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.xjs.utils.PageUtils; import com.xjs.mall.product.entity.SpuImagesEntity; import java.util.List; -import java.util.Map; /** * spu图片 @@ -16,8 +14,6 @@ import java.util.Map; */ public interface SpuImagesService extends IService { - PageUtils queryPage(Map params); - /** * 保存spu图片信息 * @param id spuId diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SpuInfoDescService.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SpuInfoDescService.java index 35b42ea0..2b7467db 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SpuInfoDescService.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/SpuInfoDescService.java @@ -1,11 +1,8 @@ package com.xjs.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.xjs.utils.PageUtils; import com.xjs.mall.product.entity.SpuInfoDescEntity; -import java.util.Map; - /** * spu信息介绍 * @@ -15,8 +12,6 @@ import java.util.Map; */ public interface SpuInfoDescService extends IService { - PageUtils queryPage(Map params); - /** * 保存spu描述信息 * @param descEntity spu描述实体类 diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/ProductAttrValueServiceImpl.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/ProductAttrValueServiceImpl.java index 009d5397..176a03aa 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/ProductAttrValueServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/ProductAttrValueServiceImpl.java @@ -1,7 +1,5 @@ package com.xjs.mall.product.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xjs.mall.product.dao.ProductAttrValueDao; import com.xjs.mall.product.entity.AttrEntity; @@ -9,13 +7,10 @@ import com.xjs.mall.product.entity.ProductAttrValueEntity; import com.xjs.mall.product.service.AttrService; import com.xjs.mall.product.service.ProductAttrValueService; import com.xjs.mall.product.vo.spu.BaseAttrs; -import com.xjs.utils.PageUtils; -import com.xjs.utils.Query; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; @@ -25,16 +20,6 @@ public class ProductAttrValueServiceImpl extends ServiceImpl params) { - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - ); - - return new PageUtils(page); - } - @Override public void saveProductAttr(List baseAttrs,Long spuId) { List productAttrValueEntityList = baseAttrs.stream().map(attr -> { diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SkuImagesServiceImpl.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SkuImagesServiceImpl.java index 06ca28b8..f7c0a285 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SkuImagesServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SkuImagesServiceImpl.java @@ -1,29 +1,15 @@ package com.xjs.mall.product.service.impl; -import org.springframework.stereotype.Service; -import java.util.Map; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.xjs.utils.PageUtils; -import com.xjs.utils.Query; - import com.xjs.mall.product.dao.SkuImagesDao; import com.xjs.mall.product.entity.SkuImagesEntity; import com.xjs.mall.product.service.SkuImagesService; +import org.springframework.stereotype.Service; @Service("skuImagesService") public class SkuImagesServiceImpl extends ServiceImpl implements SkuImagesService { - @Override - public PageUtils queryPage(Map params) { - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - ); - return new PageUtils(page); - } -} \ No newline at end of file +} diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SkuSaleAttrValueServiceImpl.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SkuSaleAttrValueServiceImpl.java index b44a0abb..60b0fc68 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SkuSaleAttrValueServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SkuSaleAttrValueServiceImpl.java @@ -16,14 +16,5 @@ import com.xjs.mall.product.service.SkuSaleAttrValueService; @Service("skuSaleAttrValueService") public class SkuSaleAttrValueServiceImpl extends ServiceImpl implements SkuSaleAttrValueService { - @Override - public PageUtils queryPage(Map params) { - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - ); - return new PageUtils(page); - } - -} \ No newline at end of file +} diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuImagesServiceImpl.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuImagesServiceImpl.java index 98df8b47..ca9ddedc 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuImagesServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuImagesServiceImpl.java @@ -19,15 +19,6 @@ import java.util.stream.Collectors; @Service("spuImagesService") public class SpuImagesServiceImpl extends ServiceImpl implements SpuImagesService { - @Override - public PageUtils queryPage(Map params) { - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - ); - - return new PageUtils(page); - } @Override public void saveImages(Long id, List images) { diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuInfoDescServiceImpl.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuInfoDescServiceImpl.java index 666684a7..4134d006 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuInfoDescServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuInfoDescServiceImpl.java @@ -16,15 +16,6 @@ import java.util.Map; @Service("spuInfoDescService") public class SpuInfoDescServiceImpl extends ServiceImpl implements SpuInfoDescService { - @Override - public PageUtils queryPage(Map params) { - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - ); - - return new PageUtils(page); - } @Override public void saveSpuInfoDesc(SpuInfoDescEntity descEntity) { diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/WareSkuController.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/WareSkuController.java index 0b0e5cf8..2d638fdd 100644 --- a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/WareSkuController.java +++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/WareSkuController.java @@ -4,6 +4,8 @@ import com.xjs.mall.ware.entity.WareSkuEntity; import com.xjs.mall.ware.service.WareSkuService; import com.xjs.utils.PageUtils; import com.xjs.mall.other.R; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,10 +19,11 @@ import java.util.Map; * * @author xiejs * @email 1294405880@qq.com - * @date 2022-03-15 09:56:19 + * @since 2022-03-15 09:56:19 */ @RestController @RequestMapping("ware/waresku") +@Api(tags = "商城-仓库-商品库存") public class WareSkuController { @Autowired private WareSkuService wareSkuService; @@ -28,7 +31,8 @@ public class WareSkuController { /** * 列表 */ - @RequestMapping("/list") + @GetMapping("/list") + @ApiOperation("列表") public R list(@RequestParam Map params){ PageUtils page = wareSkuService.queryPage(params); @@ -40,6 +44,7 @@ public class WareSkuController { * 信息 */ @RequestMapping("/info/{id}") + @ApiOperation("信息") public R info(@PathVariable("id") Long id){ WareSkuEntity wareSku = wareSkuService.getById(id); @@ -50,6 +55,7 @@ public class WareSkuController { * 保存 */ @RequestMapping("/save") + @ApiOperation("保存") public R save(@RequestBody WareSkuEntity wareSku){ wareSkuService.save(wareSku); @@ -60,6 +66,7 @@ public class WareSkuController { * 修改 */ @RequestMapping("/update") + @ApiOperation("修改") public R update(@RequestBody WareSkuEntity wareSku){ wareSkuService.updateById(wareSku); @@ -70,6 +77,7 @@ public class WareSkuController { * 删除 */ @RequestMapping("/delete") + @ApiOperation("删除") public R delete(@RequestBody Long[] ids){ wareSkuService.removeByIds(Arrays.asList(ids)); diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/WareSkuService.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/WareSkuService.java index 8348c12c..2592e6ce 100644 --- a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/WareSkuService.java +++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/WareSkuService.java @@ -11,7 +11,7 @@ import java.util.Map; * * @author xiejs * @email 1294405880@qq.com - * @date 2022-03-15 09:56:19 + * @since 2022-03-15 09:56:19 */ public interface WareSkuService extends IService { diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/WareSkuServiceImpl.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/WareSkuServiceImpl.java index 10eedbea..9869492d 100644 --- a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/WareSkuServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/WareSkuServiceImpl.java @@ -1,8 +1,9 @@ package com.xjs.mall.ware.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.utils.StringUtils; import com.xjs.mall.ware.dao.WareSkuDao; import com.xjs.mall.ware.entity.WareSkuEntity; import com.xjs.mall.ware.service.WareSkuService; @@ -18,12 +19,18 @@ public class WareSkuServiceImpl extends ServiceImpl i @Override public PageUtils queryPage(Map params) { - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - ); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + String key = (String) params.get(Query.KEY_NAME); + if (StringUtils.isNotEmpty(key)) { + wrapper.eq(WareSkuEntity::getSkuName, key).or() + .eq(WareSkuEntity::getSkuId, key).or() + .eq(WareSkuEntity::getWareId, key); + } + + IPage page = this.page(new Query().getPage(params),wrapper); return new PageUtils(page); } -} \ No newline at end of file +}