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

application/models/Business/Order/OrderService.php

@@ -66,12 +66,13 @@ class OrderServiceModel extends \Business\AbstractModel
 //        $query2[]= array('match' => array('goodsName' => $keyword));
 //        $res1['should']=$query2;
         //     $allQuery['bool']=$res1;
-        $query1 = array('match' => array('buyerId' => $memberId));
-
+        $query1[] = array('match' => array('buyerId' => $memberId));
+        $query1[] = array('match' => array('deleteState' => ApiConst::undeleteOrder));
         $res1['must'][0] = $query1;
         // $query2[]= array('match' => array('orderSn' => $keyword"));
         $query2[] = array('match' => array('storeName' => $keyword));
         $query2[] = array('match' => array('goodsName' => $keyword));
+        $query2[] = array('wildcard' => array('orderSn' => "*{$keyword}*"));
         $res1['must'][1]['bool']['should'] = $query2;
         $allQuery['bool'] = $res1;
         // echo json_encode($allQuery);exit;
@@ -84,9 +85,9 @@ class OrderServiceModel extends \Business\AbstractModel
         $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);
+            $where = Common::format(" order_id in({0})",  $orderIds);
+        }else{
+            $where=false;
         }
         return $where;
     }
@@ -105,6 +106,12 @@ class OrderServiceModel extends \Business\AbstractModel
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
         if ($keyWord !== false) {
             $where = $this->getOrderIndexWhere($memberId, $keyWord, $pageIndex, $pageSize);
+            if($where===false){
+                return Array(
+                    'orders'=>[],
+                    'totalCount'=>ApiConst::zero,
+                );
+            }
         } else {
             $where['delete_state'] = ApiConst::undeleteOrder;
 
@@ -118,6 +125,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $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/DAO/Store/MemberFavoritesStoreStoreMemberStatistics.php

@@ -21,7 +21,7 @@ class MemberFavoritesStoreStoreMemberStatisticsModel extends \DAO\AbstractModel
      */
     protected $_tableName = 'han_member-favorites_store-store_member_statistics';
 
-    public $field="member_id as memberId,member_mobile as memberMobile,is_backlist as isBacklist,fav_time as favTime,member_avatar as memberAvatar,member_name as memberName,order_total as orderTotal,order_goods_count as orderGoodsCount";
+    public $field="fav_type as favType,member_id as memberId,member_mobile as memberMobile,is_backlist as isBacklist,fav_time as favTime,member_avatar as memberAvatar,member_name as memberName,order_total as orderTotal,order_goods_count as orderGoodsCount";
     /**
      * 主键
      *
@@ -71,7 +71,12 @@ class MemberFavoritesStoreStoreMemberStatisticsModel extends \DAO\AbstractModel
         if(!empty($result['list'])){
             $result['list']=$this->getListNotNull($result['list']);
             foreach($result['list'] as $key=>$val){
-                $result['list'][$key]['isBacklist']=$val['isBacklist']?$val['isBacklist']:ApiConst::zero;
+                if($val['favType']==ApiConst::two){
+                    $result['list'][$key]['isBacklist']=ApiConst::one;
+                }else{
+                    $result['list'][$key]['isBacklist']=ApiConst::zero;
+                }
+               // $result['list'][$key]['isBacklist']=$val['isBacklist']?$val['isBacklist']:ApiConst::zero;
                 $result['list'][$key]['orderTotal']=$val['orderTotal']?$val['orderTotal']:ApiConst::zero;
                 $result['list'][$key]['orderGoodsCount']=$val['orderGoodsCount']?$val['orderGoodsCount']:ApiConst::zero;
             }