Merge branch 'dev_确认收货优化' into test6.9.7

@@ -15,13 +15,16 @@
     </sql>
     
     <select id="selectValidCnt" resultType="java.lang.Integer">
-        select count(1) from abnormal_package where is_del = 0 and seller_waybillCode= #{sellerWaybillCode}
+        select count(1) from abnormal_package where is_del = 0 
+        <if test="buyerOrderReq.sellerWaybillCode!=null and buyerOrderReq.sellerWaybillCode != ''">
+            and seller_waybillCode = #{buyerOrderReq.sellerWaybillCode}
+        </if>
     </select>
     
     <select id="selectValidSellerWaybillCodeList" resultType="java.lang.String" parameterType="com.yoho.order.model.BuyerOrderReq">
         select seller_waybillCode from abnormal_package where is_del=0 
         <if test="buyerOrderReq.sellerWaybillCode!=null and buyerOrderReq.sellerWaybillCode != ''">
-            seller_waybillCode = #{buyerOrderReq.sellerWaybillCode}
+            and seller_waybillCode = #{buyerOrderReq.sellerWaybillCode}
         </if>
         <if test="buyerOrderReq.start!=null and buyerOrderReq.size != null">
          limit #{buyerOrderReq.start},#{buyerOrderReq.size}

@@ -388,7 +388,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     	resultMap.put("problemNum", problemNum);
     	
     	//查询异常包裹
-    	resultMap.put("exceptionNum", abnormalPackageMapper.selectValidCnt(req.getQueryStr()));
+    	resultMap.put("exceptionNum", abnormalPackageMapper.selectValidCnt(null));
     	
     	return resultMap;
     }
@@ -424,6 +424,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     	resultMap.put("processingNum", processingNum);
 		resultMap.put("alreadyDeliverNum", alreadyDeliverNum);
     	resultMap.put("problemNum", problemNum);
+    	//查询异常包裹
+    	resultMap.put("exceptionNum", abnormalPackageMapper.selectValidCnt(queryStr));
     	
     	return resultMap;
     }