From b0fbbbb3967ca64173cb89fa88c0e86b9d4c5069 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 25 九月 2025 10:51:22 +0800
Subject: [PATCH] 修改快手核销bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 e08b353..888b2a4 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,13 +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.domain.vo.*;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.vo.MgtSelectGoodsPageVo;
+import com.ruoyi.system.api.domain.vo.StaticsShopMgtGoodsVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
@@ -134,7 +132,7 @@
}
@RequestMapping(value = "/pageShopMgtGoods", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取门店内商品信息",tags = "管理台商户相关接口")
+ @ApiOperation(value = "商品信息-分页获取门店内商品信息【2.0】",tags = "管理台商户相关接口")
public R<Page<PageShopMgtGoodsVO>> pageShopMgtGoods(@RequestBody PageShopMgtGoodsDTO pageShopMgtGoodsDTO) {
Page<PageShopMgtGoodsVO> page = new Page<>();
page.setSize(pageShopMgtGoodsDTO.getPageSize());
@@ -144,5 +142,31 @@
return R.ok(page.setRecords(pageShopMgtGoods));
}
- //修改价格 转为经销商
+ @RequestMapping(value = "/exportShopMgtGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "商品信息-分页获取门店内商品信息-导出【2.0】",tags = "管理台商户相关接口")
+ public void exportShopMgtGoods(@RequestBody PageShopMgtGoodsDTO pageShopMgtGoodsDTO, HttpServletResponse response) {
+ Page<PageShopMgtGoodsVO> page = new Page<>();
+ if(pageShopMgtGoodsDTO.getPageSize() > 5000){
+ page.setSize(5000);
+ page.setCurrent(1);
+ }else{
+ page.setSize(pageShopMgtGoodsDTO.getPageSize());
+ page.setCurrent(pageShopMgtGoodsDTO.getPageNum());
+ }
+ List<PageShopMgtGoodsVO> pageShopMgtGoods = goodsService.pageShopMgtGoods(page,pageShopMgtGoodsDTO);
+ ExcelUtil<PageShopMgtGoodsVO> util = new ExcelUtil<PageShopMgtGoodsVO>(PageShopMgtGoodsVO.class);
+ util.exportExcel(response, pageShopMgtGoods, "商品信息");
+ }
+ @RequestMapping(value = "/staticsShopMgtGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "商品信息-获取门店内商品信息统计汇总【2.0】",tags = "管理台商户相关接口")
+ public R<StaticsShopMgtGoodsVO> staticsShopMgtGoods(@RequestBody PageShopMgtGoodsDTO pageShopMgtGoodsDTO) {
+ return R.ok(goodsService.staticsShopMgtGoods(pageShopMgtGoodsDTO));
+ }
+ @RequestMapping(value = "/updateGoodsPrice", method = RequestMethod.POST)
+ @Log(title = "商品管理", businessType = BusinessType.UPDATE,operContent = "修改门店内商品价格")
+ @ApiOperation(value = "商品信息-修改价格【2.0】",tags = "管理台商户相关接口")
+ public R<Void> updateGoodsPrice(@RequestBody UpdateGoodsPriceDTO updateGoodsPriceDTO) {
+ return goodsService.updateGoodsPrice(updateGoodsPriceDTO);
+ }
+
}
--
Gitblit v1.7.1