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

application/models/Business/Cart/CartService.php

@@ -59,7 +59,7 @@ class CartServiceModel extends \Business\AbstractModel{
         $cartArray = $this->getFormattedCartDataForEdit($data,$cart,$memberId,$pBundlind,$validReturnData);
         $cartDao = \DAO\Cart\CartModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $result = $cartDao->update($cartArray['newCarts'][0],array('cart_id'=>$data['cartId']));
-        if(!$result){
+        if($result===false){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::editCartFailed);
         }
         $cartRedis = \Redis\Db7\CartRedisModel::getInstance();
@@ -117,7 +117,7 @@ class CartServiceModel extends \Business\AbstractModel{
         $cartIds = array_filter($cartIds);
         $sql = \Our\Common::format(' cart_id in({0}) and buyer_id={1}',implode(',',$cartIds),$memberId);
         $result = $cartDao->del($sql);
-        if(!$result){
+        if($result===false){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::editCartFailed);
         }
 
@@ -158,7 +158,7 @@ class CartServiceModel extends \Business\AbstractModel{
         $cart = $this->getOneCart($data,$memberId);
         $cartDao = \DAO\Cart\CartModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $result = $cartDao->del(array('cart_id'=>$data['cartId'],'buyer_id'=>$memberId));
-        if(!$result){
+        if($result===false){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::editCartFailed);
         }
         $memberStoreCartsKey = \Our\NameConst::memberStoreCartsPrefix.$memberId.\Our\NameConst::underline.$cart['store_id'];

application/models/Business/Goods/GoodsClassService.php

@@ -190,15 +190,16 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
 
         $storeDao = \DAO\StoreModel::getInstance();
         $signStoreClasses = $this->getSignClassesByCityCode($cityCode);
-        $storeIds = array_unique(array_column($signStoreClasses,'store_id'));
-        $tempStoreList = $storeDao->getNearbyStores($cityCode,$storeIds);
-        $storeList = array();
-        if($tempStoreList){
-            foreach($tempStoreList as $tempStore){
-                $storeList[$tempStore['store_id']] = $tempStore;
-            }
-        }
+
         if($signStoreClasses){
+            $storeIds = array_unique(array_column($signStoreClasses,'store_id'));
+            $tempStoreList = $storeDao->getNearbyStores($cityCode,$storeIds);
+            $storeList = array();
+            if($tempStoreList){
+                foreach($tempStoreList as $tempStore){
+                    $storeList[$tempStore['store_id']] = $tempStore;
+                }
+            }
             $returnClass = array();
             $newStoreIds = array();
             foreach($signStoreClasses as $signClass){

application/models/Business/Order/OrderService.php

@@ -977,11 +977,25 @@ class OrderServiceModel extends \Business\AbstractModel
                 $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($order['store_id']), \Our\ApiConst::oneHour);
                 $orderContent['storeName'] = $store['store_name'];
                 if ($order['payment_type'] == \Our\ApiConst::payOffline) {
-                    $orderContent['payway'] = $store['offline_payway'];
+                    $orderContent['imageUrls'] = array();
+                    if(\Our\Common::isSerialized($store['offline_payway'])){
+                        $paywayArray = unserialize($store['offline_payway']);
+                        $orderContent['payway'] = $paywayArray['payway'];
+                        if($paywayArray){
+                            foreach($paywayArray['images'] as $image){
+                                if($image){
+                                    $orderContent['imageUrls'][] = \Our\Common::getStaticFile($image, \Our\ImageConst::storeLabel);
+                                }
+                            }
+                        }
+                    }else{
+                        $orderContent['payway'] = $store['offline_payway'];
+                    }
                 } else if ($order['payment_type'] == \Our\ApiConst::payAog) {
                     $orderContent['payway'] = \Our\DescribeConst::afterPay;
                 }
                 $orderContent['orderAmount'] = $order['order_amount'];
+                $orderContent['dlyoPickupCode'] = substr($order['order_sn'], ApiConst::positionPickupCodeBegin);
                 $orderContents[]=$orderContent;
             }
             $orderIds[] = $order['order_id'];