From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
index fe384b5..25d422c 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
@@ -3,23 +3,21 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.goods.domain.dto.AppConsumerPageDto;
import com.ruoyi.goods.domain.dto.MerGoodsPageDto;
import com.ruoyi.goods.domain.dto.MerShopGoodsEditDto;
-import com.ruoyi.goods.domain.vo.AppConsumerPageVo;
+import com.ruoyi.goods.domain.dto.MgtSelectGoodsPageDto;
import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtSelectGoodsPageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -34,7 +32,7 @@
@RequestMapping("/mer/goods")
public class MerGoodsController {
- @Autowired
+ @Resource
private GoodsService goodsService;
@RequestMapping(value = "/pageMerShopGoods", method = RequestMethod.POST)
@@ -49,6 +47,13 @@
return R.ok(page.setRecords(merGoodsPageVoList));
}
+ @RequestMapping(value = "/listMerCycleGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户周期商品列表")
+ public R<List<MerGoodsPageVo>> listMerCycleGoods(@RequestBody MerBaseDto merBaseDto) {
+ List<MerGoodsPageVo> merGoodsPageVoList = goodsService.listMerCycleGoods(merBaseDto.getShopId());
+ return R.ok(merGoodsPageVoList);
+ }
+
@RequestMapping(value = "/editMerShopGoods", method = RequestMethod.POST)
@ApiOperation(value = "编辑商户商品价格")
public R editMerShopGoods(@RequestBody MerShopGoodsEditDto merShopGoodsEditDto) {
@@ -57,4 +62,15 @@
goodsService.editMerShopGoods(merShopGoodsEditDto);
return R.ok();
}
+
+ @RequestMapping(value = "/pageMerSelectGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商品选择列表")
+ public R<Page<MgtSelectGoodsPageVo>> pageMerSelectGoods(@RequestBody MgtSelectGoodsPageDto mgtSelectGoodsPageDto) {
+ Page<MgtSelectGoodsPageVo> page = new Page<>();
+ page.setSize(mgtSelectGoodsPageDto.getPageSize());
+ page.setCurrent(mgtSelectGoodsPageDto.getPageNum());
+ page.setOptimizeCountSql(false);
+ List<MgtSelectGoodsPageVo> mgtSelectGoodsPageVos = goodsService.pageMgtSelectGoods(page,mgtSelectGoodsPageDto);
+ return R.ok(page.setRecords(mgtSelectGoodsPageVos));
+ }
}
--
Gitblit v1.7.1