Merge branch 'test6.9.0' into test6.9.1

 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>
     
@@ -122,6 +131,9 @@
      <if test="buyerOrderReq.skup != null and buyerOrderReq.skup != 0 ">
          and c.id = #{buyerOrderReq.skup}
      </if>
+     <if test="buyerOrderReq.storageId != null and buyerOrderReq.storageId != 0 ">
+            and c.storage_id = #{buyerOrderReq.storageId}
+     </if>
      <if test="buyerOrderReq.depotNo != null">
          and c.depot_no = #{buyerOrderReq.depotNo}
      </if>
@@ -142,20 +154,26 @@
      </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>
     
     <select id="selectTotalByCondition" resultType="java.lang.Integer" parameterType="com.yoho.order.model.BuyerOrderReq">
         select count(a.id)   
         from buyer_order a 
-        <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null)">
+        <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null) or (buyerOrderReq.storageId != null)">
         LEFT JOIN buyer_order_goods b
         ON( b.order_code=a.order_code) 
         LEFT JOIN seller_order_goods c
@@ -176,7 +194,7 @@
     <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.order.model.BuyerOrderReq">
         select a.*
         from buyer_order a 
-        <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null)">
+        <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null) or (buyerOrderReq.storageId != null)">
         LEFT JOIN buyer_order_goods b
         ON( b.order_code=a.order_code) 
         LEFT JOIN seller_order_goods c

@@ -106,6 +106,6 @@
   </select>
 
   <update id="updateDeleteSuggestPrice" timeout="10">
-    UPDATE storage s set s.suggest_low_price = null , s.suggest_high_price = null WHERE s.suggest_high_price is not null AND NOT EXISTS (SELECT * FROM channel_sku_compare c where s.id = c.sku)
+    UPDATE storage s set s.suggest_low_price = null , s.suggest_high_price = null WHERE s.suggest_high_price > 0 AND NOT EXISTS (SELECT * FROM channel_sku_compare c where s.id = c.sku)
   </update>
 </mapper>
\ No newline at end of file

@@ -255,6 +255,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 		toBeSendOutList.add(Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal());
 		toBeSendOutList.add(Constant.CANCEL_MINI_FAULT_REJECT.getByteVal());
 		toBeSendOutList.add(Constant.CANCEL_MINI_FAULT_OUT_TIME_REJECT.getByteVal());
+		toBeSendOutList.add(Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal());
 
     	alreadyJudgedList.add(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal());
 		alreadyJudgedList.add(Constant.BUYER_ORDER_STATUS_FINISHED.getByteVal());
@@ -263,6 +264,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 		alreadyJudgedList.add(Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal());
 		alreadyJudgedList.add(Constant.CANCEL_MINI_FAULT_REJECT.getByteVal());
 		alreadyJudgedList.add(Constant.CANCEL_MINI_FAULT_OUT_TIME_REJECT.getByteVal());
+		alreadyJudgedList.add(Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal());
 
     	int toBeReceivedNum = buyerOrderMapper.selectCountByStatusAndDepotNo(toBeReceivedList, req.getDepotNo(),null);
     	//int toBeJudgedNum = buyerOrderMapper.selectCountByStatusAndDepotNo(toBeJudgedList, req.getDepotNo(),null);

@@ -140,6 +140,7 @@
                     <option value="20">已取消(质检不通过)</option>
                     <option value="21">已取消(瑕疵确认不通过)</option>
                     <option value="22">已取消(瑕疵确认超时)</option>
+                    <option value="23">已取消(无法鉴定)</option>
                 </select>
 
                 <br><br>
@@ -181,7 +182,7 @@
   const domain = document.location.href.indexOf('test3') > 0 ? 'http://java-ufo-platform.test3.ingress.dev.yohocorp.com' : '';
   const tab_status_platform_receive="2,31,32";
   const tab_status_platform_to_be_sending="3,33,34,13,17,20,21,22,23";
-  const tab_status_platform_finished="4,5,13,17,20,21,22";
+  const tab_status_platform_finished="4,5,13,17,20,21,22,23";
 $(function() {
 	//获取鉴定状态对应的记录数
 	getCountByJudgeStatus();

@@ -172,7 +172,8 @@ $(function() {
                 clientType : $("#clientType").myCombobox("getValue"),
                 attributes : $("#attributes").myCombobox("getValue"),
                 buyerStartTime : new Date($('#buyerStartTime').datetimebox('getValue')).getTime(),
-                buyerEndTime : new Date($('#buyerEndTime').datetimebox('getValue')).getTime()
+                buyerEndTime : new Date($('#buyerEndTime').datetimebox('getValue')).getTime(),
+                storageId: $("#sku").val()
             });
         }
     });