Merge remote-tracking branch 'origin/dev' into dev

peng

5 天以前 1fdfb56613adca09a0ddf39289b41f96fa335a01

 seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java

@@ -27,6 +27,7 @@
import cn.lili.modules.store.entity.dos.StoreDetail;
import cn.lili.modules.store.service.StoreDetailService;
import cn.lili.utils.COSUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -100,7 +101,13 @@
        //获取当前登录商家账号
        String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
        goodsSearchParams.setStoreId(storeId);
        return ResultUtil.data(goodsSkuService.getGoodsSkuByPage(goodsSearchParams));
        IPage<GoodsSku> page = goodsSkuService.getGoodsSkuByPage(goodsSearchParams);
        page.getRecords().forEach(item ->{
            if (StringUtils.isNotBlank(item.getThumbnail())&&!item.getThumbnail().contains("http")) {
                item.setThumbnail(cosUtil.getPreviewUrl(item.getThumbnail()));
            }
        });
        return ResultUtil.data(page);
    }

    @ApiOperation(value = "分页获取库存告警商品列表")
@@ -148,6 +155,7 @@
    @ApiOperation(value = "新增商品")
    @PostMapping(value = "/create", consumes = "application/json", produces = "application/json")
    public ResultMessage<GoodsOperationDTO> save(@Valid @RequestBody GoodsOperationDTO goodsOperationDTO) {
        System.err.println(JSONObject.toJSONString(goodsOperationDTO));
        goodsService.addGoods(goodsOperationDTO);
        return ResultUtil.success();
    }
@@ -155,6 +163,7 @@
    @ApiOperation(value = "修改商品")
    @PutMapping(value = "/update/{goodsId}", consumes = "application/json", produces = "application/json")
    public ResultMessage<GoodsOperationDTO> update(@Valid @RequestBody GoodsOperationDTO goodsOperationDTO, @PathVariable String goodsId) {
        System.err.println(JSONObject.toJSONString(goodsOperationDTO));
        goodsService.editGoods(goodsOperationDTO, goodsId);
        return ResultUtil.success();
    }