物流异常情况

@@ -14,7 +14,7 @@ public interface BuyerOrderMapper {
 	
 	int selectCountByStatus(List<Byte> statusList);
 
-	int selectCountByStatusForAbnormalSellerDelivery(@Param("list") List<Byte> statusList ,@Param("currentSecondMinus24Hours") Integer currentSecondMinus24Hours);
+	int selectCountByStatusForAbnormalSellerDelivery(@Param("list") List<Byte> statusList ,@Param("currentSecondMinus24Hours") Integer currentSecondMinus24Hours,@Param("maxCurrentSecondMinusHours") Integer maxCurrentSecondMinusHours);
 	
 	int selectCountByStatusAndDepotNo(@Param("list")List<Byte> statusList, @Param("depotNo")Integer depotNo, @Param("platformExpressInfoFlag")String platformExpressInfoFlag);
 	

@@ -119,5 +119,7 @@ public class BuyerOrderReq extends PageRequestBO{
 
 	private Integer currentSecondMinus24Hours;
 
+	private Integer  maxCurrentSecondMinusHours;
+
 	private String phoneUid;
 }

@@ -55,6 +55,9 @@
         from buyer_order where 1=1
         and seller_delivery_status = 0
         and update_time < #{currentSecondMinus24Hours}
+        <if test="maxCurrentSecondMinusHours != null">
+            and update_time >= #{maxCurrentSecondMinusHours}
+        </if>
         <if test="list != null and list.size()>0">
             and status in
             <foreach collection="list" item="status" open="(" close=")" separator=",">
@@ -128,6 +131,9 @@
      <if test="buyerOrderReq.currentSecondMinus24Hours != null ">
          and a.update_time &lt; #{buyerOrderReq.currentSecondMinus24Hours}
      </if>
+     <if test="buyerOrderReq.maxCurrentSecondMinusHours != null">
+         and update_time >= #{buyerOrderReq.maxCurrentSecondMinusHours}
+     </if>
      <if test="buyerOrderReq.status != null ">
          and a.status = #{buyerOrderReq.status}
      </if>

@@ -378,8 +378,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 		resultMap.put("num_11", buyerOrderMapper.selectCountByStatus(getStatusListByNavStatus(11)));//平台鉴定通过
         int currentSecondMinus24Hours = DateUtil.getCurrentTimeSeconds() - 24*60*60;
 		int currentSecondMinus48Hours = DateUtil.getCurrentTimeSeconds() - 48*60*60;
-		resultMap.put("num_12", buyerOrderMapper.selectCountByStatusForAbnormalSellerDelivery(getStatusListByNavStatus(12),currentSecondMinus24Hours));//待卖家发货
-		resultMap.put("num_13", buyerOrderMapper.selectCountByStatusForAbnormalSellerDelivery(getStatusListByNavStatus(13),currentSecondMinus48Hours));//待卖家发货
+		resultMap.put("num_12", buyerOrderMapper.selectCountByStatusForAbnormalSellerDelivery(getStatusListByNavStatus(12),currentSecondMinus24Hours,currentSecondMinus48Hours));//待卖家发货
+		resultMap.put("num_13", buyerOrderMapper.selectCountByStatusForAbnormalSellerDelivery(getStatusListByNavStatus(13),currentSecondMinus48Hours,null));//待卖家发货
     	return resultMap;
     }
 
@@ -2601,8 +2601,11 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 
     		//特殊处理:物流异常的订单
 			if(12==req.getNavStatus()){
-				int currentSecondMinus24Hours = DateUtil.getCurrentTimeSeconds() - 24*60*60;
+				int nowSnd=DateUtil.getCurrentTimeSeconds();
+				int currentSecondMinus24Hours =  nowSnd - 24*60*60;
+				int maxCurrentSecondMinusHours =nowSnd -48*60*60;
 				req.setCurrentSecondMinus24Hours(currentSecondMinus24Hours);
+				req.setMaxCurrentSecondMinusHours(maxCurrentSecondMinusHours);
 				req.setSellerDeliveryStatus(0);
 			}else if(13==req.getNavStatus()){
 				int currentSecondMinus24Hours = DateUtil.getCurrentTimeSeconds() - 48*60*60;