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

application/models/Business/Order/OrderService.php

@@ -53,7 +53,7 @@ class OrderServiceModel extends \Business\AbstractModel
 
     private function getGoodsDetailField()
     {
-        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_group as goodsGroup';
+        return $this->orderGoodsField . ',goods_commonid as goodsCommonId,goods_commonid as goodsCommonid,goods_group as goodsGroup';
     }
 
     public function getOrderIndexWhere($memberId, $keyword, $pageIndex, $pageSize)
@@ -485,7 +485,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
 
         if (!empty($orders)) {
-            $orderIds = array_column($orders, 'orderId');
+//            $orderIds = array_column($orders, 'orderId');
 //            $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
 //            $storeCartsList=array();
 //            $storeCarts=array();
@@ -516,7 +516,7 @@ class OrderServiceModel extends \Business\AbstractModel
                             $this->changeOrderStateCancelUnconditional($order);
                         }
                     }
-                    $orderDao->deleteOrderCache($order['buyerId'],$order['orderId'],$order['storeId']);
+                    $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId']);
                 }
             $push = Push::getInstance();
             $push->pushOrderCloseMessage($orders);

application/models/Business/Order/RefundService.php

@@ -53,7 +53,7 @@ class RefundServiceModel extends \Business\AbstractModel
 
     private function getGoodsDetailField()
     {
-        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_spec as goodsSpec ';
+        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_commonid as goodsCommonId,goods_spec as goodsSpec ';
     }
 
     /**

application/models/Business/Store/ShopkeeperService.php

@@ -341,7 +341,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 
     private function getGoodsDetailField()
     {
-        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_spec as goodsSpec ';
+        return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_commonid as goodsCommonId,goods_goods_spec as goodsSpec ';
     }
 
     /**