Authored by caoyan

确认收货优化

@@ -15,13 +15,16 @@ @@ -15,13 +15,16 @@
15 </sql> 15 </sql>
16 16
17 <select id="selectValidCnt" resultType="java.lang.Integer"> 17 <select id="selectValidCnt" resultType="java.lang.Integer">
18 - select count(1) from abnormal_package where is_del = 0 and seller_waybillCode= #{sellerWaybillCode} 18 + select count(1) from abnormal_package where is_del = 0
  19 + <if test="buyerOrderReq.sellerWaybillCode!=null and buyerOrderReq.sellerWaybillCode != ''">
  20 + and seller_waybillCode = #{buyerOrderReq.sellerWaybillCode}
  21 + </if>
19 </select> 22 </select>
20 23
21 <select id="selectValidSellerWaybillCodeList" resultType="java.lang.String" parameterType="com.yoho.order.model.BuyerOrderReq"> 24 <select id="selectValidSellerWaybillCodeList" resultType="java.lang.String" parameterType="com.yoho.order.model.BuyerOrderReq">
22 select seller_waybillCode from abnormal_package where is_del=0 25 select seller_waybillCode from abnormal_package where is_del=0
23 <if test="buyerOrderReq.sellerWaybillCode!=null and buyerOrderReq.sellerWaybillCode != ''"> 26 <if test="buyerOrderReq.sellerWaybillCode!=null and buyerOrderReq.sellerWaybillCode != ''">
24 - seller_waybillCode = #{buyerOrderReq.sellerWaybillCode} 27 + and seller_waybillCode = #{buyerOrderReq.sellerWaybillCode}
25 </if> 28 </if>
26 <if test="buyerOrderReq.start!=null and buyerOrderReq.size != null"> 29 <if test="buyerOrderReq.start!=null and buyerOrderReq.size != null">
27 limit #{buyerOrderReq.start},#{buyerOrderReq.size} 30 limit #{buyerOrderReq.start},#{buyerOrderReq.size}