订单管理：添加查询，异常物流是否处理标志

@@ -113,6 +113,12 @@ public class BuyerOrderReq extends PageRequestBO{
 
 	private Integer clientType; //订单来源 1-PC，3-iphone, 4-android, 5-ipad, 6-h5, 7-miniapp
 
+	private Integer sellerDeliveryDealType; //在12==navStatus或者13==navStatus，生效，其余情况不生效
+
+	private Integer sellerDeliveryDeal;
+
+	private Integer sellerDeliveryDealAgain;
+
 	private Integer attributes; //订单类型 1-普通现货订单，2-线下店订单，3-急速发货订单，4-普通预售
 
 	private String area;  // 四级地址

@@ -128,6 +128,12 @@
      <if test="buyerOrderReq.sellerDeliveryStatus != null ">
          and a.seller_delivery_status = #{buyerOrderReq.sellerDeliveryStatus}
      </if>
+     <if test="buyerOrderReq.sellerDeliveryDeal != null ">
+         and a.seller_delivery_deal = #{buyerOrderReq.sellerDeliveryDeal}
+     </if>
+     <if test="buyerOrderReq.sellerDeliveryDealAgain != null ">
+         and a.seller_delivery_deal_again = #{buyerOrderReq.sellerDeliveryDealAgain}
+     </if>
      <if test="buyerOrderReq.currentSecondMinus24Hours != null ">
          and a.update_time &lt; #{buyerOrderReq.currentSecondMinus24Hours}
      </if>

@@ -2613,10 +2613,12 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 				req.setCurrentSecondMinus24Hours(currentSecondMinus24Hours);
 				req.setMaxCurrentSecondMinusHours(maxCurrentSecondMinusHours);
 				req.setSellerDeliveryStatus(0);
+				req.setSellerDeliveryDeal(req.getSellerDeliveryDealType());
 			}else if(13==req.getNavStatus()){
 				int currentSecondMinus24Hours = DateUtil.getCurrentTimeSeconds() - 48*60*60;
 				req.setCurrentSecondMinus24Hours(currentSecondMinus24Hours);
 				req.setSellerDeliveryStatus(0);
+				req.setSellerDeliveryDealAgain(req.getSellerDeliveryDealType());
 			}
     	}
 

@@ -111,6 +111,13 @@
                 <label>平台快递单号：</label>
                 <input id="platformWaybillCode" type="text" class="easyui-textbox" style="width:230px"/>
 
+                <label>&nbsp;&nbsp;&nbsp;物流异常处理：</label>
+                <select id="sellerDeliveryDealType" class="easyui-combobox" style="width:150px;" >
+                    <option value="">全部</option>
+                    <option value="0">未处理</option>
+                    <option value="1">已处理</option>
+                </select>
+
                 <br><br>
                 <label>订单来源：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
                 <select id="clientType" class="easyui-combobox" style="width:150px;" >
@@ -172,6 +179,7 @@ $(function() {
                 sellerUid: $("#sellerUid").val(),
                 platformWaybillCode : $("#platformWaybillCode").val(),
                 clientType : $("#clientType").myCombobox("getValue"),
+                sellerDeliveryDealType : $("#sellerDeliveryDealType").myCombobox("getValue"),
                 attributes : $("#attributes").myCombobox("getValue"),
                 buyerStartTime : new Date($('#buyerStartTime').datetimebox('getValue')).getTime(),
                 buyerEndTime : new Date($('#buyerEndTime').datetimebox('getValue')).getTime(),
@@ -189,6 +197,7 @@ $(function() {
         	$("#sellerWaybillCode").textbox('setValue','');
         	$("#status").combobox('setValue','');
             $("#channel").combobox('setValue','');
+            $("#sellerDeliveryDealType").combobox('setValue','');
         	$("#productId").textbox('setValue','');
         	$("#sku").textbox('setValue','');
         	$("#buyerMobile").textbox('setValue','');
@@ -422,9 +431,9 @@ function switchOrderStatus(navStatus){
     $("#attributes").combobox('setValue','');
     $("#buyerStartTime").datetimebox('setValue','');
     $("#buyerEndTime").datetimebox('setValue','');
-    /*$("#orderListTable").datagrid("load", {
-    	navStatus : navStatus
-    });*/
+    if(12!=navStatus&&13!=navStatus){
+        $("#sellerDeliveryDealType").combobox('setValue','');
+    }
     getOrderList();
 }