order

application/library/Our/ApiConst.php

@@ -228,8 +228,9 @@ class ApiConst
     const bySelf = 0;
     const bySeller = 1;
     const express = 2;
-
+//待自提
     const oneHandred=100;
+    //待配送
     const oneHandredOne=101;
 
     //文案类型
@@ -410,6 +411,7 @@ class ApiConst
     const messageWaitReceive=101;
     //待配送
     const messageWaitSend=102;
+    //待自提
     const messageWaitGet=103;
     //售后待处理
     const messageRefundProccessing=104;

application/models/Business/Order/OrderService.php

@@ -123,7 +123,15 @@ class OrderServiceModel extends \Business\AbstractModel
                 if($orderState==ApiConst::orderStateComplete){
                     $where['evaluation_state']=ApiConst::waitEvaluation;
                 }
-                $where['order_state'] = array('in', explode(',', $orderState));
+                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));
             }
         }
 

application/models/Business/Order/RefundService.php

@@ -476,6 +476,7 @@ class RefundServiceModel extends \Business\AbstractModel
             $refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine);
             $orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state));
             $orderLogDao->addRefundOrderLog($orderInfo['orderId'],$refundArray['refund_type'],DescribeConst::buyer,$orderInfo['buyerName'],$orderInfo['orderState']);
+            \Our\RedisHelper::rpush('client_push',array('storeId'=>$refund['storeId'],'type'=>ApiConst::messageRefundProccessing,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('id'=>$refund['refundId'])));
             if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) {
                 $orderDao->editOrderLock($orderInfo['orderId']);
             }

application/models/Business/Store/ShopkeeperService.php

@@ -378,10 +378,15 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $allQuery['bool'] = array();
         if (!empty($keyword)) {
             $orderState = !empty($orderState) ? $orderState : false;
-            if (strlen($keyword) == ApiConst::four) {
+            if ($orderState == ApiConst::oneHandred ){
                 $where = 'han_order.store_id=' . $storeId;
+                $where .= ' and han_order.shipping_type=' . ApiConst::bySelf;
                 $where .= Common::format(" and SUBSTRING(order_sn, {0}, {1})='{2}'", ApiConst::positionPickupCodeBeginMysql, ApiConst::four, $keyword);
-            } else {
+            }else if($orderState== ApiConst::orderStateWaitPay){
+                $where = 'han_order.store_id=' . $storeId;
+                $where .= ' and han_order.order_state=' . $orderState;
+                $where .= Common::format(" and (order_sn ={0} or buyer_email={0})", $keyword);
+            }else{
                 $where = $this->getOrderIndexWhere($storeId, $keyword, $pageIndex, $pageSize, $orderState);
             }
         } else {

application/modules/Client/controllers/Shopkeeper.php

@@ -248,6 +248,14 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $this->success($res);
     }
 
+    /**
+     * 添加库存
+     * @author king
+     */
+    public function confirmReceiveAction(){
+
+    }
+
 }