Merge branch 'dev_0408优化平台发货' into test6.9.0

 package com.yoho.order.model;
 
+import lombok.ToString;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -7,6 +9,7 @@ import java.math.BigDecimal;
  * @author caoyan
  * @date 2018/9/12
  */
+@ToString
 public class BuyerOrder implements Serializable {
 
 
@@ -47,6 +50,8 @@ public class BuyerOrder implements Serializable {
 
 	private Integer attributes;
 
+	private Integer platformDeliveryStatus;//1 平台发货给卖家， 2 平台发货给买家
+
     public Integer getId() {
 		return id;
 	}
@@ -167,23 +172,12 @@ public class BuyerOrder implements Serializable {
 		this.attributes = attributes;
 	}
 
-	@Override
-    public String toString() {
-        return "BuyerOrder{" +
-                "id=" + id +
-                ", uid='" + uid + '\'' +
-                ", orderCode='" + orderCode + '\'' +
-                ", sellerUid='" + sellerUid + '\'' +
-                ", clientType=" + clientType +
-                ", payment=" + payment +
-                ", paymentType=" + paymentType +
-                ", isCancel=" + isCancel +
-                ", amount=" + amount +
-                ", shipFee=" + shipFee +
-                ", status=" + status +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                ", channelNo=" + channelNo +
-                '}';
-    }
+	public Integer getPlatformDeliveryStatus() {
+		return platformDeliveryStatus;
+	}
+
+	public void setPlatformDeliveryStatus(Integer platformDeliveryStatus) {
+		this.platformDeliveryStatus = platformDeliveryStatus;
+	}
+
 }

@@ -17,11 +17,12 @@
       <result column="update_time" property="updateTime" jdbcType="INTEGER" />
       <result column="channel_no" property="channelNo" jdbcType="VARCHAR" />
       <result column="attributes" property="attributes" jdbcType="INTEGER" />
+      <result column="platform_delivery_status" jdbcType="INTEGER" property="platformDeliveryStatus" />
     </resultMap>
     
     <sql id="Base_Column_List">
         id, uid, order_code, seller_uid, client_type, payment, payment_type, is_cancel,
-        amount, ship_fee, status, create_time, update_time, channel_no, attributes
+        amount, ship_fee, status, create_time, update_time, channel_no, attributes ,platform_delivery_status
     </sql>
 
     <select id="selectByOrderCode" resultMap="BaseResultMap">
@@ -66,6 +67,7 @@
         </if>
         <!-- 平台物流是否存在 -->
         <if test="platformExpressInfoFlag != null and platformExpressInfoFlag != '' ">
+            <!--
             and
             <if test="platformExpressInfoFlag == 'haveNotExpress'">
                 NOT
@@ -73,6 +75,13 @@
             exists (
             select tmp.id from express_record tmp where a.order_code = tmp.order_code and tmp.express_type in (2,3,4)
             )
+            -->
+            <if test="platformExpressInfoFlag == 'haveNotExpress'">
+                and a.platform_delivery_status = 0
+            </if>
+            <if test="platformExpressInfoFlag == 'haveExpress'">
+                and a.platform_delivery_status in (1,2)
+            </if>
         </if>
     </select>
     
@@ -142,13 +151,19 @@
      </if>
     <!-- 平台物流是否存在 -->
      <if test="buyerOrderReq.platformExpressInfoFlag != null and buyerOrderReq.platformExpressInfoFlag != '' ">
-         and
+         <!--and
          <if test="buyerOrderReq.platformExpressInfoFlag == 'haveNotExpress'">
              NOT
          </if>
          exists (
          select tmp.id from express_record tmp where a.order_code = tmp.order_code and tmp.express_type in (2,3,4)
-         )
+         )-->
+         <if test="buyerOrderReq.platformExpressInfoFlag == 'haveNotExpress'">
+             and a.platform_delivery_status = 0
+         </if>
+         <if test="buyerOrderReq.platformExpressInfoFlag == 'haveExpress'">
+             and a.platform_delivery_status in (1,2)
+         </if>
      </if>
   </sql>