From 5ca8157adb3236d7817b487a5ff6f4efa12006d2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 14:25:27 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java
index 3368c6f..d58d673 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java
@@ -23,6 +23,7 @@
import org.yeshi.utils.mail.ShowMail;
import com.yeshi.fanli.entity.elme.ElmeOrder;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -49,12 +50,14 @@
String content = null;
String columnName = firstRow.getCell(c).getStringCellValue().trim();
+ if (cell == null)
+ continue;
if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
if (HSSFDateUtil.isCellDateFormatted(cell)) { // 鍒ゆ柇鏃ユ湡绫诲瀷
Date date = cell.getDateCellValue();
content = TimeUtil.getGernalTime(date.getTime(), "yyyy-MM-dd");
} else { // 鍚�
- content = cell.getNumericCellValue() + "";
+ content = cell.getNumericCellValue() + "";
}
} else if (cell.getCellType() == Cell.CELL_TYPE_STRING) {
@@ -62,7 +65,7 @@
}
switch (columnName) {
case "娓犻亾鍙�":
- order.setChannelId(new BigDecimal(content).longValue()+"");
+ order.setChannelId(new BigDecimal(content).longValue() + "");
break;
case "娓犻亾鍚嶇О":
order.setChannelName(content);
@@ -71,7 +74,7 @@
order.setTrackPid(content);
break;
case "rid":
- order.setRid(new BigDecimal(content).longValue()+"");
+ order.setRid(new BigDecimal(content).longValue() + "");
break;
case "璁㈠崟鏃ユ湡":
order.setOrderDate(new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd")));
@@ -138,21 +141,26 @@
for (int i = list.size() - 1; i >= 0; i--) {
ShowMail showMail = new ShowMail((MimeMessage) list.get(i));
if ("qiuming.wu<qiuming.wu@ele.me>".equalsIgnoreCase(showMail.getFrom())) {
- if (count++ > 4)
+ if (count++ > 5)
break;
- boolean attch = showMail.isContainAttach((Part) list.get(i));
- if (attch) {
- List<InputStream> attchList = showMail.saveAttachMent((Part) list.get(i));
- if (attchList.size() > 0) {
- List<ElmeOrder> orderList = ElmeOrderUtil.parseOrder(attchList.get(0));
- if (orderList != null && orderList.size() > 0)
- totalOrderList.addAll(orderList);
+ try {
+ boolean attch = showMail.isContainAttach((Part) list.get(i));
+ if (attch) {
+ List<InputStream> attchList = showMail.saveAttachMent((Part) list.get(i));
+ if (attchList.size() > 0) {
+ List<ElmeOrder> orderList = ElmeOrderUtil.parseOrder(attchList.get(0));
+ if (orderList != null && orderList.size() > 0)
+ totalOrderList.addAll(orderList);
+ }
}
+ } catch (Exception e) {
+
}
+
}
}
} catch (Exception e) {
- e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
return totalOrderList;
}
--
Gitblit v1.8.0