From 1760787490fd7581c58b932db8c4ea7a019ef8fb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 25 十月 2019 18:59:04 +0800
Subject: [PATCH] 饿了么爬单修改

---
 fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 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..a03ee87 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,6 +16,8 @@
 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;
@@ -44,11 +45,24 @@
 			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.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 +71,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("&lt;", "").replace("&gt;", ""));
 					break;
 				case "鏀粯閲戦":
 					order.setPayMoney(new BigDecimal(content));
@@ -75,19 +89,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))

--
Gitblit v1.8.0