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

application/models/Business/Order/OrderService.php

@@ -1197,7 +1197,11 @@ class OrderServiceModel extends \Business\AbstractModel
     }
 
     public function updateGoodsStoregeByGoodsIds($storeId,$goodsid,$num=ApiConst::zero,$type=ApiConst::plus){
-        $where['goods_id']=$goodsid;
+        if(is_array($goodsid)){
+            $where['goods_id']=array('in',$goodsid);
+        }else{
+            $where['goods_id']=$goodsid;
+        }
         $where['store_id']=$storeId;
         $goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::masterDBConnectName);
         $goodses=$goodsDao->getList($where,$goodsDao->goodsDetailField);

application/models/DAO/Goods.php

@@ -74,8 +74,11 @@ class GoodsModel extends \DAO\AbstractModel {
 
     public function getList($where,$field){
         $this->setDb();
-       $res= $this->db->select($field)->from($this->_tableName)->where($where)->order('goods_storage','desc')->fetchAll();
-       return $res;
+        if(is_array($where)){
+            $where=$this->db->getSqlWhereByArray($where);
+        }
+        $res= $this->db->select($field)->from($this->_tableName)->where($where)->order('goods_storage','desc')->fetchAll();
+        return $res;
 
     }
     public function getListGroup($where,$field,$groupField){