冲突

application/library/Our/ImageConst.php

@@ -103,4 +103,6 @@ class ImageConst{
     const commentCircleStoreLabel = 48;
     const storeQualificationImg = 188;
     const storeCollectionImg = 112;
+    const homeIndexHotGoodsImageSize =250;
+
 }

application/models/Business/User/AddressService.php

@@ -35,6 +35,9 @@ class AddressServiceModel extends \Business\AbstractModel {
             $where['address_id'] = $addressId;
             $result = $addressDao->update($address,$where);
             \Our\RedisHelper::delCachedFunction(\Redis\Db8\AddressRedisModel::getInstance(),array(&$addressDao, 'findByWhereWithColumns'),array(),array($addressId));
+            if($result!==false){
+                $result = true;
+            }
         }else{
             $result = $addressDao->insert($address);
             $addressId = $result;

application/models/DAO/Goods/StoreTopSaleGoods.php

@@ -57,7 +57,7 @@ class StoreTopSaleGoodsModel extends \DAO\AbstractModel{
         }
         if ($orderGoods) {
             foreach($orderGoods as &$goods){
-                $goods['goodsImage'] = \Our\ImageUtil::getGoodsImgUrl($goods['goodsImage']);
+                $goods['goodsImage'] = \Our\ImageUtil::getGoodsImgUrl($goods['goodsImage'],\Our\ImageConst::homeIndexHotGoodsImageSize);
             }
             return $orderGoods;
         }