From c42c20b9c71c25ed119884ffe130ac013afb7f07 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 09:02:34 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java
index 68fe7e6..eabdc44 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java
@@ -7,10 +7,11 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.dto.*;
+import com.ruoyi.goods.domain.vo.MgtGoodsEditInfoVo;
import com.ruoyi.goods.domain.vo.MgtGoodsPageVo;
import com.ruoyi.goods.domain.vo.MgtGoodsTotalVo;
+import com.ruoyi.goods.domain.vo.PageShopMgtGoodsVO;
import com.ruoyi.goods.service.goods.GoodsService;
-import com.ruoyi.system.api.domain.dto.MgtBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.vo.MgtSelectGoodsPageVo;
import io.swagger.annotations.Api;
@@ -32,7 +33,7 @@
* @date 2023年06月01日
* @version: 1.0
*/
-@Api(value = "平台端商品相关接口", tags = "平台端商品相关接口", description = "平台端商品相关接口")
+@Api(value = "管理后台商品相关接口", tags = "管理后台商品相关接口", description = "管理后台商品相关接口")
@RestController
@RequestMapping("/mgt/goods")
public class MgtGoodsController {
@@ -53,10 +54,15 @@
@RequestMapping(value = "/exportPageMgtGoods", method = RequestMethod.POST)
@ApiOperation(value = "导出商品列表")
- public void exportPageMgtGoods(@RequestBody MgtGoodsPageDto mgtGoodsPageDto, HttpServletResponse response) {
+ public void exportPageMgtGoods( MgtGoodsPageDto mgtGoodsPageDto, HttpServletResponse response) {
Page<MgtGoodsPageVo> page = new Page<>();
- page.setSize(2000);
- page.setCurrent(1);
+ if(mgtGoodsPageDto.getPageSize() > 5000){
+ page.setSize(5000);
+ page.setCurrent(1);
+ }else{
+ page.setSize(mgtGoodsPageDto.getPageSize());
+ page.setCurrent(mgtGoodsPageDto.getPageNum());
+ }
List<MgtGoodsPageVo> mgtGoodsPageVoList = goodsService.pageMgtGoods(page,mgtGoodsPageDto);
ExcelUtil<MgtGoodsPageVo> util = new ExcelUtil<MgtGoodsPageVo>(MgtGoodsPageVo.class);
util.exportExcel(response, mgtGoodsPageVoList, "商品列表");
@@ -64,9 +70,7 @@
@RequestMapping(value = "/getMgtGoodsTotal", method = RequestMethod.POST)
@ApiOperation(value = "获取商品统计")
- public R<MgtGoodsTotalVo> getMgtGoodsTotal(@RequestBody MgtBaseDto mgtBaseDto) {
- Long userId = SecurityUtils.getUserId();
- mgtBaseDto.setUserId(userId);
+ public R<MgtGoodsTotalVo> getMgtGoodsTotal() {
MgtGoodsTotalVo mgtGoodsTotalVo = goodsService.getMgtGoodsTotal();
return R.ok(mgtGoodsTotalVo);
}
@@ -121,4 +125,30 @@
List<MgtSelectGoodsPageVo> mgtSelectGoodsPageVos = goodsService.pageMgtSelectGoods(page,mgtSelectGoodsPageDto);
return R.ok(page.setRecords(mgtSelectGoodsPageVos));
}
+
+ @RequestMapping(value = "/getMgtGoodsEditInfo", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商品编辑信息")
+ public R<MgtGoodsEditInfoVo> getMgtGoodsEditInfo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ MgtGoodsEditInfoVo mgtGoodsEditInfoVo = goodsService.getMgtGoodsEditInfo(mgtBaseGetDto);
+ return R.ok(mgtGoodsEditInfoVo);
+ }
+
+ @RequestMapping(value = "/pageShopMgtGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "商品信息-分页获取门店内商品信息【2.0】",tags = "管理台商户相关接口")
+ public R<Page<PageShopMgtGoodsVO>> pageShopMgtGoods(@RequestBody PageShopMgtGoodsDTO pageShopMgtGoodsDTO) {
+ Page<PageShopMgtGoodsVO> page = new Page<>();
+ page.setSize(pageShopMgtGoodsDTO.getPageSize());
+ page.setCurrent(pageShopMgtGoodsDTO.getPageNum());
+ page.setOptimizeCountSql(false);
+ List<PageShopMgtGoodsVO> pageShopMgtGoods = goodsService.pageShopMgtGoods(page,pageShopMgtGoodsDTO);
+ return R.ok(page.setRecords(pageShopMgtGoods));
+ }
+
+
+ @RequestMapping(value = "/updateGoodsPrice", method = RequestMethod.POST)
+ @ApiOperation(value = "商品信息-修改价格【2.0】",tags = "管理台商户相关接口")
+ public R<Void> updateGoodsPrice(@RequestBody UpdateGoodsPriceDTO updateGoodsPriceDTO) {
+ return goodsService.updateGoodsPrice(updateGoodsPriceDTO);
+ }
+
}
--
Gitblit v1.7.1