From 3da01b2a6cf247f90aed86fc37d8cb0ab51a4b4c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 15:58:02 +0800
Subject: [PATCH] #feat .

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 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 8bf6854..f14db43 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,7 @@
 package com.panzhihua.service_community.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+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;
@@ -30,6 +31,7 @@
 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;
@@ -43,7 +45,6 @@
  */
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
 public class ComShopFlowerGoodsServiceImpl extends ServiceImpl<ComShopFlowerGoodsDAO, ComShopFlowerGoodsDO> implements ComShopFlowerGoodsService {
 
     @Resource
@@ -62,6 +63,7 @@
     private ComShopFlowerGoodsViewStatisticsDAO comShopFlowerGoodsViewStatisticsDAO;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
         if (addShopFlowerGoodsVO == null) {
             return R.ok("500", "数据为空!");
@@ -195,13 +197,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();
         }
@@ -215,11 +217,13 @@
         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);
@@ -234,6 +238,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R editFlowerShopGoods(Long id, AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
         if (addShopFlowerGoodsVO == null) {
             return R.ok("500", "数据为空!");
@@ -243,6 +248,9 @@
         ComShopFlowerGoodsDO shopGoodsDO = new ComShopFlowerGoodsDO();
         BeanUtils.copyProperties(addShopFlowerGoodsVO, shopGoodsDO);
         shopGoodsDO.setOriginalPrice(addShopFlowerGoodsVO.getPrice());
+        if (StrUtil.isEmpty(addShopFlowerGoodsVO.getImages())){
+            shopGoodsDO.setImages("");
+        }
         int update = this.baseMapper.update(shopGoodsDO, query);
         if (update < 1) {
             throw new ServiceException("修改失败");
@@ -303,6 +311,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R deleteShopFlowerGoods(Long id) {
         ComShopFlowerGoodsDO comShopFlowerGoodsDO = this.baseMapper.selectById(id);
         comShopFlowerGoodsDO.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes);
@@ -311,6 +320,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R changeStatus(Long id, Integer status) {
         ComShopFlowerGoodsDO shopGoodsDO = this.baseMapper.selectById(id);
         if (shopGoodsDO == null) {
@@ -332,10 +342,17 @@
         ComShopFlowerGoodsViewStatisticsDO statisticsDO = comShopFlowerGoodsViewStatisticsDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerGoodsViewStatisticsDO>()
                 .eq(ComShopFlowerGoodsViewStatisticsDO::getGoodsId, goodsId).eq(ComShopFlowerGoodsViewStatisticsDO::getStatisticDate, nowDate));
         if (isNull(statisticsDO)) {
-            comShopFlowerGoodsViewStatisticsDAO.createTodayStatistic(goodsId);
+            comShopFlowerGoodsViewStatisticsDAO.createTodayStatistic(goodsId,nowDate);
         } else {
             comShopFlowerGoodsViewStatisticsDAO.incrViewNum(goodsId, nowDate);
         }
         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