From d56a4ae3aded7fecbecf98d33557f28dedc3abc6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:43 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 1c68287..e61634c 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
@@ -1,6 +1,8 @@
package com.panzhihua.service_community.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,10 +28,12 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import static java.util.Objects.isNull;
@@ -135,16 +139,29 @@
shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().lambda()
.eq(ComShopFlowerGoodsAttrDO::getGoodsId, shopGoods.getId()));
ArrayList<AddShopFlowerGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
+ StringBuilder sbr = new StringBuilder();
+ 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();
+ sbr.append(oneGoodsAttrDO.getGoodsAttrName()).append(" ");
}
+ shopGoods.setGoodsAttrName(sbr.toString());
shopGoods.setGoodsAttrs(goodsAttrVOList);
if (CollUtil.isNotEmpty(goodsAttrDOs)){
shopGoods.setGoodsPic(goodsAttrDOs.get(0).getAttrPic());
}
+ //设置商品总浏览量
+ shopGoods.setViewNum(comShopFlowerGoodsViewStatisticsDAO.selectTotalViewNum(shopGoods.getId()));
+ String categoryNames = convenientGoodsCategoryDAO.selectCategoryScopeByGoodsId(shopGoods.getId());
+ shopGoods.setCategoryName(categoryNames);
+ shopGoods.setStock(stock);
+ shopGoods.setSale(sale);
});
}
return R.ok(comShopStoreVOIPage);
@@ -195,13 +212,13 @@
List<ComShopFlowerGoodsAttrVO> goodsAttrList = new ArrayList<>();
List<ComShopFlowerGoodsAttrDO> goodsAttrDOS =
shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().eq("goods_id", goodsId));
- List<String> images = new ArrayList<>();
+// List<String> images = new ArrayList<>();
int stock = 0;
for (ComShopFlowerGoodsAttrDO attrDO : goodsAttrDOS) {
ComShopFlowerGoodsAttrVO goodsAttrVO = new ComShopFlowerGoodsAttrVO();
BeanUtils.copyProperties(attrDO, goodsAttrVO);
String attrPic = attrDO.getAttrPic();
- images.add(attrPic);
+// images.add(attrPic);
goodsAttrList.add(goodsAttrVO);
stock = stock +attrDO.getStock();
}
@@ -209,17 +226,20 @@
ConvenientMerchantDO convenientMerchantDO = convenientMerchantDAO.selectById(goodsDO.getStoreId());
ConvenientMerchantVO convenientMerchantVO = new ConvenientMerchantVO();
BeanUtils.copyProperties(convenientMerchantDO, convenientMerchantVO);
-
+ BigDecimal score = comShopFlowerEvaluateDAO.statisticsScore(convenientMerchantDO.getId());
+ convenientMerchantVO.setScore(null == score ? BigDecimal.ZERO : NumberUtil.round(score, 1));
// 设置值
ComShopFlowerGoodsVO shopGoods = new ComShopFlowerGoodsVO();
BeanUtils.copyProperties(goodsDO, shopGoods);
shopGoods.setGoodsAttrList(goodsAttrList);
shopGoods.setConvenientMerchantVO(convenientMerchantVO);
- shopGoods.setImages(StringUtils.join(images,","));
+// shopGoods.setImages(StringUtils.join(images,","));
Integer orderNum = comShopFlowerOrderGoodsDAO.selectCount(new LambdaQueryWrapper<ComShopFlowerOrderGoodsDO>().eq(ComShopFlowerOrderGoodsDO::getGoodsId, goodsId));
shopGoods.setOrderNum(orderNum);
List<ComShopFlowerEvaluateVO> comShopFlowerEvaluateVOList = comShopFlowerEvaluateDAO.selectListLimit(goodsId);
shopGoods.setShopFlowerEvaluateVOList(comShopFlowerEvaluateVOList);
+ Integer evaluateNum = comShopFlowerEvaluateDAO.selectCountByGoodsId(goodsId);
+ shopGoods.setEvaluateNum(evaluateNum);
List<Long> categoryIds = convenientGoodsCategoryDAO.selectCategoryIdsForGoods(goodsId);
shopGoods.setCategoryIds(categoryIds);
@@ -256,7 +276,7 @@
.delete(new LambdaQueryWrapper<ComShopFlowerGoodsAttrDO>().eq(ComShopFlowerGoodsAttrDO::getGoodsId, id));
ComShopFlowerGoodsAttrDO comShopFlowerGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
comShopFlowerGoodsAttrDO.setGoodsId(id);
- comShopFlowerGoodsAttrDO.setStoreId(addShopFlowerGoodsVO.getStoreId());
+ comShopFlowerGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
comShopFlowerGoodsAttrDO.setGoodsName(addShopFlowerGoodsVO.getName());
comShopFlowerGoodsAttrDO.setGoodsAttrName("默认");
comShopFlowerGoodsAttrDO.setAttrPic(addShopFlowerGoodsVO.getGoodsPic());
@@ -341,4 +361,11 @@
}
return R.ok();
}
+
+ @Override
+ public R countSaleByUserId(Long userId){
+ List<ComShopOrderStoreIdCountVO> comShopOrderStoreIdCountVOS = this.baseMapper.countSaleByUserId(userId);
+ Map<String, Integer> collect = comShopOrderStoreIdCountVOS.stream().collect(Collectors.toMap(ComShopOrderStoreIdCountVO::getCountName, ComShopOrderStoreIdCountVO::getCountNum));
+ return R.ok(collect);
+ }
}
--
Gitblit v1.7.1