导入对订单发货

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinImportServiceImpl.java

@@ -22,13 +22,29 @@ public class GoblinImportServiceImpl implements IGoblinImportService {
     @Override
     public String importExpress(List<OrderMallOrderVo> mallOrdertVoList) {
         if (StringUtils.isNull(mallOrdertVoList) || mallOrdertVoList.size() == 0) {
-            throw new BusinessException("导入用户数据不能为空！");
+            throw new BusinessException("导入数据不能为空！");
         }
-        int count = 0;
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
         for (OrderMallOrderVo mallOrderVo : mallOrdertVoList) {
             ResponseDto<Boolean> express = iGoblinStoreOrderService.express(mallOrderVo.getOrderCode(), null, mallOrderVo.getMailNo());
-            count++;
+            if (express.getCode().equals("0")) {
+                successNum++;
+                successMsg.append("<br/>" + successNum + "、订单编号 " + mallOrderVo.getOrderCode() + " 导入发货成功");
+            } else {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、订单编号 " + mallOrderVo.getOrderCode() + " 失败原因：";
+                failureMsg.append(msg + express.getMessage());
+            }
         }
-        return String.valueOf(count);
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new BusinessException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
     }
 }