Merge remote-tracking branch 'origin/master'

doum

8 小时以前 417e33605dda0f28366a1d6e13c41198a156e3a7

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java

@@ -132,7 +132,7 @@
        dealBatchMultiFiles(goods, goods.getFileList(), user,false);
        return goods.getId();
    }
    private void dealDefaultGoodsSku(Goods goods) {
    private Integer dealDefaultGoodsSku(Goods goods) {
        Date date = goods.getEditDate();
        Integer userId = goods.getEditor();
        Sku sku = new Sku();
@@ -186,6 +186,8 @@
        goodsSkuAttr.setGoodsSkuId(goodsSku.getId());
        goodsSkuAttr.setSkuAttrId(skuAttr.getId());
        goodsSkuAttrMapper.insert(goodsSkuAttr);

        return goodsSku.getId();
    }

    public void dealBatchMultiFiles(Goods goods, List<Multifile> fileList, LoginUserInfo user,boolean update) {
@@ -352,7 +354,23 @@
                    .set(Goods::getEditor,user.getId())
                    .set(Goods::getStatus,Constants.ONE )
                    .in(Goods::getId,idList));

            //批量下架 sku数据
            goodsSkuMapper.update(null,new UpdateWrapper<GoodsSku>().lambda()
                    .set(GoodsSku::getEditDate,new Date() )
                    .set(GoodsSku::getEditor,user.getId())
                    .set(GoodsSku::getStatus,Constants.ONE )
                    .eq(GoodsSku::getIsdeleted,Constants.ZERO)
                    .in(GoodsSku::getGoodsId,idList));
            return;
        }else{
            //批量上架 sku数据
            goodsSkuMapper.update(null,new UpdateWrapper<GoodsSku>().lambda()
                    .set(GoodsSku::getEditDate,new Date() )
                    .set(GoodsSku::getEditor,user.getId())
                    .set(GoodsSku::getStatus,Constants.ZERO )
                    .eq(GoodsSku::getIsdeleted,Constants.ZERO)
                    .in(GoodsSku::getGoodsId,idList));
        }
        long shopNum   = shopMapper.selectCount(new QueryWrapper<Shop>().lambda()
                .eq(Shop::getIsdeleted,Constants.ZERO)
@@ -451,6 +469,16 @@
            goods.setLabels(  StringUtils.removeEnd( goods.getLabels().replace("，",","),","));
        }
        goodsMapper.updateById(goods);
        boolean needUpdatesku = true;
        if(goods.getSkuPrice()!=null){
            GoodsSku queryGoodsSku=new GoodsSku();
            queryGoodsSku.setGoodsId(goods.getId());
            queryGoodsSku.setIsdeleted(Constants.ZERO);
            GoodsSku goodsSku=goodsSkuMapper.selectOne(new QueryWrapper<>(queryGoodsSku).last("limit 1"));
            if(goodsSku !=null && Constants.formatBigdecimal(goodsSku.getPrice()).compareTo(goods.getSkuPrice()) ==0){
                needUpdatesku = false;//价格未变化无需重新生成供货价
            }
        }
        //清空原有的sku数据
        skuMapper.update(null,new UpdateWrapper<Sku>().lambda()
                .set(Sku::getIsdeleted,Constants.ONE)
@@ -460,7 +488,21 @@
                .set(GoodsSku::getIsdeleted,Constants.ONE)
                .eq(GoodsSku::getIsdeleted,Constants.ZERO)
                .eq(GoodsSku::getGoodsId,goods.getId()));
        dealDefaultGoodsSku(goods);//新建sku信息
       Integer skuId = dealDefaultGoodsSku(goods);//新建sku信息
        if(needUpdatesku){ //先删除原来的数据
            shopGoodsRelationMapper.delete(new QueryWrapper<ShopGoodsRelation>().lambda()
                    .eq(ShopGoodsRelation::getGoodsId,goods.getId())
            );
        }else{
            //否则更新所有供货价关联关系中的skuID
            shopGoodsRelationMapper.update(null,new UpdateWrapper<ShopGoodsRelation>().lambda()
                    .eq(ShopGoodsRelation::getGoodsId,goods.getId())
                    .set(ShopGoodsRelation::getGoodsSkuId,skuId)
            );
        }



        dealBatchMultiFiles(goods, goods.getFileList(), user,true);
    }

@@ -632,6 +674,7 @@
        }
        Multifile find = new Multifile();
        find.setObjId(id);
        find.setObjType(Constants.MultiFile.PLATFORM_GOOD_ROTATION.getKey());
        find.setIsdeleted(Constants.ZERO);
        List<Multifile> fileList=  multifileMapper.selectList(new QueryWrapper<>(find));
        goods.setFileList(fileList);
@@ -834,6 +877,7 @@
                    " INNER JOIN goods g on  g.id=gs.GOODS_ID " +
                    " where gs.STOCK<=0 and gs.ISDELETED=0 and g.id=t.id ");
        }

        queryWrapper.eq(!Constants.equalsInteger(pageWrap.getModel().getTabStatus(), 3), Goods::getIsdeleted, Constants.ZERO);
        queryWrapper.eq(Constants.equalsInteger(pageWrap.getModel().getTabStatus(), 3), Goods::getIsdeleted, Constants.ONE);

@@ -958,14 +1002,32 @@
                goodsMapper.goodsPageForShop(pageWrap.toPage(),wrapper,model.getShopId()) ;
        if (!CollectionUtils.isEmpty(page.getRecords())){
            String preFixPath = systemDictDataBiz.getPreFixPath(Constants.RESOURCE_PATH, Constants.GOODS_FILE);


            for (GoodsInfoResponse goodsInfoResponse:page.getRecords()
                 ) {
                goodsInfoResponse.setImgurl(StringUtils.isNotBlank(goodsInfoResponse.getImgurl())?(preFixPath+goodsInfoResponse.getImgurl()):null);
                //sku基础信息
                this.getSkuInfo(goodsInfoResponse);
                if(Objects.isNull(model.getShopId())){
                    //sku基础信息
                    this.getSkuInfo(goodsInfoResponse);
                }
                if(StringUtils.isNotBlank(goodsInfoResponse.getBrandIds())){
                    List<Labels> allBrands = labelsMapper.selectList(new QueryWrapper<Labels>().lambda()
                            .in(Labels::getId,getNumIdByIdsString(goodsInfoResponse.getBrandIds()))
                            .eq(Labels::getType,Constants.LabelsType.APPLICABLE_BRAND.getKey())
                            .eq(Labels::getIsdeleted,Constants.ZERO)
                    );
                    if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(allBrands)){
                        goodsInfoResponse.setBrandNames(String.join("/",allBrands.stream().map(i->i.getName()).collect(Collectors.toList())));
                    }
                }
            }
        }
        if(StringUtils.isNotBlank(model.getGoodsName())&&Objects.nonNull(model.getMemberId())){
            searchHistoryMapper.delete(new QueryWrapper<SearchHistory>().lambda()
                    .eq(SearchHistory::getMemberId,model.getMemberId())
                    .eq(SearchHistory::getContent,model.getGoodsName())
            );
            SearchHistory searchHistory = new SearchHistory();
            searchHistory.setIsdeleted(Constants.ZERO);
            searchHistory.setContent(model.getGoodsName());