pc

application/controllers/Order.php

@@ -18,7 +18,8 @@ class OrderController extends \Our\Controller_AbstractApi {
         }else{
             $orderState=false;
         }
-        $orders=$orderService->getList($this->memberId,$pageIndex,$pageSize,$orderState);
+        $keyword=$this->req[\Our\NameConst::data]['keyword']?$this->req[\Our\NameConst::data]['keyword']:FAlSE;
+        $orders=$orderService->getList($this->memberId,$keyword,$pageIndex,$pageSize,$orderState);
         $this->success($orders);
 
     }

application/library/Our/ApiConst.php

@@ -360,6 +360,7 @@ class ApiConst
     const messageButtonIdOne = 1;
     const messageButtonIdTwo = 2;
     const commonProblemArticleClassId = 18;//常见问题对应文章分类ID
-
+    //订单列表索引 因子
+    const orderIndexRank=1000;
 
 }
\ No newline at end of file

application/library/Our/NameConst.php

@@ -12,6 +12,7 @@ class NameConst {
      * 登录session_key
      * @var string
      */
+    const ordersIndex='orders';
     const sessionKey = 'key';
     const data='data';
     const mobile='mobile';

application/models/Business/Order/OrderService.php

@@ -54,26 +54,61 @@ class OrderServiceModel extends \Business\AbstractModel
     {
         return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_group as goodsGroup';
     }
-
+    public function getOrderIndexWhere($memberId,$keyword,$pageIndex,$pageSize){
+//        $query1= array('match' => array('buyerId' => $memberId));
+//        $res1['must']=$query1;
+//       // $query2[]= array('match' => array('orderSn' => $keyword"));
+//        $query2[]= array('match' => array('storeName' => $keyword));
+//        $query2[]= array('match' => array('goodsName' => $keyword));
+//        $res1['should']=$query2;
+   //     $allQuery['bool']=$res1;
+        $query1= array('match' => array('buyerId' => $memberId));
+
+        $res1['must'][0]=$query1;
+        // $query2[]= array('match' => array('orderSn' => $keyword"));
+        $query2[]= array('match' => array('storeName' => $keyword));
+        $query2[]= array('match' => array('goodsName' => $keyword));
+        $res1['must'][1]['bool']['should']=$query2;
+        $allQuery['bool']=$res1;
+       // echo json_encode($allQuery);exit;
+       // echo json_encode($allQuery);exit;
+        //array_push($allQuery['bool'],$res2);
+        // echo json_encode($allQuery);exit;
+        //  echo json_encode($allQuery);exit;
+        $elasticTool=\Elastics\ElasticsToolModel::getInstance(NameConst::ordersIndex);
+        $res=$elasticTool->searchMatch($allQuery,$pageIndex,$pageSize);
+        $orderIdsField=array_column($res['list'],'orderId');
+        $orderIds=implode(',',$orderIdsField);
+        if($orderIds){
+            $where=Common::format(" han_order.buyer_id={0} and delete_state={1} and (order_id in({2}) or han_order.order_sn like '%{3}%')",$memberId,ApiConst::undeleteOrder,$orderIds,$keyword);
+        }else{
+            $where=Common::format(" han_order.buyer_id={0} and delete_state={1}  and han_order.order_sn like '%{2}%'",$memberId,ApiConst::undeleteOrder,$keyword);
+        }
+        return $where;
+    }
     /**
      * 订单,获得订单列表
      *
      * @date 2018-5-15
      * @author ccw
      */
-    public function getList($memberId, $pageIndex = ApiConst::pageIndex, $pageSize = ApiConst::pageSize, $orderState = false)
+    public function getList($memberId,$keyWord=false, $pageIndex = ApiConst::pageIndex, $pageSize = ApiConst::pageSize, $orderState = false)
     {
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
         $goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
-        $where['delete_state'] = ApiConst::undeleteOrder;
-        $where['buyer_id'] = $memberId;
-        //$where['lock_state'] = ApiConst::zero;
-        if ($orderState != false) {
-            $where['order_state'] = array('in', explode(',', $orderState));
+        if($keyWord!==false){
+            $where=$this->getOrderIndexWhere($memberId,$keyWord,$pageIndex,$pageSize);
+        }else{
+            $where['delete_state'] = ApiConst::undeleteOrder;
+            $where['buyer_id'] = $memberId;
+            //$where['lock_state'] = ApiConst::zero;
+
+            if ($orderState != false) {
+                $where['order_state'] = array('in', explode(',', $orderState));
+            }
         }
-
         //获得订单列表
         $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc')), \Our\ApiConst::oneDaySecond, array($memberId));
         if (!empty($orders['list'])) {

application/models/Elastics/ElasticsTool.php

@@ -157,7 +157,7 @@ class ElasticsToolModel
     }
 
     //一般传where就可以了，
-    public function searchMatch($where, $pageIndex = ApiConst::pageIndex, $pageSize = ApiConst::pageSize, $sort = array('_score' => array('order' => 'desc')))
+    public function searchMatch($where, $pageIndex = ApiConst::pageIndex, $pageSize = ApiConst::pageSize, $sort = array('addTime' => array('order' => 'desc')))
     {
         $searchParams['index'] = $this->dbName;
         $searchParams['type'] = $this->tbName;
@@ -165,8 +165,9 @@ class ElasticsToolModel
         $searchParams['from'] = $from;
         $searchParams['size'] = $pageSize;
         $searchParams['sort'] = $sort;
+        //must 是与 ，should是或
         $searchParams['body'] = array(
-            'query' => array('match' => $where),
+            'query' => $where,
         );
         $retDoc = $this->client->search($searchParams);
         if (!isset($retDoc['hits'])) {
@@ -259,14 +260,15 @@ class ElasticsToolModel
     }
 
 //插入多条 Document：
-    public function postBulkDoc($rows)
+    public function postBulkDoc($rows,$key='id')
     {
 
         foreach ($rows as $row) {
             $params['body'][] = [
                 'index' => [
                     '_index' => $this->dbName,
-                    '_type' => $this->tbName,
+                    '_type' => $row['type']?$row['type']:$this->tbName,
+                    '_id'=>$row[$key]
                 ]
             ];
             $params['body'][] = $row;
@@ -274,8 +276,7 @@ class ElasticsToolModel
         $res = $this->client->bulk($params);
         return $res;
     }
-
-    public function createIkField()
+    public function createIkField($indexFields)
     {
         $params = [
             'index' => $this->dbName, //索引名称
@@ -294,12 +295,7 @@ class ElasticsToolModel
                         'dynamic' => [   //  存储原始文档
                             'enabled' => 'true'
                         ],
-                        'properties' => [ //配置数据结构与类型
-                            'goodsName' => [ //字段1
-                                "type" => "string",
-                                "analyzer" => "ik_max_word"
-                            ],
-                        ]
+                        'properties' => $indexFields
                     ],
                 ],
             ]
@@ -308,6 +304,39 @@ class ElasticsToolModel
         return $res;
     }
 
+//    public function createIkField($indexFild)
+//    {
+//        $params = [
+//            'index' => $this->dbName, //索引名称
+//            'body' => [
+//                'settings' => [ //配置
+//                    'analysis' => array(
+//                        'analyzer' => array(
+//                            'ik' => [
+//                                'tokenizer' => 'ik_max_word',
+//                            ]
+//                        )
+//                    ),
+//                ],
+//                'mappings' => [  //映射
+//                    $this->tbName => [ //默认配置，每个类型缺省的配置使用默认配置
+//                        'dynamic' => [   //  存储原始文档
+//                            'enabled' => 'true'
+//                        ],
+//                        'properties' => [ //配置数据结构与类型
+//                            'goodsName' => [ //字段1
+//                                "type" => "string",
+//                                "analyzer" => "ik_max_word"
+//                            ],
+//                        ]
+//                    ],
+//                ],
+//            ]
+//        ];
+//        $res = $this->client->indices()->create($params);
+//        return $res;
+//    }
+
     //添加属性
     public function putMappings($column)
     {

public/test/order/getOrders.php

@@ -9,10 +9,9 @@
 </head>
 <body>
 <form action="/order/getOrders" method="post">
-
     用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
     订单状态id:<input name="data[orderState]" value=""/><br />
-
+    keyWord:<input name="data[keyword]" value=""/><br />
     <p id="img_area"></p>
     <input type="submit" value="提交">
 </form>

scripts/crontab/create/createIndexs.php

@@ -51,12 +51,12 @@ class cliShopkeeperOrders extends basecli
             echo "*** Debug mode ***\n";
         }
         // Step: 02 检查是否已有相同CLI在运行中
-        $lockDir = $this->_getBaseFileName('shopkeeper');
+        $lockDir = $this->_getBaseFileName('create');
         if (!$this->mkdirs($lockDir)) {
             echo '****create dir fail  ****';
             exit;
         }
-        $this->lockFileName = $lockDir . DS . 'orders.locks';
+        $this->lockFileName = $lockDir . DS . 'createIndex.locks';
         if (file_exists($this->lockFileName)) {
             $stat = stat($this->lockFileName);
             if ((TIMESTAMP - $stat['mtime']) > 1800) {

scripts/crontab/shopkeeper/orders.php

@@ -71,7 +71,7 @@ class cliShopkeeperOrders extends basecli
         $shopkeeperService = \Business\Store\ShopkeeperServiceModel::getInstance();
         $shopkeeperService->baseDir= \Our\Common::getConfig('out.config');
         try {
-            $shopkeeperService->createOrdersIndex();
+            $shopkeeperService->growOrdersIndex();
 
         } catch (\Exception $ex) {
             throw new \Exception($ex->getMessage(),$ex->getCode());