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

application/models/Business/Store/ShopkeeperService.php

@@ -61,6 +61,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         //获取店铺数据统计
         //$storeStats = $storeStatisticsDao->find($condition);
         //获取店铺今日销售额和订单量
+       // $storeStats=$orderDao->getShopKeeperCountByStoreId($storeId);
         $storeStats = $orderDao->getShopKeeperCountByStoreIdCache($storeId);
         $storeFavariteCount=$favoritesStoreDao->getFavoritesCountByStoreIdCache($storeId);
         $data['storeId'] = $store['store_id'];

application/models/DAO/Order/Order.php

@@ -383,10 +383,18 @@ class OrderModel extends \DAO\AbstractModel
     public function getSumAmountCountByMemberAndStoreId($storeIds,$memberIds)
     {
         $this->setDb($this->dbName);
-        $where['store_id']=array('in',$storeIds);
-        $where['member_ids']=array('in',$memberIds);
-        $where['order_state']=array('notin','-1,0');
-        $res=$this->db->from($this->_tableName)->select(" buyer_id as buyerId,store_id as storeId,sum(order_amount) as orderTotal")->group('buyer_id')->group('store_id')->fetchAll();
+        if(is_array($storeIds)){
+            $storeIds=implode(',',$storeIds);
+        }
+        if(is_array($memberIds)){
+            $memberIds=implode(',',$memberIds);
+        }
+        $where=Common::format(" store_id in({0}) and buyer_id in({1}) and order_state not in({2})",$storeIds,$memberIds,'-1,0');
+//        $where['store_id']=array('in',$storeIds);
+//        $where['buyer_id']=array('in',$memberIds);
+//        $where['order_state']=array('notin','-1,0');
+//        $where=$this->db->getSqlWhereByArray($where);
+        $res=$this->db->from($this->_tableName)->where($where)->select(" buyer_id as buyerId,store_id as storeId,(SUM(order_amount)-SUM(refund_amount)) AS orderTotal")->group('buyer_id')->group('store_id')->fetchAll();
         return $res;
     }