Merge branch 'hotfix_qc_tab_20190701' into test6.9.7

# Conflicts:
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java

@@ -100,13 +100,13 @@ import com.yoho.ufo.order.constant.OrderConfigConstant;
 import com.yoho.ufo.order.request.OrderOperateTask;
 import com.yoho.ufo.order.request.OrderOperateTask;
 import com.yoho.ufo.order.request.SaveQualityCheckInfoRequest;
 import com.yoho.ufo.order.request.SaveQualityCheckInfoRequest;
 import com.yoho.ufo.order.service.IBuyerOrderService;
 import com.yoho.ufo.order.service.IBuyerOrderService;
+import com.yoho.ufo.order.service.event.DepotNumUpdateEvent;
 import com.yoho.ufo.service.impl.UfoServiceCaller;
 import com.yoho.ufo.service.impl.UfoServiceCaller;
 import com.yoho.ufo.service.impl.UserHelper;
 import com.yoho.ufo.service.impl.UserHelper;
 import com.yoho.ufo.service.model.PageResponseBO;
 import com.yoho.ufo.service.model.PageResponseBO;
 import com.yoho.ufo.util.DateUtil;
 import com.yoho.ufo.util.DateUtil;
 import com.yoho.ufo.util.ImagesConstant;
 import com.yoho.ufo.util.ImagesConstant;
 import com.yoho.ufo.util.ImagesHelper;
 import com.yoho.ufo.util.ImagesHelper;
-import com.yoho.ufo.util.ListUtil;
 import com.yoho.ufo.util.MobileHelper;
 import com.yoho.ufo.util.MobileHelper;
 import com.yoho.ufo.util.OrderVideoUrlUtil;
 import com.yoho.ufo.util.OrderVideoUrlUtil;
 import com.yohobuy.ufo.model.order.bo.AppraiseExpressInfoBo;
 import com.yohobuy.ufo.model.order.bo.AppraiseExpressInfoBo;
@@ -444,14 +444,30 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 		resultMap.put("alreadyDeliverNum", alreadyDeliverNum);
 		resultMap.put("alreadyDeliverNum", alreadyDeliverNum);
     	resultMap.put("problemNum", problemNum);
     	resultMap.put("problemNum", problemNum);
     	//查询异常包裹
     	//查询异常包裹
-    	resultMap.put("exceptionNum", abnormalPackageMapper.selectValidCnt(queryStr, depotNo));
+    	resultMap.put("exceptionNum", getExceptionNum(queryStr, depotNo));
     	
     	
     	return resultMap;
     	return resultMap;
     }
     }
     
     
+    private int getExceptionNum(String queryStr, Integer depotNo) {
+    	//先按订单号查对应的异常包裹
+    	ExpressRecord expressRecord = expressRecordMapper.selectByOrderCodeAndType(queryStr, null, EXPRESS_TYPE_SELLER_TO_JUDGE);
+    	if(null != expressRecord) {
+    		return abnormalPackageMapper.selectValidCnt(expressRecord.getWaybillCode(), depotNo);
+    	}
+    	
+    	return abnormalPackageMapper.selectValidCnt(queryStr, depotNo);
+    }
+    
     private List<BuyerOrder> queryOrderByQueryStr(String queryStr, Integer depotNo, Byte status) {
     private List<BuyerOrder> queryOrderByQueryStr(String queryStr, Integer depotNo, Byte status) {
-    	//按卖家运单号来查
+    	//先按订单号来查
     	BuyerOrderReq req = new BuyerOrderReq();
     	BuyerOrderReq req = new BuyerOrderReq();
+    	req.setOrderCode(queryStr);
+    	req.setDepotNo(depotNo);
+    	req.setStatus(status);
+    	req.setSize(100);
+    	List<BuyerOrder> orderList = buyerOrderMapper.selectByCondition(req);
+    	if(CollectionUtils.isEmpty(orderList)){//再按卖家运单号来查
     		req = new BuyerOrderReq();
     		req = new BuyerOrderReq();
         	req.setSellerWaybillCode(queryStr);
         	req.setSellerWaybillCode(queryStr);
         	req.setDepotNo(depotNo);
         	req.setDepotNo(depotNo);
@@ -463,6 +479,9 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
         	}
         	}
 
 
         	return list;
         	return list;
+    	}else{
+    		return orderList;
+    	}
     }
     }
     
     
     public Map<String, Integer> getCountByOrderStatus(){
     public Map<String, Integer> getCountByOrderStatus(){