确认收货优化

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yoho.order.model.AbnormalPackage;
+import com.yoho.order.model.BuyerOrderReq;
 
 /**
  * Created by caoyan on 2019/6/24.
@@ -19,5 +20,5 @@ public interface AbnormalPackageMapper {
 
     int selectValidCnt();
     
-    List<String> selectValidSellerWaybillCodeList();
+    List<String> selectValidSellerWaybillCodeList(@Param("buyerOrderReq") BuyerOrderReq buyerOrderReq);
 }

@@ -18,8 +18,11 @@
         select count(1) from abnormal_package where is_del = 0
     </select>
     
-    <select id="selectValidSellerWaybillCodeList" resultType="java.lang.String">
-        select seller_waybillCode from abnormal_package where is_del=0
+    <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.start!=null and buyerOrderReq.size != null">
+         limit #{buyerOrderReq.start},#{buyerOrderReq.size}
+        </if>
     </select>
 
     <select id="selectBySellerWaybillCode" resultMap="BaseResultMap">

@@ -526,5 +526,12 @@ public class BuyerOrderController {
 			return new ApiResponse.ApiResponseBuilder().code(500).message("添加异常包裹失败").build();
 		}
 	}
+	
+	@RequestMapping(value = "/queryAbnormalPackage")
+    public ApiResponse queryAbnormalPackage(BuyerOrderReq req) {
+		LOGGER.info("queryAbnormalPackage in. param is {}", req);
+		PageResponseBO<String> result = buyerOrderService.queryAbnormalPackage(req);
+		return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(null == result ? new PageResponseBO<BuyerOrderResp>() : result).build();
+	}
 
 }

@@ -117,4 +117,6 @@ public interface IBuyerOrderService {
 	PageResponseBO<String> queryPackage(Integer depotNo, String sellerWaybillCode, Integer date);
 	
 	int addAbnormalPackage(String sellerWaybillCode);
+	
+	PageResponseBO<String> queryAbnormalPackage(BuyerOrderReq req);
 }

@@ -2530,6 +2530,22 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     	return abnormalPackageMapper.insert(pkg);
     }
     
+    @Override
+    public PageResponseBO<String> queryAbnormalPackage(BuyerOrderReq req){
+    	int total = abnormalPackageMapper.selectValidCnt();
+    	if(total == 0){
+    		return null;
+    	}
+    	List<String> list = abnormalPackageMapper.selectValidSellerWaybillCodeList(req);
+    	PageResponseBO<String> result=new PageResponseBO<>();
+    	result.setPage(req.getPage());
+        result.setList(list);
+        result.setSize(req.getSize());
+        result.setTotal(total);
+        
+        return result;
+    }
+    
     private JSONObject updateBuyerReceiveInfo(BuyerOrderReq req, String oldMetaValue, Integer buyerUid) {
     	JSONObject metaValue = JSONObject.parseObject(oldMetaValue);
         metaValue.replace("consignee", req.getReceiveName());