商品一键上架

framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java

@@ -9,6 +9,7 @@ import cn.lili.modules.goods.entity.vos.GoodsVO;
 import cn.lili.modules.store.entity.dos.Store;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -173,4 +174,22 @@ public interface GoodsService extends IService<Goods> {
      */
     long countStoreGoodsNum(String storeId);
 
+    /**
+     * 根据报关材料批量创建订单
+     */
+    List<Goods> batchCreate(MultipartFile files);
+
+    /**
+     * 未提交的导入订单
+     */
+    List<Goods> unSubmitOrder();
+
+    /**
+     * 是否有未提交的导入订单
+     */
+    boolean hasUnSubmitOrder();
+
+    void saveImportGoods(List<Goods> goods);
+
+    void submitImportGoods(List<Goods> goods);
 }

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java

@@ -2,7 +2,10 @@ package cn.lili.modules.goods.serviceimpl;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
 import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
@@ -29,6 +32,7 @@ import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.member.entity.dos.MemberEvaluation;
 import cn.lili.modules.member.entity.enums.EvaluationGradeEnum;
 import cn.lili.modules.member.service.MemberEvaluationService;
+import cn.lili.modules.order.order.entity.dto.OrderBatchDeliverDTO;
 import cn.lili.modules.store.entity.dos.FreightTemplate;
 import cn.lili.modules.store.entity.dos.Store;
 import cn.lili.modules.store.entity.vos.StoreVO;
@@ -41,6 +45,8 @@ import cn.lili.modules.system.service.SettingService;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.GoodsTagsEnum;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -53,7 +59,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.InputStream;
 import java.util.*;
 
 /**
@@ -113,6 +122,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Autowired
     private Cache<GoodsVO> cache;
 
+    @Autowired
+    private Cache<String> otherCache;
+
     @Override
     public List<Goods> getByBrandIds(List<String> brandIds) {
         LambdaQueryWrapper<Goods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -452,6 +464,92 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                         .eq(Goods::getMarketEnable, GoodsStatusEnum.UPPER.name()));
     }
 
+    private final static String INTRO_TEMP = "<p>%s</p>";
+    private final static String GOODS_IMPORT_KEY_PREFIX = "GOODS::IMPORT::";
+
+    @Override
+    public List<Goods> batchCreate(MultipartFile files) {
+        InputStream inputStream;
+        AuthUser authUser = UserContext.getCurrentUser();
+        Assert.notNull(authUser, "登录信息已失效，请重新登录");
+        try {
+            inputStream = files.getInputStream();
+            //2.应用HUtool ExcelUtil获取ExcelReader指定输入流和sheet
+            ExcelReader excelReader = ExcelUtil.getReader(inputStream);
+            //可以加上表头验证
+            //3.读取第二行到最后一行数据
+            List<List<Object>> read = excelReader.read(19, excelReader.getRowCount());
+            List<Goods> goodsList = new ArrayList<>(read.size());
+            Goods goods = null;
+            String itemNo = null;
+            for (int i = 0; i < read.size(); i++) {
+                List<Object> props = read.get(i);
+                if (i%2 == 1){
+                    // 商品规格明细
+                    String[] strs = String.valueOf(props.get(3)).split("\\|");
+                    itemNo = strs[strs.length - 1];
+                    goods.setGoodsName(goods.getGoodsName() + itemNo + " ");
+                    goods.setIntro(String.format(INTRO_TEMP, String.valueOf(props.get(3)).replace("|" + itemNo, "")));
+                    goods.setMobileIntro(goods.getIntro());
+                    goods.setSellingPoint(strs[strs.length - 3]);
+                    goodsList.add(goods);
+                }else {
+                    if (StrUtil.isBlank(String.valueOf(props.get(0)))) break;
+                    goods = new Goods();
+                    // 商品基本信息
+                    goods.setGoodsName(String.valueOf(props.get(2)));
+                    goods.setQuantity(99999);
+                    goods.setGoodsUnit(String.valueOf(props.get(4)));
+                    goods.setPrice(Double.parseDouble(String.valueOf(props.get(5))));
+
+                    goods.setStoreId(authUser.getStoreId());
+                    goods.setStoreName(authUser.getStoreName());
+                    // 固定属性
+                    goods.setParams("[]");
+                    goods.setSalesModel("RETAIL");
+                    goods.setRecommend(true);
+                    goods.setSelfOperated(false);
+                    goods.setBuyCount(0);
+                    goods.setCommentNum(0);
+                    goods.setGrade(100D);
+                    goods.setAuthFlag("PASS");
+                    goods.setMarketEnable("UPPER");
+                    goods.setGoodsType("PHYSICAL_GOODS");
+                }
+            }
+            otherCache.put(importKey(), JSON.toJSONString(goodsList), 3600 * 24L);
+            return goodsList;
+        } catch (Exception e) {
+            throw new ServiceException(ResultCode.ORDER_BATCH_DELIVER_ERROR);
+        }
+    }
+
+    @Override
+    public List<Goods> unSubmitOrder() {
+        return JSON.parseArray(otherCache.get(importKey()), Goods.class);
+    }
+
+    @Override
+    public boolean hasUnSubmitOrder() {
+        return otherCache.hasKey(importKey());
+    }
+
+    @Override
+    public void saveImportGoods(List<Goods> goods) {
+        otherCache.put(importKey(), JSON.toJSONString(goods), 3600 * 24L);
+    }
+
+    @Override
+    public void submitImportGoods(List<Goods> goods) {
+        otherCache.remove(importKey());
+    }
+
+    private String importKey(){
+        AuthUser authUser = UserContext.getCurrentUser();
+        Assert.notNull(authUser, "登录信息已失效，请重新登录");
+        return GOODS_IMPORT_KEY_PREFIX + authUser.getId();
+    }
+
 
     /**
      * 发送删除es索引的信息

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

@@ -1,5 +1,6 @@
 package cn.lili.controller.goods;
 
+import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
@@ -24,7 +25,9 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -58,6 +61,38 @@ public class GoodsStoreController {
     @Autowired
     private StoreDetailService storeDetailService;
 
+    @ApiOperation(value = "上传文件批量上架商品")
+    @PostMapping(value = "/batchCreate", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResultMessage<List<Goods>> batchDeliver(@RequestPart("files") MultipartFile files) {
+        return ResultUtil.data(goodsService.batchCreate(files));
+    }
+
+    @ApiOperation(value = "是否有未提交的导入")
+    @GetMapping(value = "/hasUnSubmitOrder")
+    public ResultMessage<Boolean> hasUnSubmitOrder() {
+        return ResultUtil.data(goodsService.hasUnSubmitOrder());
+    }
+
+    @ApiOperation(value = "获取未提交的导入")
+    @GetMapping(value = "/UnSubmitOrder")
+    public ResultMessage<List<Goods>> unSubmitOrder() {
+        return ResultUtil.data(goodsService.unSubmitOrder());
+    }
+
+    @ApiOperation(value = "保存导入的商品")
+    @PostMapping(value = "/saveImportGoods")
+    public ResultMessage<Boolean> saveImportGoods(@RequestBody List<Goods> goods) {
+        goodsService.saveImportGoods(goods);
+        return ResultUtil.success();
+    }
+
+    @ApiOperation(value = "一件上架导入的商品")
+    @PostMapping(value = "/submitImportGoods")
+    public ResultMessage<Boolean> submitImportGoods(@RequestBody List<Goods> goods) {
+        goodsService.submitImportGoods(goods);
+        return ResultUtil.success();
+    }
+
     @ApiOperation(value = "分页获取商品列表")
     @GetMapping(value = "/list")
     public ResultMessage<IPage<Goods>> getByPage(GoodsSearchParams goodsSearchParams) {