From 16f0ae2b40ab76f122eb248247fd1f204c09a708 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 09:46:15 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
index ef8e309..e3d0b48 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
@@ -139,16 +139,24 @@
shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().lambda()
.eq(ComShopFlowerGoodsAttrDO::getGoodsId, shopGoods.getId()));
ArrayList<AddShopFlowerGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
+ int stock = 0;
+ int sale = 0;
for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
AddShopFlowerGoodsAttrVO goodsAttrVO = new AddShopFlowerGoodsAttrVO();
BeanUtils.copyProperties(oneGoodsAttrDO, goodsAttrVO);
goodsAttrVO.setGoodsAttrId(oneGoodsAttrDO.getId());
goodsAttrVOList.add(goodsAttrVO);
+ sale = sale + oneGoodsAttrDO.getSale();
+ stock = stock +oneGoodsAttrDO.getStock();
}
shopGoods.setGoodsAttrs(goodsAttrVOList);
if (CollUtil.isNotEmpty(goodsAttrDOs)){
shopGoods.setGoodsPic(goodsAttrDOs.get(0).getAttrPic());
}
+ String categoryNames = convenientGoodsCategoryDAO.selectCategoryScopeByGoodsId(shopGoods.getId());
+ shopGoods.setCategoryName(categoryNames);
+ shopGoods.setStock(stock);
+ shopGoods.setSale(sale);
});
}
return R.ok(comShopStoreVOIPage);
--
Gitblit v1.7.1