From 8c2a413d2574151a2bc762aa0779f766de48160b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 18:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 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 72a84a9..12d044e 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
@@ -3,16 +3,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.other.api.domain.Goods;
-import com.ruoyi.other.api.domain.GoodsBargainPrice;
-import com.ruoyi.other.api.domain.GoodsBargainPriceDetail;
+import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.vo.GetGoodsBargainPrice;
-import com.ruoyi.other.service.GoodsBargainPriceDetailService;
-import com.ruoyi.other.service.GoodsBargainPriceService;
-import com.ruoyi.other.service.GoodsService;
+import com.ruoyi.other.service.*;
+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;
@@ -24,6 +26,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
import static com.alibaba.nacos.shaded.org.checkerframework.checker.units.UnitsTools.g;
@@ -52,12 +55,19 @@
@Resource
private GoodsService goodsService;
+ @Resource
+ private GoodsCategoryService goodsCategoryService;
+
+ @Resource
+ private AppUserClient appUserClient;
+
+ @Resource
+ private ShopService shopService;
+
/**
* 根据商品id和会员等级获取门店特价
*
- * @param goodsBargainPrice
- * @return
*/
@PostMapping("/getGoodsBargainPrice")
public R<GoodsBargainPriceDetail> getGoodsBargainPrice(@RequestBody GetGoodsBargainPrice goodsBargainPrice) {
@@ -80,7 +90,7 @@
* 新增
*/
@PostMapping("/add")
- @ApiOperation(value = "新增", tags = {"后台管理-门店特殊售价"})
+ @ApiOperation(value = "新增", tags = {"管理后台-商品管理-门店特殊售价"})
@Transactional(rollbackFor = Exception.class)
public R<Void> add(@RequestBody GoodsBargainPrice goodsBargainPrice) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
@@ -106,7 +116,7 @@
* 删除
*/
@DeleteMapping("/delete")
- @ApiOperation(value = "删除", tags = {"后台管理-门店特殊售价"})
+ @ApiOperation(value = "删除", tags = {"管理后台-商品管理-门店特殊售价-"})
public R<Void> delete(@ApiParam("id") @RequestParam("id") Integer id) {
goodsBargainPriceService.removeById(id);
goodsBargainPriceDetailService.remove(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
@@ -118,7 +128,7 @@
* 修改
*/
@PutMapping("/edit")
- @ApiOperation(value = "修改", tags = {"后台管理-门店特殊售价"})
+ @ApiOperation(value = "修改", tags = {"管理后台-商品管理-门店特殊售价"})
@Transactional(rollbackFor = Exception.class)
public R<Void> edit(@RequestBody GoodsBargainPrice goodsBargainPrice) {
goodsBargainPriceService.updateById(goodsBargainPrice);
@@ -132,7 +142,7 @@
* 详情
*/
@GetMapping("/detail")
- @ApiOperation(value = "详情", tags = {"后台管理-门店特殊售价"})
+ @ApiOperation(value = "详情", tags = {"管理后台-商品管理-门店特殊售价"})
public R<GoodsBargainPrice> detail(@ApiParam("id") @RequestParam("id") Integer id) {
GoodsBargainPrice goodsBargainPrice = goodsBargainPriceService.getById(id);
List<GoodsBargainPriceDetail> goodsBargainPriceDetailList = goodsBargainPriceDetailService.list(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
@@ -145,7 +155,7 @@
* 列表
*/
@GetMapping("/list")
- @ApiOperation(value = "列表", tags = {"后台管理-门店特殊售价"})
+ @ApiOperation(value = "列表", tags = {"管理后台-商品管理-门店特殊售价"})
public R<Page<GoodsBargainPrice>> list(@ApiParam("页码") @RequestParam(value = "pageNum", required = false) Integer pageNum,
@ApiParam("每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize,
@ApiParam("商品id") @RequestParam(value = "goodsId", required = false) Integer goodsId,
@@ -155,19 +165,43 @@
@ApiParam("审核状态") @RequestParam(value = "auditStatus", required = false) Integer auditStatus) {
- List<Integer> goodsIds = goodsService.listObjs(new LambdaQueryWrapper<Goods>()
- .select(Goods::getId)
+ List<Goods> goodsList = goodsService.list(new LambdaQueryWrapper<Goods>()
.eq(StringUtils.isNotEmpty(goodsName), Goods::getName, goodsName)
.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);
+ }
- goodsIds.add(goodsId);
Page<GoodsBargainPrice> page = goodsBargainPriceService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsBargainPrice>()
.eq(!CollectionUtils.isEmpty(goodsIds), GoodsBargainPrice::getGoodsId, goodsId)
.eq(auditStatus != null, GoodsBargainPrice::getAuditStatus, auditStatus));
+
+ page.getRecords().forEach(goodsBargainPrice -> goodsList.stream()
+ .filter(goods -> goods.getId().equals(goodsBargainPrice.getGoodsId()))
+ .findFirst().ifPresent(g -> {
+ GoodsCategory goodsCategory = goodsCategoryService.getById(g.getGoodsCategoryId());
+ Integer shopId = goodsBargainPrice.getShopId();
+ Shop shop = shopService.getById(shopId);
+ R<AppUser> r = appUserClient.getAppUserByPhone1(shop.getPhone());
+ if (R.isError(r)){
+ throw new RuntimeException("获取店长信息失败");
+ }
+ goodsBargainPrice.setOwnerName(r.getData().getName());
+ goodsBargainPrice.setOwnerPhone(shop.getPhone());
+ goodsBargainPrice.setShopName(shop.getName());
+ goodsBargainPrice.setGoodsName(g.getName());
+ goodsBargainPrice.setCategoryName(goodsCategory.getName());
+ }));
+
return R.ok(page);
}
+
+
+
+
}
--
Gitblit v1.7.1