bug修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/order/ShopOrderController.java

@@ -22,6 +22,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.FilePathSplicingType;
 import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.common.excel.ExcelResult;
+import com.ruoyi.common.excel.ImportMessage;
 import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.shop.order.domain.bo.BusinessCountBo;
@@ -587,11 +588,20 @@ public class ShopOrderController extends BaseController {
      * @throws Exception
      */
     @PostMapping("/import_ship")
-    public R<Void> importShip(@RequestParam("file") MultipartFile multipartFile) throws Exception {
+    public R<ImportMessage> importShip(@RequestParam("file") MultipartFile multipartFile) throws Exception {
         Long businessId = getBusinessId(true);
         //获得excel中的数据
         ExcelResult<ShopOrderWaitShipVo> result = ExcelUtil.importExcel(multipartFile.getInputStream(), ShopOrderWaitShipVo.class, new ShopOrderWaitShipImportListener(businessId));
-        return R.ok(result.getAnalysis());
+        ImportMessage importMessage = new ImportMessage();
+        try {
+            importMessage.setMessage(result.getAnalysis());
+        } catch (Exception e) {
+            String failureMsg = e.getMessage();
+            List<String> failureList = Arrays.asList(failureMsg.split("<br/>"));
+            importMessage.setMessageList(failureList);
+            importMessage.setMessage(failureMsg);
+        }
+        return R.ok(importMessage);
     }
 
     /**

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/ShopOrderWaitShipImportListener.java

@@ -61,8 +61,8 @@ public class ShopOrderWaitShipImportListener extends AnalysisEventListener<ShopO
 
     @Override
     public void invoke(ShopOrderWaitShipVo shopOrderWaitShipVo, AnalysisContext analysisContext) {
-        ShopOrderPackage shopOrderPackage = shopOrderPackageService.expressShipForImport(businessId, shopOrderWaitShipVo);
         try {
+            ShopOrderPackage shopOrderPackage = shopOrderPackageService.expressShipForImport(businessId, shopOrderWaitShipVo);
             try {
                 // 发送自动收货消息
                 shopOrderMqProductService.orderPackageReceivingMqProductSend(shopOrderPackage.getPackageId());