修改物流公司，增加一个月订单限制

@@ -91,6 +91,8 @@ public class Constants {
 	public static Map<Integer,String> COUNTRY;
 
 	public static Map<Short,String> ORDER_STATUS;
+	//物流id、公司对应
+	public static Map<Short,String> EXPRESS;
 	static{
 		COUNTRY = Maps.newHashMap();
 		COUNTRY.put(374,"美国");
@@ -114,11 +116,21 @@ public class Constants {
 		ORDER_STATUS.put((short) 800,"退货中");
 		ORDER_STATUS.put((short) 900,"已关闭");
 
+		EXPRESS = Maps.newHashMap();
+		EXPRESS.put((short)1,"转运四方集货模式");
+		EXPRESS.put((short)2,"转运四方备货模式");
+		EXPRESS.put((short)3,"一号仓");
+		EXPRESS.put((short)4,"ems");
+		EXPRESS.put((short)5,"海米派");
+		EXPRESS.put((short)6,"顺丰");
+		EXPRESS.put((short)7,"国内ems");
 	}
 	//72小时
 	public static final int CLEARANCE_OVER_TIME = 72*60*60;
 	//15天
 	public static final int SIGN_OVER_TIME = 15*24*60*60;
+	//一个月
+	public static final int ONE_MONTH_TIME = 30*24*60*60;
 	// 批量导入导出文件后缀名定义
 	public static final String BATCH_FILE_POSTFIX = ".xls";
 }

@@ -23,6 +23,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.text.DecimalFormat;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -185,7 +186,10 @@ public class OrderOverTimeServiceImpl implements OrderOverTimeService{
         int nowTimeSecond = DateUtil.getCurrentTimeSeconds();
         //清关中
         List<Order> clearanceOrderList =  orderMapper.selectByOrderStatus(Order.ORDER_STATUS_CLEARANCE);
-        //清关中的订单id
+
+        removeOverOneMonthOrder(nowTimeSecond, clearanceOrderList);
+
+      //清关中的订单id
         List<Long> orderIdList = Lists.newArrayList();
         //清关超时订单id
         List<Long> clearanceOverTimeOrderIdList = Lists.newArrayList();
@@ -204,12 +208,16 @@ public class OrderOverTimeServiceImpl implements OrderOverTimeService{
         }
         return orderOverTimeBOList;
     }
+
     //15天未签收超时
     public List<OrderOverTimeBO> getAllUnSignedOrder(){
         int nowTimeSecond = DateUtil.getCurrentTimeSeconds();
         List<OrderOverTimeBO> orderOverTimeBOList = Lists.newArrayList();
         //下单成功未签收订单
         List<Order> onLineOrderList =  orderMapper.selectAllOrderOnLine();
+
+        removeOverOneMonthOrder(nowTimeSecond, onLineOrderList);
+
         //下单成功未签收订单id
         List<Long> onLineOrderIdList = Lists.newArrayList();
         //下单超过15天未签收的订单
@@ -279,7 +287,8 @@ public class OrderOverTimeServiceImpl implements OrderOverTimeService{
                             String shippingInfo = lastContent.getString("context");
                             orderOverTimeBO.setContent(shippingInfo);
                         }
-                        orderOverTimeBO.setDomesticExpressCompany(orderShippingInfo.getDomesticExpressCompany());
+                        //物流公司
+                        orderOverTimeBO.setDomesticExpressCompany(Constants.EXPRESS.get(orderShippingInfo.getTransportExpressCompanyId()));
                     }
                 }
                 //收货人信息
@@ -295,4 +304,15 @@ public class OrderOverTimeServiceImpl implements OrderOverTimeService{
         }
         return orderOverTimeBOList;
     }
+    //超过一个月的订单不处理
+    private void removeOverOneMonthOrder(int nowTimeSecond, List<Order> orderList) {
+        Iterator<Order> iterator = orderList.iterator();
+        while (iterator.hasNext()){
+            Order order = iterator.next();
+
+            if(nowTimeSecond-order.getCreateTime()> Constants.ONE_MONTH_TIME){
+                iterator.remove();
+            }
+        }
+    }
 }