Merge branch 'master' into ccw

application/models/Business/Store/ShopkeeperService.php

@@ -352,7 +352,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         }
         $res1['must'][0] = $query1;
         $query2[] = array('match' => array('goodsName' => $keyword));
-        $query2[] = array('wildcard' => array('orderSn' => "*{$keyword}*"));
+        $query2[] = array('match' => array('orderSn' => "{$keyword}"));
+        //$query2[] = array('wildcard' => array('orderSn' => "*{$keyword}*"));
         $res1['must'][1]['bool']['should'] = $query2;
         $allQuery['bool'] = $res1;
         $elasticTool = \Elastics\ElasticsToolModel::getInstance(NameConst::ordersIndex);

public/test.php

 <?php
+echo 1;exit;
 echo json_encode($_SERVER);exit;
 $res=file_exists('/www/web/testadmin_shenbd_com/public_html/data/upload/mall/avatar/member_avatar_26.jpg');
 var_dump($res);