1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/sys/ForeignExchangeServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
+import tk.mybatis.mapper.util.StringUtil;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
@@ -44,6 +45,9 @@ public class ForeignExchangeServiceImpl implements ForeignExchangeService {
     @Override
     public Page<ForeignExchangeDO> list(ForeignExchangeDTO selectDTO, Integer page, Integer limit, Long adminId) throws ServiceException {
         Wrapper<ForeignExchangeDO> wrapper = new EntityWrapper<ForeignExchangeDO>();
+        if(StringUtil.isNotEmpty(selectDTO.getCustomerNo())){
+            wrapper.eq("customer_no",selectDTO.getCustomerNo());
+        }
         List<ForeignExchangeDO> list = foreignExchangeMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
         Integer count = foreignExchangeMapper.selectCount(wrapper);
         return new Page<ForeignExchangeDO>(list, page, limit, count);

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/sys/MaritimeAdministrationService.java

@@ -6,12 +6,14 @@ import com.iotechn.unimall.core.annotation.HttpParam;
 import com.iotechn.unimall.core.annotation.HttpParamType;
 import com.iotechn.unimall.core.annotation.param.NotNull;
 import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.SettlementManagementDO;
 import com.iotechn.unimall.data.dto.ForeignExchangeDTO;
 import com.iotechn.unimall.data.model.Page;
 import com.iotechn.unimall.data.domain.MaritimeAdministrationDO;
 import com.iotechn.unimall.data.dto.MaritimeAdministrationDTO;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * Generate Code By Unimall
@@ -42,13 +44,20 @@ public interface MaritimeAdministrationService {
             @HttpParam(name = "MaritimeAdministrationDTO", type = HttpParamType.COMMON, description = "MaritimeAdministrationDTO") MaritimeAdministrationDTO editDTO,
             @NotNull @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "管理员ID") Long adminId) throws ServiceException;
 
+    @HttpMethod(description = "添加", permission = "maritimeAdministration:maritimeadministration:createAll", permissionParentName = "其他", permissionName = "MaritimeAdministration")
+    public void createAll(
+            @HttpParam(name = "MaritimeAdministrationDTO", type = HttpParamType.COMMON, description = "MaritimeAdministrationDTO") List<MaritimeAdministrationDTO> maritimeAdministrationDTOS) throws ServiceException;
+
 
 
 
     @HttpMethod(description = "导出", permission = "maritimeAdministration:maritimeAdministration:export", permissionParentName = "其他", permissionName = "MaritimeAdministration")
-    public void export(
+    public String export(
             @HttpParam(name = "MaritimeAdministrationDTO", type = HttpParamType.COMMON, description = "MaritimeAdministrationDTO") MaritimeAdministrationDTO foreignExchangeDTO,
             @HttpParam(name = "HttpServletResponse", type = HttpParamType.COMMON, description = "response") HttpServletResponse response) throws Exception;
 
+    @HttpMethod(description = "查询详情", permission = "maritimeAdministration:maritimeAdministratio:getInfo", permissionParentName = "其他", permissionName = "MaritimeAdministration")
+    public MaritimeAdministrationDO getInfo(@HttpParam(name = "id", type = HttpParamType.COMMON, description = "id") Long id) throws ServiceException;
+
 
 }

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/sys/MaritimeAdministrationServiceImpl.java

@@ -2,11 +2,16 @@ package com.iotechn.unimall.admin.api.sys;
 
 
 import cn.hutool.poi.excel.ExcelUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.iotechn.unimall.core.exception.AdminServiceException;
 import com.iotechn.unimall.core.exception.ExceptionDefinition;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.core.util.ExcelUtils;
+import com.iotechn.unimall.core.util.StringUtils;
+import com.iotechn.unimall.data.domain.ForeignExchangeDO;
 import com.iotechn.unimall.data.domain.MaritimeDetailDO;
+import com.iotechn.unimall.data.dto.ForeignExchangeDTO;
 import com.iotechn.unimall.data.dto.MaritimeDetailDTO;
 import com.iotechn.unimall.data.mapper.MaritimeDetailMapper;
 import com.iotechn.unimall.data.model.Page;
@@ -48,7 +53,14 @@ public class MaritimeAdministrationServiceImpl implements MaritimeAdministration
     @Override
     public Page<MaritimeAdministrationDO> list(MaritimeAdministrationDTO selectDTO, Integer page, Integer limit, Long adminId) throws ServiceException {
         Wrapper<MaritimeAdministrationDO> wrapper = new EntityWrapper<MaritimeAdministrationDO>();
+        if(selectDTO!=null && StringUtils.isNotEmpty(selectDTO.getContainerNo())){
+            wrapper.eq("container_no",selectDTO.getContainerNo());
+        }
+        if(selectDTO!=null && StringUtils.isNotEmpty(selectDTO.getCustomerNo())){
+            wrapper.eq("customer_no",selectDTO.getCustomerNo());
+        }
         List<MaritimeAdministrationDO> list = maritimeAdministrationMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        List<MaritimeAdministrationDO> list1= new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(maritimeAdministrationDO -> {
                 List<MaritimeDetailDO> maritimeDetailDOS = maritimeDetailMapper.selectList(new EntityWrapper<MaritimeDetailDO>()
@@ -109,9 +121,9 @@ public class MaritimeAdministrationServiceImpl implements MaritimeAdministration
     }
 
     @Override
-    public void export(MaritimeAdministrationDTO maritimeAdministrationDTO, HttpServletResponse response) {
+    public String export(MaritimeAdministrationDTO maritimeAdministrationDTO, HttpServletResponse response) {
         // 表头处理
-        List<Object> head = Arrays.asList("客户编号", "快递公司", "已收到单号", "内件明细", "实重", "长", "宽", "高", "体积重", "包裹数", "人民币", "欧元");
+        List<Object> head = Arrays.asList("柜号","客户编号", "快递公司", "已收到单号", "内件明细", "实重", "长", "宽", "高", "体积重", "包裹数", "人民币", "欧元");
         // 汇总集合
         List<List<Object>> sheetDateList = new ArrayList<>();
         sheetDateList.add(head);
@@ -129,7 +141,7 @@ public class MaritimeAdministrationServiceImpl implements MaritimeAdministration
 //                        maritimeDetailDO.setRmb(maritimeAdministrationDO.getRmb());
 //                        maritimeDetailDO.setEuro(maritimeAdministrationDO.getEuro());
                     for (int i = 0; i < maritimeDetailDOS.size(); i++) {
-                        MaritimeDetailDO maritimeDetailDO = new MaritimeDetailDO();
+                        MaritimeDetailDO maritimeDetailDO = maritimeDetailDOS.get(i);
                         if (i == 0) {
                             List<Object> objects = new ArrayList<>();
                             objects.add(maritimeAdministrationDO.getContainerNo());
@@ -176,8 +188,54 @@ public class MaritimeAdministrationServiceImpl implements MaritimeAdministration
             });
         }
 
-        ExcelUtils.export(response,"海运清单",sheetDateList);
+        return ExcelUtils.export(response,"海运清单",sheetDateList);
+
+    }
+
+    @Override
+    public MaritimeAdministrationDO getInfo(Long id) throws ServiceException {
+        MaritimeAdministrationDO maritimeAdministrationDO = maritimeAdministrationMapper.selectById(id);
+        if (maritimeAdministrationDO != null) {
+            List<MaritimeDetailDO> maritimeDetailDOS = maritimeDetailMapper.selectList(new EntityWrapper<MaritimeDetailDO>()
+                    .eq("info_id", id));
+            maritimeAdministrationDO.setMaritimeDetailDOS(maritimeDetailDOS);
+        }
+        return maritimeAdministrationDO;
+    }
+
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createAll(List<MaritimeAdministrationDTO> maritimeAdministrationDTOS) throws ServiceException {
+        Date now = new Date();
+        maritimeAdministrationDTOS = JSON.parseArray(JSONObject.toJSONString(maritimeAdministrationDTOS), MaritimeAdministrationDTO.class);
+        if (!CollectionUtils.isEmpty(maritimeAdministrationDTOS)) {
+            for (int i = 0; i < maritimeAdministrationDTOS.size(); i++) {
+                MaritimeAdministrationDO insertDO = new MaritimeAdministrationDO();
+                MaritimeAdministrationDTO dto = maritimeAdministrationDTOS.get(i);
+                BeanUtils.copyProperties(dto, insertDO);
+                insertDO.setGmtUpdate(now);
+                insertDO.setGmtCreate(now);
+                insertDO.setStatus(0);
+                maritimeAdministrationMapper.insert(insertDO);
+                // 详情
+                List<MaritimeDetailDTO> maritimeDetailDTOS = dto.getMaritimeDetailDTOS();
+                if(!CollectionUtils.isEmpty(maritimeDetailDTOS)){
+                    for(int j=0;j<maritimeDetailDTOS.size();j++){
+                        MaritimeDetailDO insertDetailDO = new MaritimeDetailDO();
+                        MaritimeDetailDTO dtoDetail = maritimeDetailDTOS.get(j);
+                        BeanUtils.copyProperties(dtoDetail, insertDetailDO);
+                        insertDetailDO.setInfoId(insertDO.getId());
+                        insertDetailDO.setGmtUpdate(now);
+                        insertDetailDO.setGmtCreate(now);
+                        insertDetailDO.setStatus(0);
+                        maritimeDetailMapper.insert(insertDetailDO);
+                    }
+                }
+            }
+        }
     }
 
+
+
 }

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/sys/ProductSalesServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
@@ -44,6 +45,15 @@ public class ProductSalesServiceImpl implements ProductSalesService {
     @Override
     public Page<ProductSalesDO> list(ProductSalesDTO selectDTO, Integer page, Integer limit, Long adminId) throws ServiceException {
         Wrapper<ProductSalesDO> wrapper = new EntityWrapper<ProductSalesDO>();
+        if(!StringUtils.isEmpty(selectDTO.getSaleNo())){
+            wrapper.eq("sale_no",selectDTO.getSaleNo());
+        }
+        if(!StringUtils.isEmpty(selectDTO.getCustomer())){
+            wrapper.eq("customer",selectDTO.getCustomer());
+        }
+        if(!StringUtils.isEmpty(selectDTO.getTradeName())){
+            wrapper.eq("trade_name",selectDTO.getTradeName());
+        }
         List<ProductSalesDO> list = productSalesMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
         Integer count = productSalesMapper.selectCount(wrapper);
         return new Page<ProductSalesDO>(list, page, limit, count);

unimall-core/src/main/java/com/iotechn/unimall/core/util/ExcelUtils.java

@@ -385,7 +385,7 @@ public class ExcelUtils {
         exportTemplate(response, fileName, fileName, clazz, isContainExample);
     }
 
-    public static <T> void exportTemplate(HttpServletResponse response, String fileName, String sheetName,
+    public static <T> String exportTemplate(HttpServletResponse response, String fileName, String sheetName,
                                           Class<T> clazz, boolean isContainExample) {
         // 获取表头字段
         List<ExcelClassField> headFieldList = getExcelClassFieldList(clazz);
@@ -408,7 +408,7 @@ public class ExcelUtils {
             sheetDataList.add(exampleList);
         }
         // 导出数据
-        export(response, fileName, sheetName, sheetDataList, selectMap);
+        return export(response, fileName, sheetName, sheetDataList, selectMap);
     }
 
     private static <T> List<ExcelClassField> getExcelClassFieldList(Class<T> clazz) {
@@ -511,15 +511,15 @@ public class ExcelUtils {
      * @param file      本地文件对象
      * @param sheetData 导出数据
      */
-    public static void exportFile(File file, List<List<Object>> sheetData) {
+    public static String exportFile(File file, List<List<Object>> sheetData) {
         if (file == null) {
             System.out.println("文件创建失败");
-            return;
+            return null;
         }
         if (sheetData == null) {
             sheetData = new ArrayList<>();
         }
-        export(null, file, file.getName(), file.getName(), sheetData, null);
+        return export(null, file, file.getName(), file.getName(), sheetData, null);
     }
 
     /**
@@ -635,26 +635,26 @@ public class ExcelUtils {
         return map;
     }
 
-    public static void exportEmpty(HttpServletResponse response, String fileName) {
+    public static String exportEmpty(HttpServletResponse response, String fileName) {
         List<List<Object>> sheetDataList = new ArrayList<>();
         List<Object> headList = new ArrayList<>();
         headList.add("导出无数据");
         sheetDataList.add(headList);
-        export(response, fileName, sheetDataList);
+        return export(response, fileName, sheetDataList);
     }
 
-    public static void export(HttpServletResponse response, String fileName, List<List<Object>> sheetDataList) {
-        export(response, fileName, fileName, sheetDataList, null);
+    public static String export(HttpServletResponse response, String fileName, List<List<Object>> sheetDataList) {
+        return export(response, fileName, fileName, sheetDataList, null);
     }
 
-    public static void export(HttpServletResponse response, String fileName, String sheetName,
+    public String export(HttpServletResponse response, String fileName, String sheetName,
                               List<List<Object>> sheetDataList) {
-        export(response, fileName, sheetName, sheetDataList, null);
+        return export(response, fileName, sheetName, sheetDataList, null);
     }
 
-    public static void export(HttpServletResponse response, String fileName, String sheetName,
-                              List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
-        export(response, null, fileName, sheetName, sheetDataList, selectMap);
+    public static String export(HttpServletResponse response, String fileName, String sheetName,
+                                List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
+        return export(response, null, fileName, sheetName, sheetDataList, selectMap);
     }
 
     public static <T, K> void export(HttpServletResponse response, String fileName, List<T> list, Class<K> template) {
@@ -675,12 +675,12 @@ public class ExcelUtils {
         export(response, fileName, sheetDataList);
     }
 
-    public static void export(HttpServletResponse response, String fileName, List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
-        export(response, fileName, fileName, sheetDataList, selectMap);
+    public String export(HttpServletResponse response, String fileName, List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
+        return export(response, fileName, fileName, sheetDataList, selectMap);
     }
 
-    private static void export(HttpServletResponse response, File file, String fileName, String sheetName,
-                               List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
+    private static String export(HttpServletResponse response, File file, String fileName, String sheetName,
+                                 List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
         // 整个 Excel 表格 book 对象
         SXSSFWorkbook book = new SXSSFWorkbook();
         // 每个 Sheet 页
@@ -742,17 +742,45 @@ public class ExcelUtils {
             // 本地导出
             FileOutputStream fos;
             try {
-                fos = new FileOutputStream(file);
+                fileName = encodingFilename(fileName);
+                fos = new FileOutputStream(getAbsoluteFile(fileName));
                 ByteArrayOutputStream ops = new ByteArrayOutputStream();
                 book.write(ops);
                 fos.write(ops.toByteArray());
                 fos.close();
+                return fileName;
             } catch (Exception e) {
                 e.printStackTrace();
             }
         }
+        return fileName;
     }
 
+
+    /**
+     * 编码文件名
+     */
+    public static String encodingFilename(String filename)
+    {
+        filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
+        return filename;
+    }
+
+    /**
+     * 获取下载路径
+     *
+     * @param filename 文件名称
+     */
+    public static String getAbsoluteFile(String filename)
+    {
+        String downloadPath = "/templates/"+ filename;
+        File desc = new File(downloadPath);
+        if (!desc.getParentFile().exists())
+        {
+            desc.getParentFile().mkdirs();
+        }
+        return downloadPath;
+    }
     /**
      * 合并当前Sheet页的单元格
      *

unimall-data/src/main/java/com/iotechn/unimall/data/domain/MaritimeAdministrationDO.java

@@ -60,4 +60,35 @@ public class MaritimeAdministrationDO extends SuperDO {
     @TableField(exist = false)
     private List<MaritimeDetailDO> maritimeDetailDOS;
 
+
+    /* 快递公司 */
+    @TableField(exist = false)
+    private String courierServicesCompany;
+    /* 已收到单号 */
+    @TableField(exist = false)
+    private String receivedNo;
+    /* 内件明细 */
+    @TableField(exist = false)
+    private String internalDetails;
+    /* 实重 */
+    @TableField(exist = false)
+    private String weight;
+    /* 长 */
+    @TableField(exist = false)
+    private String long1;
+    /* 宽 */
+    @TableField(exist = false)
+    private String wide;
+    /* 高 */
+    @TableField(exist = false)
+    private String height;
+    /* 体积重 */
+    @TableField(exist = false)
+    private String bulkWeight;
+
+
+
+    @TableField(exist = false)
+    private String flag;
+
 }

unimall-data/src/main/java/com/iotechn/unimall/data/dto/MaritimeAdministrationDTO.java

@@ -41,6 +41,7 @@ public class MaritimeAdministrationDTO extends SuperDTO {
     private Long companyId;
      /* updatePeople */
     private String updatePeople;
+    private List<MaritimeAdministrationDTO> maritimeAdministrationDTOS;
 
     private List<MaritimeDetailDTO> maritimeDetailDTOS;
 

unimall-launcher/src/main/resources/application.properties

@@ -10,7 +10,7 @@ com.iotechn.unimall.env=3
 ########################################################
 spring.druid.driverClassName=com.mysql.jdbc.Driver
 ##Õýʽ¿â
-spring.druid.url=jdbc:mysql://162.62.62.59:3306/unimall_dp?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
+spring.druid.url=jdbc:mysql://162.62.62.59:3323/unimall_dp?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
 ###±¾µØ¿â
 #spring.druid.url=jdbc:mysql://localhost:3306/unimall?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
 spring.druid.username=root