pc

application/models/Business/Store/ShopkeeperService.php

@@ -479,6 +479,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
     public function insertStoreMemberStatics()
     {
         $orderGoodDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
+        $orderDao=\DAO\Order\OrderModel::getInstance();
         $storeMemberStatisticDao = \DAO\StoreMemberStatisticsModel::getInstance(DbNameConst::masterDBConnectName);
         $gmtCreate = file_get_contents($this->baseDir . PathConst::orderGoodsCreateTime);
         $gmtCreate = $gmtCreate ? $gmtCreate : ApiConst::zero;
@@ -489,6 +490,13 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
             $addDatas = array();
             $storeMemberStatisticData = $orderGoodDao->getMemberStoreStaticsByCreateTime($beginTime, $this->taskIndex, $this->taskSize);
             $storeMemberStatisticData = isset($storeMemberStatisticData['list']) ? $storeMemberStatisticData['list'] : false;
+            $orderIds=array_column($storeMemberStatisticData,'orderId');
+            array_unique($orderIds);
+            if(!empty($orderIds)){
+                $orders=$orderDao->getByOrderId($orderIds,'order_amount as orderAmount,order_id as orderId','orderId');
+            }else{
+                $orders=[];
+            }
             if ($storeMemberStatisticData) {
                 $this->taskIndex++;
                 foreach ($storeMemberStatisticData as $value) {
@@ -500,9 +508,10 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                         $addDatas[$value['buyerId'] . '-' . $value['storeId']]['orderGoodsCount'] = $value['goodsNum'];
                     }
                     if (isset($addDatas[$value['buyerId'] . '-' . $value['storeId']]['orderTotal'])) {
-                        $addDatas[$value['buyerId'] . '-' . $value['storeId']]['orderTotal'] += $value['goodsPrice'];
+                       // $addDatas[$value['buyerId'] . '-' . $value['storeId']]['orderTotal'] += $value['goodsPrice'];
+                        $addDatas[$value['buyerId'] . '-' . $value['storeId']]['orderTotal'] +=$orders[$value['orderId']]['orderAmount'];
                     } else {
-                        $addDatas[$value['buyerId'] . '-' . $value['storeId']]['orderTotal'] = $value['goodsPrice'];
+                        $addDatas[$value['buyerId'] . '-' . $value['storeId']]['orderTotal'] = $orders[$value['orderId']]['orderAmount'];
                     }
                 }
             }

application/models/DAO/Order/Order.php

@@ -28,7 +28,7 @@ class OrderModel extends \DAO\AbstractModel
      */
     protected $_tableName = 'han_order';
 
-    private $countField='(sum(order_amount)-sum(refund_amount)) as orderTotal,count(*) as orderCount';
+    private $countField = '(sum(order_amount)-sum(refund_amount)) as orderTotal,count(*) as orderCount';
     /**
      * 主键
      *
@@ -42,12 +42,16 @@ class OrderModel extends \DAO\AbstractModel
         //$this->setDb();
     }
 
-    public function getOrderDetailField(){
+    public function getOrderDetailField()
+    {
         return 'order_id as orderId,coupon_id as couponId,refund_amount as refundAmount,order_sn as orderSn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,payment_time as paymentTime,finnshed_time as finnshedTime,need_shipping_fee as needShippingFee,payment_code as paymentCode,buyer_id as buyerId,buyer_name as buyerName,refund_condition as refundCondition';
     }
-    public function getOrderShippingField(){
+
+    public function getOrderShippingField()
+    {
         return "order_id as orderId,order_sn as orderSn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,shipping_code as shippingCode";
     }
+
     public function getCount($where, $isArray = true)
     {
         $this->setDb();
@@ -69,29 +73,32 @@ class OrderModel extends \DAO\AbstractModel
         $this->setDb();
         return $this->db->select($field)->from($this->_tableName)->where($where)->group($group)->fetchAll();
     }
+
     public function getOrderCounts($where, $field)
     {
         $this->setDb();
         return $this->db->select($field)->from($this->_tableName)->where($where)->fetchOne();
     }
 
-    public function getShopKeeperCountByStoreId($storeId){
-        $begin=strtotime(date("Y-m-d"),time());
-        $end=TIMESTAMP;
-        $where=Common::format(" store_id={0}",$storeId);
-        $orderTotal=$this->getOrderCounts($where,$this->countField);
-        $where.=Common::format(" and add_time between {0} and {1}",$begin,$end);
-        $todayTotal=$this->getOrderCounts($where,$this->countField);
-        $total['todayOrderTotal']=isset($todayTotal['orderTotal'])?$todayTotal['orderTotal']:ApiConst::zero;
-        $total['todayOrderCount']=isset($todayTotal['orderCount'])?$todayTotal['orderCount']:ApiConst::zero;
-        $total['orderTotal']=isset($orderTotal['orderTotal'])?(int)$orderTotal['orderTotal']:ApiConst::zero;
-        $total['orderCount']=isset($orderTotal['orderCount'])?$orderTotal['orderCount']:ApiConst::zero;
+    public function getShopKeeperCountByStoreId($storeId)
+    {
+        $begin = strtotime(date("Y-m-d"), time());
+        $end = TIMESTAMP;
+        $where = Common::format(" store_id={0}", $storeId);
+        $orderTotal = $this->getOrderCounts($where, $this->countField);
+        $where .= Common::format(" and add_time between {0} and {1}", $begin, $end);
+        $todayTotal = $this->getOrderCounts($where, $this->countField);
+        $total['todayOrderTotal'] = isset($todayTotal['orderTotal']) ? $todayTotal['orderTotal'] : ApiConst::zero;
+        $total['todayOrderCount'] = isset($todayTotal['orderCount']) ? $todayTotal['orderCount'] : ApiConst::zero;
+        $total['orderTotal'] = isset($orderTotal['orderTotal']) ? (int)$orderTotal['orderTotal'] : ApiConst::zero;
+        $total['orderCount'] = isset($orderTotal['orderCount']) ? $orderTotal['orderCount'] : ApiConst::zero;
         return $total;
     }
 
 
-    public function getShopKeeperCountByStoreIdCache($storeId){
-        return \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getShopKeeperCountByStoreId'), array($storeId), \Our\ApiConst::oneDaySecond,array($storeId));
+    public function getShopKeeperCountByStoreIdCache($storeId)
+    {
+        return \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getShopKeeperCountByStoreId'), array($storeId), \Our\ApiConst::oneDaySecond, array($storeId));
     }
 
     /**
@@ -124,20 +131,23 @@ class OrderModel extends \DAO\AbstractModel
     //判断订单是否允许取消
     public function isAllowCancel($order)
     {
-            if ($order['order_state'] == ApiConst::orderStateWaitPay || $order['order_state'] == ApiConst::orderStateWaitConfirm || (($order['order_state'] == ApiConst::orderStateWaitSend || $order['order_state'] == ApiConst::orderStateWaitRecieve) && $order['is_receive_payment'] == ApiConst::noreceivePayment)) {
+        if ($order['order_state'] == ApiConst::orderStateWaitPay || $order['order_state'] == ApiConst::orderStateWaitConfirm || (($order['order_state'] == ApiConst::orderStateWaitSend || $order['order_state'] == ApiConst::orderStateWaitRecieve) && $order['is_receive_payment'] == ApiConst::noreceivePayment)) {
             return true;
         } else {
             return false;
         }
     }
+
     //列表转换
-    public function convertOrderList($list){
-        $convertList=array();
-        foreach($list as $order){
-            $convertList[$order['orderId']]=$order;
+    public function convertOrderList($list)
+    {
+        $convertList = array();
+        foreach ($list as $order) {
+            $convertList[$order['orderId']] = $order;
         }
         return $convertList;
     }
+
     //confirm
     public function isAllowConfirm($order)
     {
@@ -202,11 +212,13 @@ class OrderModel extends \DAO\AbstractModel
         return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
     }
 
-    public function insert($data){
+    public function insert($data)
+    {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $result = $this->db->insert($this->_tableName)->rows($data)->execute();
-        return $result ;
+        return $result;
     }
+
     /**
      * 删除订单
      * @param $data
@@ -220,18 +232,18 @@ class OrderModel extends \DAO\AbstractModel
         return $this->update($where, $data);
     }
 
-    public function updateStatusByOrderId($orderIds, $status,$isConfirm=false)
+    public function updateStatusByOrderId($orderIds, $status, $isConfirm = false)
     {
         $this->setDb($this->dbName);
-        if(is_array($orderIds)){
-            $where['order_id']=array('in',$orderIds);
-        }else{
+        if (is_array($orderIds)) {
+            $where['order_id'] = array('in', $orderIds);
+        } else {
             $where['order_id'] = $orderIds;
         }
         $where = $this->db->getSqlWhereByArray($where);
         $data['order_state'] = $status;
-        if($isConfirm){
-            $data['shipping_over']=ApiConst::shippingOver;
+        if ($isConfirm) {
+            $data['shipping_over'] = ApiConst::shippingOver;
         }
         return $this->update($where, $data);
     }
@@ -313,8 +325,8 @@ class OrderModel extends \DAO\AbstractModel
         $totalCount = $this->db->select($field)->from($this->_tableName)
             ->join('han_order_common', $this->_tableName . '.order_id = han_order_common.order_id', 'left')
             ->where($where)->fetchNum();
-        $returnData['orders']=$list;
-        $returnData['totalCount']=$totalCount;
+        $returnData['orders'] = $list;
+        $returnData['totalCount'] = $totalCount;
         return $returnData;
     }
 
@@ -329,6 +341,29 @@ class OrderModel extends \DAO\AbstractModel
         return $orders['list'] ? $orders : array();
     }
 
+    public function getByOrderId($orderId, $field, $key = false)
+    {
+        if (is_array($orderId)) {
+            $orderId = implode(',', $orderId);
+            $where = Common::format(" order_id in ({0})", $orderId);
+        } else {
+            $where['order_id'] = $orderId;
+        }
+        $res = $this->getAllByWhere($where, $field);
+        if (!empty($res)) {
+            $returnResult=$res;
+            if ($key) {
+                $returnResult = array();
+                foreach ($res as $re) {
+                    $returnResult[$re[$key]] = $re;
+                }
+            }
+            return $returnResult;
+        } else {
+            return [];
+        }
+    }
+
 //待收货获取订单状态信息
     public function getOrderStatusExtent($order)
     {
@@ -375,10 +410,10 @@ class OrderModel extends \DAO\AbstractModel
     }
 
 //待收货详情描述处理
-    public function getStatusDetailTextExtent($order,$type=ApiConst::buyerText)
+    public function getStatusDetailTextExtent($order, $type = ApiConst::buyerText)
     {
         $orderText = '';
-        if($type==ApiConst::buyerText){
+        if ($type == ApiConst::buyerText) {
             if ($order['orderState'] == ApiConst::orderStateWaitRecieve) {
                 $orderText = OrderConst::waitGetFromShop;//默认到店自取
                 if ($order['shippingType'] == ApiConst::express) {
@@ -389,7 +424,7 @@ class OrderModel extends \DAO\AbstractModel
                 }
             }
         }
-        if($type==ApiConst::storeText){
+        if ($type == ApiConst::storeText) {
             if ($order['orderState'] == ApiConst::orderStateWaitRecieve) {
                 $orderText = OrderConst::waitGetFromShop;//默认到店自取
                 if ($order['shippingType'] == ApiConst::express) {
@@ -403,8 +438,10 @@ class OrderModel extends \DAO\AbstractModel
 
         return $orderText;
     }
+
     //获得买家文案详情
-    private function getBuyerDetailText($order){
+    private function getBuyerDetailText($order)
+    {
         switch ($order['orderState']) {
             case ApiConst::orderStateCancel:
                 $statusText = OrderConst::orderCancel;
@@ -456,6 +493,7 @@ class OrderModel extends \DAO\AbstractModel
         }
         return $statusText;
     }
+
     //获取销售员订单详情描述
     public function getStatusSaleText($orderState)
     {
@@ -488,60 +526,62 @@ class OrderModel extends \DAO\AbstractModel
 
 
     //获取订单详情描述
-    public function getStatusDetailText($order,$type=ApiConst::buyerText)
+    public function getStatusDetailText($order, $type = ApiConst::buyerText)
     {
-            if(!in_array($type,array(ApiConst::buyerText,ApiConst::storeText,ApiConst::deliveryText))){
-                ErrorModel::throwException(CodeConfigModel::commonError);
-            }
-            if($type==ApiConst::buyerText){
-                return $this->getBuyerDetailText($order);
-            }
-            if($type==ApiConst::storeText){
+        if (!in_array($type, array(ApiConst::buyerText, ApiConst::storeText, ApiConst::deliveryText))) {
+            ErrorModel::throwException(CodeConfigModel::commonError);
+        }
+        if ($type == ApiConst::buyerText) {
+            return $this->getBuyerDetailText($order);
+        }
+        if ($type == ApiConst::storeText) {
 
-                return $this->getStoreDetailText($order);
-            }
+            return $this->getStoreDetailText($order);
+        }
     }
+
     //获得退款状态
-    public function getRefundText($order){
-        $refundStateName='';
-        if($order['paymentTime'] >ApiConst::zero ){
-            if($order['orderState']==ApiConst::orderStateWaitSend ){
-                $refundStateName=DescribeConst::refund;
+    public function getRefundText($order)
+    {
+        $refundStateName = '';
+        if ($order['paymentTime'] > ApiConst::zero) {
+            if ($order['orderState'] == ApiConst::orderStateWaitSend) {
+                $refundStateName = DescribeConst::refund;
             }
-            if($order['orderState']==ApiConst::orderStateWaitRecieve && $order['shippingType']==ApiConst::express ){
-                $refundStateName=DescribeConst::refundRetund;
+            if ($order['orderState'] == ApiConst::orderStateWaitRecieve && $order['shippingType'] == ApiConst::express) {
+                $refundStateName = DescribeConst::refundRetund;
             }
-            if($order['orderState']==ApiConst::orderStateWaitRecieve && $order['shippingType']==ApiConst::bySeller ){
-                $refundStateName=DescribeConst::refundRetund;
+            if ($order['orderState'] == ApiConst::orderStateWaitRecieve && $order['shippingType'] == ApiConst::bySeller) {
+                $refundStateName = DescribeConst::refundRetund;
             }
-            if($order['orderState']==ApiConst::orderStateWaitRecieve && $order['shippingType']==ApiConst::bySelf ){
-                $refundStateName=DescribeConst::refund;
+            if ($order['orderState'] == ApiConst::orderStateWaitRecieve && $order['shippingType'] == ApiConst::bySelf) {
+                $refundStateName = DescribeConst::refund;
             }
         }
-        if($order['paymentTime'] ==ApiConst::zero ){
-            if($order['orderState']==ApiConst::orderStateWaitRecieve  && $order['shippingType']==ApiConst::express){
-                $refundStateName=DescribeConst::refundRetund;
+        if ($order['paymentTime'] == ApiConst::zero) {
+            if ($order['orderState'] == ApiConst::orderStateWaitRecieve && $order['shippingType'] == ApiConst::express) {
+                $refundStateName = DescribeConst::refundRetund;
             }
         }
-        $diff=TIMESTAMP-$order['finnshedTime'];
-        if($order['orderState']==ApiConst::orderStateComplete &&$diff<ApiConst::oneDaySecond ){
-            $refundStateName=='退货';
+        $diff = TIMESTAMP - $order['finnshedTime'];
+        if ($order['orderState'] == ApiConst::orderStateComplete && $diff < ApiConst::oneDaySecond) {
+            $refundStateName == '退货';
         }
         return $refundStateName;
 
     }
 
-    public function selectedTypeId($order){
-        $refundStateName=$this->getRefundText($order);
-        $selectedRefundId=ApiConst::refundTypeMoney;
-        if($refundStateName==DescribeConst::refundRetund){
-            $selectedRefundId=ApiConst::refundTypeGoods;
+    public function selectedTypeId($order)
+    {
+        $refundStateName = $this->getRefundText($order);
+        $selectedRefundId = ApiConst::refundTypeMoney;
+        if ($refundStateName == DescribeConst::refundRetund) {
+            $selectedRefundId = ApiConst::refundTypeGoods;
         }
         return $selectedRefundId;
     }
 
 
-
     public function getText($order, $textType = ApiConst::orderListDescribe)
     {
         $text = '';
@@ -719,11 +759,13 @@ class OrderModel extends \DAO\AbstractModel
     {
         return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'findByOrderId'), array($orderId));
     }
+
     //删除订单列表缓存
     public function deleteGetShopKeeperCountByStoreId($storeId)
     {
         return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getShopKeeperCountByStoreId'), array(), array($storeId));
     }
+
     //删除订单列表缓存
     public function deleteGetListByMemberId($memberId)
     {
@@ -731,37 +773,38 @@ class OrderModel extends \DAO\AbstractModel
     }
 
     //删除订单缓存
-    public function deleteOrderCache($memberId, $orderId=false,$stroeId=false,$deleteGetShopKeeperCountByStoreId=false,$deleteGetFavoritesCountByStoreId=false)
+    public function deleteOrderCache($memberId, $orderId = false, $stroeId = false, $deleteGetShopKeeperCountByStoreId = false, $deleteGetFavoritesCountByStoreId = false)
     {
-        if(!empty($memberId)){
+        if (!empty($memberId)) {
             $this->deleteGetListByMemberId($memberId);
         }
-        if(!empty($orderId)){
+        if (!empty($orderId)) {
             $this->deleteFindByOrderIdCache($orderId);
-            $orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
-            $orderGoodsDao->deleteOrderGoodsCache($memberId,$orderId);
+            $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
+            $orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId);
             \DAO\MemberModel::getInstance()->deleteTotalCache($memberId);
         }
-        if(!empty($stroeId)){
-            if($deleteGetShopKeeperCountByStoreId){
+        if (!empty($stroeId)) {
+            if ($deleteGetShopKeeperCountByStoreId) {
                 $this->deleteGetShopKeeperCountByStoreId($stroeId);
             }
-            if($deleteGetFavoritesCountByStoreId){
-                $favoritesStoreDao=\DAO\FavoritesStoreModel::getInstance();
+            if ($deleteGetFavoritesCountByStoreId) {
+                $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
                 $favoritesStoreDao->deleteGetFavoritesCountByStoreId($stroeId);
             }
         }
 
     }
-         //任务脚本方法
-    public function getOrdersByOrderState($orderState, $timeField = 'add_time', $timeLimit = ApiConst::orderStateWaitConfirmBeyond, $field = '*',$shippingTypes=false)
+
+    //任务脚本方法
+    public function getOrdersByOrderState($orderState, $timeField = 'add_time', $timeLimit = ApiConst::orderStateWaitConfirmBeyond, $field = '*', $shippingTypes = false)
     {
         $this->setDb($this->dbName);
         $where['order_state'] = $orderState;
         $limit = TIMESTAMP - $timeLimit;
         $where[$timeField] = array('lt', $limit);
-        if($shippingTypes){
-            $where['shipping_type']=array('in',$shippingTypes);
+        if ($shippingTypes) {
+            $where['shipping_type'] = array('in', $shippingTypes);
         }
         $where = $this->db->getSqlWhereByArray($where);
         $list = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
@@ -769,27 +812,25 @@ class OrderModel extends \DAO\AbstractModel
     }
 
     //任务脚本方法
-    public function getRecieveOrders($orderState,$addTime,$pageIndex,$pageSize,$timeField='add_time')
+    public function getRecieveOrders($orderState, $addTime, $pageIndex, $pageSize, $timeField = 'add_time')
     {
         $this->setDb($this->dbName);
         $where['order_state'] = ApiConst::orderStateWaitConfirm;
-        $where=Common::format(' order_state={0} and {1}>={2} and {1}<{3}',$orderState,$timeField,$addTime,TIMESTAMP);
-        $list=$this->lists($where,array('add_time'=>'asc'),$this->getOrderDetailField(),$pageIndex,$pageSize);
+        $where = Common::format(' order_state={0} and {1}>={2} and {1}<{3}', $orderState, $timeField, $addTime, TIMESTAMP);
+        $list = $this->lists($where, array('add_time' => 'asc'), $this->getOrderDetailField(), $pageIndex, $pageSize);
         return $list;
     }
 
 
-
-
-     //任务脚本方法
-    public function updateOrdersByorderState($orderState,$toState, $timeField = 'add_time', $timeLimit = ApiConst::orderStateWaitConfirmBeyond)
+    //任务脚本方法
+    public function updateOrdersByorderState($orderState, $toState, $timeField = 'add_time', $timeLimit = ApiConst::orderStateWaitConfirmBeyond)
     {
         $this->setDb($this->dbName);
         $where['order_state'] = $orderState;
         $limit = TIMESTAMP - $timeLimit;
         $where[$timeField] = array('lt', $limit);
         $where = $this->db->getSqlWhereByArray($where);
-        return $this->db->update($this->_tableName)->where($where)->rows(array('order_state'=>$toState))->execute();
+        return $this->db->update($this->_tableName)->where($where)->rows(array('order_state' => $toState))->execute();
 
 
     }
@@ -800,25 +841,28 @@ class OrderModel extends \DAO\AbstractModel
      * @param string $field
      * @return mixed
      */
-    public function getListByCon($where,$field = \Our\NameConst::allField){
+    public function getListByCon($where, $field = \Our\NameConst::allField)
+    {
         $this->setDb($this->dbName);
-        if(is_array($where)){
-            $where=$this->db->getSqlWhereByArray($where);
+        if (is_array($where)) {
+            $where = $this->db->getSqlWhereByArray($where);
         }
         $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
         return $result;
     }
 
 
-    public function getShippingTypeSellerOrdersByOrders($orders){
-        $shippingTypeOrderIds=array();
-        foreach($orders as $order){
-            if($order['shippingType']==ApiConst::bySeller){
-                array_push($shippingTypeOrderIds,$order['orderId']);
+    public function getShippingTypeSellerOrdersByOrders($orders)
+    {
+        $shippingTypeOrderIds = array();
+        foreach ($orders as $order) {
+            if ($order['shippingType'] == ApiConst::bySeller) {
+                array_push($shippingTypeOrderIds, $order['orderId']);
             }
         }
         return $shippingTypeOrderIds;
     }
+
     public function getConvertOrder($order, $fields = array())
     {
         $convertResult = array();
@@ -855,6 +899,7 @@ class OrderModel extends \DAO\AbstractModel
             'deliveryTime' => 'delivery_time',
         );
     }
+
     public function getOrderAndOrderGoods($where, $field, $group = false, $limit = [], $order = [])
     {
         $this->setDb($this->dbName);
@@ -868,30 +913,36 @@ class OrderModel extends \DAO\AbstractModel
         eval($str);
         return $result;
     }
-    public function getAllByWhere($where,$field){
+
+    public function getAllByWhere($where, $field)
+    {
         $this->setDb($this->dbName);
-        if(is_array($where)){
-            $where=$this->db->getSqlWhereByArray($where);
+        if (is_array($where)) {
+            $where = $this->db->getSqlWhereByArray($where);
         }
-       return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
+        return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
     }
 
-    public function updateCancelUnpayedOrderTimeCache($time){
-        \Redis\Db5\OrderRedisModel::getInstance()->tableCacheSet(\Our\NameConst::cancelUnPayedOrderTimePrefix,$time);
+    public function updateCancelUnpayedOrderTimeCache($time)
+    {
+        \Redis\Db5\OrderRedisModel::getInstance()->tableCacheSet(\Our\NameConst::cancelUnPayedOrderTimePrefix, $time);
     }
 
 
-    public function getCancelUnpayedOrderTimeCache(){
-        $res=\Redis\Db5\OrderRedisModel::getInstance()->tableCacheGet(\Our\NameConst::cancelUnPayedOrderTimePrefix);
-        echo 'abcd'.json_encode($res);
-         return \Redis\Db5\OrderRedisModel::getInstance()->tableCacheGet(\Our\NameConst::cancelUnPayedOrderTimePrefix);
+    public function getCancelUnpayedOrderTimeCache()
+    {
+        $res = \Redis\Db5\OrderRedisModel::getInstance()->tableCacheGet(\Our\NameConst::cancelUnPayedOrderTimePrefix);
+        echo 'abcd' . json_encode($res);
+        return \Redis\Db5\OrderRedisModel::getInstance()->tableCacheGet(\Our\NameConst::cancelUnPayedOrderTimePrefix);
     }
 
-    public function updateCancelUnReceivedOrderTimeCache($time){
-        \Redis\Db5\OrderRedisModel::getInstance()->tableCacheSet(\Our\NameConst::cancelUnReceivedOrderTimePrefix,$time);
+    public function updateCancelUnReceivedOrderTimeCache($time)
+    {
+        \Redis\Db5\OrderRedisModel::getInstance()->tableCacheSet(\Our\NameConst::cancelUnReceivedOrderTimePrefix, $time);
     }
 
-    public function getCancelUnReceivedOrderTimeCache(){
+    public function getCancelUnReceivedOrderTimeCache()
+    {
         return \Redis\Db5\OrderRedisModel::getInstance()->tableCacheGet(\Our\NameConst::cancelUnReceivedOrderTimePrefix);
     }
 

application/models/DAO/Order/OrderGoods.php

@@ -17,7 +17,7 @@ class OrderGoodsModel extends \DAO\AbstractModel {
      * @var string
      */
     protected $_tableName = 'han_order_goods';
-    public $sumField="rec_id,store_id as storeId,buyer_id as buyerId,goods_num as goodsNum,goods_price as goodsPrice,gmt_create as gmtCreate";
+    public $sumField="rec_id,store_id as storeId,buyer_id as buyerId,goods_num as goodsNum,goods_price as goodsPrice,gmt_create as gmtCreate,order_id as orderId";
     public $groupField=array('buyer_id','store_id');
 
     public $orderGoodsField = "order_id as orderId,rec_id as recId,goods_id as goodsId,goods_name as goodsName,goods_price as goodsPrice,goods_num as goodsNum,goods_image as goodsImage,goods_pay_price as goodsPayPrice,sale_act_id as saleActId,sale_id as saleId,comment_state as commentState,is_refund as isRefund,goods_spec as goodsSpec,refund_state_name as refundStateName,refund_id as refundId";