Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/library/Our/ApiConst.php

@@ -147,7 +147,9 @@ class ApiConst
     const orderStateWaitPay = 10;//待付款
     const orderStateWaitConfirm = 20;//待接单
     const orderStateWaitSend = 25;//待发货
+    const orderStateWaitSendOne = 26;//待发货
     const orderStateWaitRecieve = 30;//待收货
+    const orderStateWaitRecieveOne = 31;//待收货
     const orderStateComplete = 40;//已完成
     const orderStateClose = -1;//关闭定单
     const receivePayment = 1;//商家收到货款了

application/library/Our/OrderConst.php

@@ -13,7 +13,7 @@ class OrderConst {
     const waitRecieve="待收货";
     const waitPay="待付款";
     const waitYouPay="等待您付款";
-    const waitSend="待发货";
+    const waitSend="配送中";
     const waitSellerSend="等待卖家发货";
     const sellerSended="商家已发货";
     const waitGetFromShop="待到店自取";

application/models/Business/Order/OrderService.php

@@ -123,15 +123,15 @@ class OrderServiceModel extends \Business\AbstractModel
                 if($orderState==ApiConst::orderStateComplete){
                     $where['evaluation_state']=ApiConst::waitEvaluation;
                 }
-//                if($orderState==ApiConst::orderStateWaitRecieve){
-//                    $where['shipping_type']=array('eq',ApiConst::bySeller);
-//                    $where['order_state'] =array('in',array(ApiConst::orderStateWaitSend,ApiConst::orderStateWaitRecieve));
-//                }
-//                if($orderState==ApiConst::orderStateWaitSend){
-//                    $where['shipping_type']=array('eq',ApiConst::bySelf);
-//                    $where['order_state']=array('eq',ApiConst::orderStateWaitRecieve);
-//                }
-                $where['order_state'] = array('in', explode(',', $orderState));
+                if($orderState==ApiConst::orderStateWaitRecieveOne){
+                    $where['shipping_type']=array('eq',ApiConst::bySeller);
+                    $where['order_state'] =array('in',array(ApiConst::orderStateWaitSend,ApiConst::orderStateWaitRecieve));
+                }
+                if($orderState==ApiConst::orderStateWaitSendOne){
+                    $where['shipping_type']=array('eq',ApiConst::bySelf);
+                    $where['order_state']=array('eq',ApiConst::orderStateWaitRecieve);
+                }
+              //  $where['order_state'] = array('in', explode(',', $orderState));
             }
         }
 

application/models/DAO/Order/Order.php

@@ -436,9 +436,9 @@ class OrderModel extends \DAO\AbstractModel
         $orderText = '';
         if ($order['orderState'] == ApiConst::orderStateWaitRecieve) {
             $orderText = OrderConst::getOnShop;//默认到店自取
-            if ($order['shippingType'] == ApiConst::express) {
-                $orderText = OrderConst::waitRecieve;
-            }
+//            if ($order['shippingType'] == ApiConst::express) {
+//                $orderText = OrderConst::waitRecieve;
+//            }
             if ($order['shippingType'] == ApiConst::bySeller) {
                 $orderText = OrderConst::sendding;
             }