From e42cd39c92b627ffa900b131912d9137a98506d7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 10:41:29 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
index 12d044e..5e9e992 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
@@ -13,12 +13,12 @@
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.vo.GetGoodsBargainPrice;
import com.ruoyi.other.service.*;
+import com.ruoyi.other.vo.AddGoodsBargainPriceVo;
+import com.ruoyi.other.vo.GoodsBargainPriceInfo;
import com.ruoyi.other.vo.ShopGoodsList;
import com.ruoyi.other.vo.ShopGoodsListVo;
import com.ruoyi.system.api.model.LoginUser;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
import io.swagger.models.auth.In;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -170,12 +170,12 @@
.eq(goodsType != null, Goods::getType, goodsType)
.eq(categoryId != null, Goods::getGoodsCategoryId, categoryId));
List<Integer> goodsIds = goodsList.stream().map(Goods::getId).collect(Collectors.toList());
- if (goodsId != null){
- goodsIds.add(goodsId);
+ if (CollectionUtils.isEmpty(goodsIds)){
+ return R.ok();
}
Page<GoodsBargainPrice> page = goodsBargainPriceService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsBargainPrice>()
- .eq(!CollectionUtils.isEmpty(goodsIds), GoodsBargainPrice::getGoodsId, goodsId)
+ .in(!CollectionUtils.isEmpty(goodsIds), GoodsBargainPrice::getGoodsId, goodsIds)
.eq(auditStatus != null, GoodsBargainPrice::getAuditStatus, auditStatus));
page.getRecords().forEach(goodsBargainPrice -> goodsList.stream()
@@ -197,11 +197,29 @@
return R.ok(page);
}
-
-
+ @ResponseBody
+ @GetMapping("/getGoodsBargainPriceInfo/{id}")
+ @ApiOperation(value = "获取商品特殊售价详情", tags = {"门店后台-商品管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "商品id", name = "id", required = true, dataType = "int"),
+ })
+ public R<GoodsBargainPriceInfo> getGoodsBargainPriceInfo(@PathVariable("id") Integer id){
+ GoodsBargainPriceInfo goodsBargainPriceInfo = goodsBargainPriceService.getGoodsBargainPriceInfo(id);
+ return R.ok(goodsBargainPriceInfo);
+ }
+
+
+
+
+ @ResponseBody
+ @GetMapping("/addGoodsBargainPrice/{id}")
+ @ApiOperation(value = "保存商品特殊售价", tags = {"门店后台-商品管理"})
+ public R addGoodsBargainPrice(@RequestBody AddGoodsBargainPriceVo vo){
+ return goodsBargainPriceService.addGoodsBargainPrice(vo);
+ }
}
--
Gitblit v1.7.1