From 93707c75f49a543f122349f88b53d65aac51861b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 四月 2021 10:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
index 6433941..0b7e793 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
@@ -55,18 +55,17 @@
String[] images = addShopGoodsVO.getGoodsPic().split(",");
ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO();
BeanUtils.copyProperties(addShopGoodsVO, shopGoodsDO);
- if(images.length>1){
+ if (images.length > 1) {
shopGoodsDO.setGoodsPic(images[0]);
}
shopGoodsDO.setImages(addShopGoodsVO.getGoodsPic());
shopGoodsDO.setSale(0);
- shopGoodsDO.setDetails(addShopGoodsVO.getGoodsDescribe());
+ shopGoodsDO.setDetails(addShopGoodsVO.getDetails());
int goodsId = this.baseMapper.insert(shopGoodsDO);
if (goodsId > 0) {
ArrayList<ComShopGoodsAttrDO> goodsAttrDOS = Lists.newArrayList();
- addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
- ComShopGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId());
- //维护商品规格表
+ ComShopGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId());
+ addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {//维护商品规格表
if (goodDO == null) {
throw new ServiceException("商家id不存在！");
}
@@ -74,17 +73,23 @@
shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
shopGoodsAttrDO.setStoreId(goodDO.getStoreId());
shopGoodsAttrDO.setGoodsName(goodDO.getName());
- //如果没有规格加默认
- if(StringUtils.isNotEmpty(goodsAttr.getGoodsAttr())){
- shopGoodsAttrDO.setGoodsAttr("默认");
- }else{
- shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
- }
+ shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
shopGoodsAttrDO.setIsDefault(1);
shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
shopGoodsAttrDO.setAttrPic(images[0]);
goodsAttrDOS.add(shopGoodsAttrDO);
});
+ if (addShopGoodsVO.getGoodsAttrVOList().size() < 1) {//如果没有规格参数加默认
+ ComShopGoodsAttrDO shopGoodsAttrDO = new ComShopGoodsAttrDO();
+ shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
+ shopGoodsAttrDO.setStoreId(goodDO.getStoreId());
+ shopGoodsAttrDO.setGoodsName(goodDO.getName());
+ shopGoodsAttrDO.setGoodsAttr("默认");
+ shopGoodsAttrDO.setIsDefault(1);
+ shopGoodsAttrDO.setPrice(goodDO.getPrice());
+ shopGoodsAttrDO.setAttrPic(images[0]);
+ goodsAttrService.save(shopGoodsAttrDO);
+ }
if (goodsAttrDOS.size() > 0) {
goodsAttrService.saveBatch(goodsAttrDOS);
}
@@ -96,9 +101,9 @@
public R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO) {
Page page = new Page<>(pageComShopGoodsDTO.getPageNum(), pageComShopGoodsDTO.getPageSize());
IPage<PageShopGoodsVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO);
- if(!comShopStoreVOIPage.getRecords().isEmpty()){
+ if (!comShopStoreVOIPage.getRecords().isEmpty()) {
comShopStoreVOIPage.getRecords().forEach(shopGoods -> {
- List<ComShopGoodsAttrDO> goodsAttrDOs = shopGoodsAttrDAO.selectList(new QueryWrapper<ComShopGoodsAttrDO>().lambda().eq(ComShopGoodsAttrDO::getGoodsId,shopGoods.getId()));
+ List<ComShopGoodsAttrDO> goodsAttrDOs = shopGoodsAttrDAO.selectList(new QueryWrapper<ComShopGoodsAttrDO>().lambda().eq(ComShopGoodsAttrDO::getGoodsId, shopGoods.getId()));
ArrayList<AddShopGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
for (ComShopGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
AddShopGoodsAttrVO goodsAttrVO = new AddShopGoodsAttrVO();
@@ -139,7 +144,7 @@
if (goodsAttrDO == null) {
//如果没有规格加默认
shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
- }else{
+ } else {
shopGoodsAttrDO.setGoodsAttr("默认");
}
shopGoodsAttrDO.setIsDefault(1);
@@ -184,13 +189,13 @@
* @return 商品列表
*/
@Override
- public R pageShopGoods(ComShopGoodsDTO comShopGoodsDTO){
- Page page = new Page<>(comShopGoodsDTO.getPageNum(),comShopGoodsDTO.getPageSize());
- IPage<ComShopGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page,comShopGoodsDTO);
- if(!goodsVOIPage.getRecords().isEmpty()){
+ public R pageShopGoods(ComShopGoodsDTO comShopGoodsDTO) {
+ Page page = new Page<>(comShopGoodsDTO.getPageNum(), comShopGoodsDTO.getPageSize());
+ IPage<ComShopGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page, comShopGoodsDTO);
+ if (!goodsVOIPage.getRecords().isEmpty()) {
goodsVOIPage.getRecords().forEach(goodsVo -> {
List<ComShopGoodsAttrVO> goodsAttrList = shopGoodsAttrDAO.getGoodsAttr(goodsVo.getId());
- if(!goodsAttrList.isEmpty()){
+ if (!goodsAttrList.isEmpty()) {
goodsVo.setGoodsAttrList(goodsAttrList);
}
});
--
Gitblit v1.7.1