From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 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 1f8dcc8..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
@@ -5,7 +5,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Properties;
@@ -17,11 +16,14 @@
import javax.mail.Store;
import javax.mail.internet.MimeMessage;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
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;
@@ -44,11 +46,26 @@
ElmeOrder order = new ElmeOrder();
Row row = sheet.getRow(r);
for (int c = row.getFirstCellNum(); c < row.getLastCellNum(); c++) {
- String content = row.getCell(c).toString().trim();
+ Cell cell = row.getCell(c);
+ 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() + "";
+ }
+
+ } else if (cell.getCellType() == Cell.CELL_TYPE_STRING) {
+ content = (cell.getStringCellValue());
+ }
switch (columnName) {
case "娓犻亾鍙�":
- order.setChannelId(content);
+ order.setChannelId(new BigDecimal(content).longValue() + "");
break;
case "娓犻亾鍚嶇О":
order.setChannelName(content);
@@ -57,13 +74,13 @@
order.setTrackPid(content);
break;
case "rid":
- order.setRid(content);
+ order.setRid(new BigDecimal(content).longValue() + "");
break;
case "璁㈠崟鏃ユ湡":
order.setOrderDate(new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd")));
break;
case "璁㈠崟鍙�":
- order.setOrderId(content.replace("<", "").replace(">", ""));
+ order.setOrderId(content.replace("<", "").replace(">", "").replace("<", "").replace(">", ""));
break;
case "鏀粯閲戦":
order.setPayMoney(new BigDecimal(content));
@@ -75,19 +92,19 @@
order.setCouponMoney(new BigDecimal(content));
break;
case "鏄惁鏂板棣栧崟":
- order.setNewerFirstOrder(Integer.parseInt(content));
+ order.setNewerFirstOrder(new BigDecimal(content).intValue());
break;
case "鏄惁鏂板澶嶈喘鍗�":
- order.setNewerRepayOrder(Integer.parseInt(content));
+ order.setNewerRepayOrder(new BigDecimal(content).intValue());
break;
case "鏄惁浣跨敤娣樺绾㈠寘":
- order.setTaokeHongBao(Integer.parseInt(content));
+ order.setTaokeHongBao(new BigDecimal(content).intValue());
break;
case "鏄惁鏈夊湪浼氬満鍐呰闂ㄥ簵鐨勭偣鍑昏褰�":
- order.setShopClick(Integer.parseInt(content));
+ order.setShopClick(new BigDecimal(content).intValue());
break;
case "鏄惁棰嗗埜鍚�7澶╁唴棣栧崟":
- order.setRecieveCoupon7DayFirstOrder(Integer.parseInt(content));
+ order.setRecieveCoupon7DayFirstOrder(new BigDecimal(content).intValue());
break;
case "鏄惁6缁撲剑":
if ("鏄�".equalsIgnoreCase(content))
@@ -124,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