|
@@ -1,12 +1,15 @@
|
|
|
package com.usky.dxtop.service.impl;
|
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
|
|
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
+import cn.afterturn.easypoi.excel.entity.ImportParams;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -22,10 +25,7 @@ import com.usky.dxtop.service.api.TopApiConfiger;
|
|
|
import com.usky.dxtop.service.config.rabbitmq.RabbitmqUtils;
|
|
|
import com.usky.dxtop.service.constant.MsgLogBusinessCode;
|
|
|
import com.usky.dxtop.service.emun.*;
|
|
|
-import com.usky.dxtop.service.vo.ChargeVO;
|
|
|
-import com.usky.dxtop.service.vo.OrderExport;
|
|
|
-import com.usky.dxtop.service.vo.OrderReport;
|
|
|
-import com.usky.dxtop.service.vo.OrderRequest;
|
|
|
+import com.usky.dxtop.service.vo.*;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import ma.glasnost.orika.MapperFacade;
|
|
|
import ma.glasnost.orika.MapperFactory;
|
|
@@ -568,6 +568,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
return String.format("%s?backOrder=%s", payPath, JSON.toJSON(order));
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 完善没有的数据
|
|
|
* @param list
|
|
@@ -699,4 +705,56 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ public void addOrderListByFile(MultipartFile multipartFile){
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ public List<Order> getOrderListByFile(MultipartFile multipartFile){
|
|
|
+ ImportParams importParams = new ImportParams();
|
|
|
+ importParams.setHeadRows(1);
|
|
|
+ try {
|
|
|
+ List<OrderFileVO> orderFileVOS = ExcelImportUtil.importExcel(
|
|
|
+ multipartFile.getInputStream(),
|
|
|
+ OrderFileVO.class,
|
|
|
+ importParams
|
|
|
+ );
|
|
|
+ if (CollectionUtils.isNotEmpty(orderFileVOS)){
|
|
|
+ throw new CustomException("表格数据为空");
|
|
|
+ }
|
|
|
+ return BeanMapperUtils.mapList(orderFileVOS,OrderFileVO.class,Order.class);
|
|
|
+ }catch (Exception e){
|
|
|
+ throw new CustomException("解析订单异常"+e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ public void enhanceOrder(Order order,List<Staff> staffList){
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ public void uploadOrderExcel(MultipartFile multipartFile){
|
|
|
+ List<MultipartFile> list = new ArrayList<>();
|
|
|
+ list.add(multipartFile);
|
|
|
+ String batchNo = sysFileService.generateBatchNo();
|
|
|
+ SysFile sysFile = new SysFile();
|
|
|
+ sysFile.setBatchNo(batchNo);
|
|
|
+ sysFile.setFiles(list);
|
|
|
+ sysFile.setUploadType(SysFileServiceImpl.FILE);
|
|
|
+ sysFile.setBusinessType("订单表格");
|
|
|
+ sysFile.setExpriceAt(DateUtils.addDays(new Date(), 3));
|
|
|
+ List<SysFile> sysFileList = sysFileService.addFile(sysFile);
|
|
|
+ long count = sysFileList.stream().filter(sysFileDTO -> !sysFileDTO.getSuccess()).count();
|
|
|
+ if (count > 0) {
|
|
|
+ throw new CustomException("上传文件失败");
|
|
|
+ }
|
|
|
+ List<String> idList = sysFileList.stream().map(sf -> sf.getId().toString()).collect(Collectors.toList());
|
|
|
+ boolean active = sysFileService.active(batchNo,idList);
|
|
|
+ if (!active) {
|
|
|
+ throw new CustomException("上传文件失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|