From f28142767f8823667499e6e94a76789f601f1654 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 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 bce64c6..18c5f56 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
@@ -64,8 +64,6 @@
/**
* 根据商品id和会员等级获取门店特价
*
- * @param goodsBargainPrice
- * @return
*/
@PostMapping("/getGoodsBargainPrice")
public R<GoodsBargainPriceDetail> getGoodsBargainPrice(@RequestBody GetGoodsBargainPrice goodsBargainPrice) {
@@ -176,24 +174,22 @@
.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.getAppUserByPhone(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());
- });
- });
+ 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.getAppUserByPhone(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