From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java | 153 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 123 insertions(+), 30 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 4a5be8f..79f80b0 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,5 +1,7 @@
package com.panzhihua.service_community.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,20 +15,27 @@
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.utlis.DifferentLongListUtil;
-import com.panzhihua.service_community.dao.ComShopFlowerGoodsAttrDAO;
-import com.panzhihua.service_community.dao.ComShopFlowerGoodsDAO;
-import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
+import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComShopFlowerGoodsAttrService;
import com.panzhihua.service_community.service.ComShopFlowerGoodsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+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;
+import static java.util.Objects.nonNull;
/**
* @ClassName: ComShopFlowerGoodsServiceImpl
@@ -44,24 +53,30 @@
private ComShopFlowerGoodsAttrDAO shopFlowerGoodsAttrDAO;
@Resource
private ConvenientMerchantDAO convenientMerchantDAO;
+ @Resource
+ private ConvenientGoodsCategoryDAO convenientGoodsCategoryDAO;
+ @Resource
+ private ComShopFlowerOrderGoodsDAO comShopFlowerOrderGoodsDAO;
+ @Resource
+ private ComShopFlowerEvaluateDAO comShopFlowerEvaluateDAO;
+ @Resource
+ private ComShopFlowerGoodsViewStatisticsDAO comShopFlowerGoodsViewStatisticsDAO;
@Override
+ @Transactional(rollbackFor = Exception.class)
public R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
if (addShopFlowerGoodsVO == null) {
return R.ok("500", "数据为空！");
}
- String[] images = addShopFlowerGoodsVO.getGoodsPic().split(",");
+
ComShopFlowerGoodsDO shopGoodsDO = new ComShopFlowerGoodsDO();
BeanUtils.copyProperties(addShopFlowerGoodsVO, shopGoodsDO);
shopGoodsDO.setOriginalPrice(addShopFlowerGoodsVO.getPrice());
- if (images.length > 1) {
- shopGoodsDO.setGoodsPic(images[0]);
- }
- shopGoodsDO.setImages(addShopFlowerGoodsVO.getGoodsPic());
shopGoodsDO.setSale(0);
- shopGoodsDO.setDetails(addShopFlowerGoodsVO.getDetails());
int goodsId = this.baseMapper.insert(shopGoodsDO);
if (goodsId > 0) {
+
+ //保存规格
ArrayList<ComShopFlowerGoodsAttrDO> goodsAttrDOS = Lists.newArrayList();
ComShopFlowerGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId());
addShopFlowerGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
@@ -86,7 +101,21 @@
if (goodsAttrDOS.size() > 0) {
comShopFlowerGoodsAttrService.saveBatch(goodsAttrDOS);
}
+
+ //保存商品分类
+ Long goodId = shopGoodsDO.getId();
+ if (nonNull(goodId)) {
+ //添加分类
+ List<Long> categoryIds = addShopFlowerGoodsVO.getCategoryIds();
+ categoryIds.forEach(categoryId -> {
+ ConvenientGoodsCategoryDO convenientGoodsCategoryDO = convenientGoodsCategoryDAO.selectById(categoryId);
+ convenientGoodsCategoryDAO.createGoodsCategoryRelation(Snowflake.getId(),goodId, categoryId,
+ convenientGoodsCategoryDO.getName(), convenientGoodsCategoryDO.getCreatedBy());
+ });
+ }
}
+
+
return R.ok();
}
@@ -108,12 +137,26 @@
shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().lambda()
.eq(ComShopFlowerGoodsAttrDO::getGoodsId, shopGoods.getId()));
ArrayList<AddShopFlowerGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
+ StringBuilder sbr = new StringBuilder();
+ int stock = 0;
for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
AddShopFlowerGoodsAttrVO goodsAttrVO = new AddShopFlowerGoodsAttrVO();
BeanUtils.copyProperties(oneGoodsAttrDO, goodsAttrVO);
+ goodsAttrVO.setId(oneGoodsAttrDO.getId());
goodsAttrVOList.add(goodsAttrVO);
+ 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);
});
}
return R.ok(comShopStoreVOIPage);
@@ -132,15 +175,18 @@
IPage<ComShopFlowerGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page, comShopFlowerGoodsDTO);
if (!goodsVOIPage.getRecords().isEmpty()) {
goodsVOIPage.getRecords().forEach(goodsVo -> {
- List<ComShopFlowerGoodsAttrVO> goodsAttrList = shopFlowerGoodsAttrDAO.getGoodsAttr(goodsVo.getId());
+ Long goodsId = goodsVo.getId();
+ List<ComShopFlowerGoodsAttrVO> goodsAttrList = shopFlowerGoodsAttrDAO.getGoodsAttr(goodsId);
if (!goodsAttrList.isEmpty()) {
ComShopFlowerGoodsAttrVO comShopFlowerGoodsAttrVO = goodsAttrList.get(0);
-
goodsVo.setGoodsAttrList(goodsAttrList);
goodsVo.setGoodsPic(comShopFlowerGoodsAttrVO.getAttrPic());
goodsVo.setOriginalPrice(comShopFlowerGoodsAttrVO.getPrice());
- goodsVo.setPrice(comShopFlowerGoodsAttrVO.getCollatePrice());
+ goodsVo.setCollatePrice(comShopFlowerGoodsAttrVO.getCollatePrice());
+ goodsVo.setFreeShippingPrice(comShopFlowerGoodsAttrVO.getFreeShippingPrice());
}
+ //设置商品总浏览量
+ goodsVo.setViewNum(comShopFlowerGoodsViewStatisticsDAO.selectTotalViewNum(goodsId));
});
}
return R.ok(goodsVOIPage);
@@ -153,34 +199,57 @@
if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.deleteStatus.yes)) {
return R.fail(403, "商品不存在");
}
- if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
- return R.fail(405, "商品已下架");
- }
+// if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
+// return R.fail(405, "商品已下架");
+// }
// 根据商品id查询商品规格信息
List<ComShopFlowerGoodsAttrVO> goodsAttrList = new ArrayList<>();
List<ComShopFlowerGoodsAttrDO> goodsAttrDOS =
shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().eq("goods_id", goodsId));
- goodsAttrDOS.forEach(attrDO -> {
+// 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);
goodsAttrList.add(goodsAttrVO);
- });
-
+ stock = stock +attrDO.getStock();
+ }
// 查询商品店铺信息
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,","));
+ 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);
+ ComShopFlowerGoodsAttrVO comShopFlowerGoodsAttrVO = goodsAttrList.get(0);
+ shopGoods.setOriginalPrice(comShopFlowerGoodsAttrVO.getPrice());
+ shopGoods.setCollatePrice(comShopFlowerGoodsAttrVO.getCollatePrice());
+ shopGoods.setFreeShippingPrice(comShopFlowerGoodsAttrVO.getFreeShippingPrice());
+ shopGoods.setStock(stock);
+
+
return R.ok(shopGoods);
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R editFlowerShopGoods(Long id, AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
if (addShopFlowerGoodsVO == null) {
return R.ok("500", "数据为空！");
@@ -202,7 +271,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());
@@ -212,7 +281,7 @@
} else {
List<Long> attrIds =
comShopFlowerGoodsAttrDOS.stream().map(ComShopFlowerGoodsAttrDO::getId).collect(Collectors.toList());
- List<Long> voAttrIds = addShopFlowerGoodsVO.getGoodsAttrVOList().stream().map(AddShopFlowerGoodsAttrVO::getGoodsAttrId)
+ List<Long> voAttrIds = addShopFlowerGoodsVO.getGoodsAttrVOList().stream().map(AddShopFlowerGoodsAttrVO::getId)
.collect(Collectors.toList());
// 需要删除的规格ID——针对编辑时删除了规格的情况
List<Long> deleteIds = DifferentLongListUtil.getDiffrent(attrIds, voAttrIds);
@@ -220,7 +289,7 @@
shopFlowerGoodsAttrDAO.deleteBatchIds(deleteIds);
}
addShopFlowerGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
- ComShopFlowerGoodsAttrDO comShopGoodsAttrDO = shopFlowerGoodsAttrDAO.selectById(goodsAttr.getGoodsAttrId());
+ ComShopFlowerGoodsAttrDO comShopGoodsAttrDO = shopFlowerGoodsAttrDAO.selectById(goodsAttr.getId());
if (comShopGoodsAttrDO != null) {
comShopGoodsAttrDO.setPrice(goodsAttr.getPrice());
comShopGoodsAttrDO.setCollatePrice(goodsAttr.getCollatePrice());
@@ -231,7 +300,7 @@
shopFlowerGoodsAttrDAO.updateById(comShopGoodsAttrDO);
} else {
comShopGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
- comShopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
+ comShopGoodsAttrDO.setGoodsId(id);
comShopGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
comShopGoodsAttrDO.setGoodsName(shopGoodsDO.getName());
comShopGoodsAttrDO.setGoodsAttrName(goodsAttr.getGoodsAttrName());
@@ -250,17 +319,16 @@
}
@Override
- public R deleteShopFlowerGoods(Long[] id) {
- LambdaQueryWrapper<ComShopFlowerGoodsDO> query = new LambdaQueryWrapper<ComShopFlowerGoodsDO>().in(ComShopFlowerGoodsDO::getId, id);
- List<ComShopFlowerGoodsDO> comShopGoodsDOS = this.baseMapper.selectList(query);
- for (ComShopFlowerGoodsDO one : comShopGoodsDOS) {
- one.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes);
- this.baseMapper.updateById(one);
- }
+ @Transactional(rollbackFor = Exception.class)
+ public R deleteShopFlowerGoods(Long id) {
+ ComShopFlowerGoodsDO comShopFlowerGoodsDO = this.baseMapper.selectById(id);
+ comShopFlowerGoodsDO.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes);
+ this.baseMapper.updateById(comShopFlowerGoodsDO);
return R.ok();
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R changeStatus(Long id, Integer status) {
ComShopFlowerGoodsDO shopGoodsDO = this.baseMapper.selectById(id);
if (shopGoodsDO == null) {
@@ -270,4 +338,29 @@
this.baseMapper.updateById(shopGoodsDO);
return R.ok();
}
+
+ @Override
+ public R incrGoodsView(Long goodsId) {
+ ComShopFlowerGoodsDO comShopFlowerGoodsDO = this.baseMapper.selectById(goodsId);
+ if (isNull(comShopFlowerGoodsDO)) {
+ return R.fail("商品不存在");
+ }
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String nowDate = simpleDateFormat.format(new Date());
+ ComShopFlowerGoodsViewStatisticsDO statisticsDO = comShopFlowerGoodsViewStatisticsDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerGoodsViewStatisticsDO>()
+ .eq(ComShopFlowerGoodsViewStatisticsDO::getGoodsId, goodsId).eq(ComShopFlowerGoodsViewStatisticsDO::getStatisticDate, nowDate));
+ if (isNull(statisticsDO)) {
+ 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