问题处理

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -18,7 +18,7 @@
             pi.update_user,
             pi.update_time,
             pi.victoriatourist_json,
-            IF(DATEDIFF(pi.create_time,now())> json_unquote( victoriatourist_json -> '$.growUpDay' ),3,IF( DATEDIFF(pi.create_time,now())> json_unquote( victoriatourist_json -> '$.newProductsDay' ), 2, 1 )) AS lifeCycle
+            IF(DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.growUpDay' ),3,IF( DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.newProductsDay' ), 2, 1 )) AS lifeCycle
         FROM
             product_info pi
             ${ew.customSqlSegment}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/jd/JdBackQualityWaitController.java

@@ -7,6 +7,7 @@ import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
 import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
 import com.fjhx.victoriatourist.service.jd.JdBackQualityWaitService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -35,11 +36,20 @@ public class JdBackQualityWaitController {
     }
 
     /**
-     * 京东退货待质检分页
+     * 京东退货待质检导出Excel
      */
+//    @NonInterception
     @GetMapping("/exportExcel")
     public void exportExcel(HttpServletResponse httpServletResponse) {
         jdBackQualityWaitService.exportExcel(httpServletResponse);
     }
 
+    /**
+     * 京东退货待质检导入Excel
+     */
+    @PostMapping("/importExcel")
+    public void importExcel(@RequestParam("file") MultipartFile file) {
+        jdBackQualityWaitService.importExcel(file);
+    }
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/bo/JdBackQualityWaitExcelBo.java

@@ -1,38 +1,26 @@
 package com.fjhx.victoriatourist.entity.jd.bo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 
 @Getter
 @Setter
-@Data
-@ColumnWidth(25)
-@HeadRowHeight(20)
-@ContentRowHeight(18)
-public class JdBackQualityWaitExcelBo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class JdBackQualityWaitExcelBo {
 
     /**
      * 京东待质检id
      */
-    @ColumnWidth(15)
     @ExcelProperty("京东待质检id")
-    private Long id;
+    private String id;
 
     /**
      * 产品id
      */
     @ExcelProperty("产品id")
-    private Long productId;
+    private String productId;
 
     /**
      * 待质检数量

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/JdBackQualityWaitService.java

@@ -5,6 +5,7 @@ import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
 import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
 import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
 import com.ruoyi.common.core.service.BaseService;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -28,4 +29,9 @@ public interface JdBackQualityWaitService extends BaseService<JdBackQualityWait>
      * 导出excel
      */
     void exportExcel(HttpServletResponse httpServletResponse);
+
+    /**
+     * 导入excel
+     */
+    void importExcel(MultipartFile file);
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackQualityWaitServiceImpl.java

@@ -1,24 +1,26 @@
 package com.fjhx.victoriatourist.service.jd.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.item.util.excel.util.ExcelUtil;
 import com.fjhx.victoriatourist.entity.jd.bo.JdBackQualityWaitExcelBo;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityDetailsDto;
 import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
 import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo;
 import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
 import com.fjhx.victoriatourist.mapper.jd.JdBackQualityWaitMapper;
+import com.fjhx.victoriatourist.service.jd.JdBackQualityDetailsService;
 import com.fjhx.victoriatourist.service.jd.JdBackQualityWaitService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileOutputStream;
 import java.util.List;
 
 
@@ -34,6 +36,8 @@ import java.util.List;
 public class JdBackQualityWaitServiceImpl extends ServiceImpl<JdBackQualityWaitMapper, JdBackQualityWait> implements JdBackQualityWaitService {
     @Autowired
     private ProductInfoService productInfoService;
+    @Autowired
+    private JdBackQualityDetailsService jdBackQualityDetailsService;
 
     @Override
     public Page<JdBackQualityWaitVo> getPage(JdBackQualityWaitSelectDto dto) {
@@ -51,13 +55,12 @@ public class JdBackQualityWaitServiceImpl extends ServiceImpl<JdBackQualityWaitM
         return page;
     }
 
-    @SneakyThrows
     @Override
     public void exportExcel(HttpServletResponse httpServletResponse){
         List<JdBackQualityWait> list = list();
-        List<JdBackQualityWaitExcelBo> jdBackQualityWaitVos = BeanUtil.copyToList(list, JdBackQualityWaitExcelBo.class);
+        List<JdBackQualityWaitVo> jdBackQualityWaitVos = BeanUtil.copyToList(list, JdBackQualityWaitVo.class);
         //赋值产品信息
-        productInfoService.attributeAssign(jdBackQualityWaitVos, JdBackQualityWaitExcelBo::getProductId, (item, productinfo) -> {
+        productInfoService.attributeAssign(jdBackQualityWaitVos, JdBackQualityWaitVo::getProductId, (item, productinfo) -> {
             item.setProductType(productinfo.getType());
             item.setProductCode(productinfo.getCode());
             item.setProductName(productinfo.getName());
@@ -65,10 +68,15 @@ public class JdBackQualityWaitServiceImpl extends ServiceImpl<JdBackQualityWaitM
             item.setProductUnit(productinfo.getUnit());
         });
         //导出Excel
-        ExcelUtil.export(httpServletResponse, "aaaaa","sheet1",jdBackQualityWaitVos, JdBackQualityWaitExcelBo.class);
-
+        List<JdBackQualityWaitExcelBo> jdBackQualityWaitExcelBos = BeanUtil.copyToList(jdBackQualityWaitVos, JdBackQualityWaitExcelBo.class);
+        ExcelUtil.export(httpServletResponse, jdBackQualityWaitExcelBos, JdBackQualityWaitExcelBo.class);
+    }
 
-//        EasyExcel.write(new FileOutputStream("C:\\Users\\ASUS\\Downloads\\sdsd.xlsx"),  JdBackQualityWaitExcelBo.class).sheet("sheetName").doWrite(jdBackQualityWaitVos);
+    @Override
+    public void importExcel(MultipartFile file){
+        List<JdBackQualityWaitExcelBo> read = ExcelUtil.read(file, JdBackQualityWaitExcelBo.class);
+        List<JdBackQualityDetailsDto> jdBackQualityDetailsDtos = BeanUtil.copyToList(read, JdBackQualityDetailsDto.class);
+        jdBackQualityDetailsService.add(jdBackQualityDetailsDtos);
     }
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -145,6 +145,9 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         for (QualityDetails qualityDetails : qualityDetailsList) {
             qualityDetails.setQualityInfoId(qualityInfoDto.getId());
             ArrivalStockRecordsDetails arrivalStockRecordsDetails = arrivalStockRecordsDetailsMap.get(qualityDetails.getArrivalStockRecordsDetailsId());
+            if(ObjectUtil.isEmpty(arrivalStockRecordsDetails)){
+                throw new ServiceException("查询不到到货明细信息");
+            }
             BigDecimal quantity = arrivalStockRecordsDetails.getQuantity();
             qualityDetails.setTotalQuantity(quantity);
 

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -377,7 +377,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 } else if (type == 3) {
                     //维多利亚入库增加冻结库存
                     String victoriatouristJson = oldStocks.getVictoriatouristJson();
-                    JSONObject json = JSONObject.parseObject(victoriatouristJson);
+                    JSONObject json = ObjectUtil.isEmpty(victoriatouristJson) ? new JSONObject() : JSONObject.parseObject(victoriatouristJson);
                     BigDecimal frozenQuantity = json.getBigDecimal("frozenQuantity");
                     frozenQuantity = frozenQuantity == null ? BigDecimal.ZERO : frozenQuantity;
                     frozenQuantity = frozenQuantity.add(stock.getQuantity());