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

application/models/Business/Coupon/CouponService.php

@@ -54,7 +54,7 @@ class CouponServiceModel extends \Business\AbstractModel{
                             $temp['title'] = \Our\DescribeConst::specialCoupon;
                             $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForCoupon,$orderAmount);
                         }else if($coupon['coupon_type'] == \Our\ApiConst::fullForGiftCouponType){
-                            $temp['title'] = \Our\DescribeConst::specialCoupon;
+                            $temp['title'] = \Our\DescribeConst::giftCoupon;
                             $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForGift,$orderAmount);
                         }
                         $temp['storeId'] = $coupon['store_id'];
@@ -108,7 +108,7 @@ class CouponServiceModel extends \Business\AbstractModel{
             $result['title'] = \Our\DescribeConst::specialCoupon;
             $result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForCoupon,$orderAmount);
         }else if($coupon['coupon_type'] == \Our\ApiConst::fullForGiftCouponType){
-            $result['title'] = \Our\DescribeConst::specialCoupon;
+            $result['title'] = \Our\DescribeConst::giftCoupon;
             $result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForGift,$orderAmount);
         }
         $result['useMemo'] = $coupon['use_memo'];

application/models/Business/Store/StoreService.php

@@ -203,7 +203,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         if($stcGoods){
             $goodsIds = array_column($stcGoods,'goods_common_id');
             $goodsCommonDAO = \DAO\GoodsCommonModel::getInstance();
-            if($activities === false){
+            if(empty($activities)){
                 $tempGoods = $goodsCommonDAO->getGoodsList(array('goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price as goodsPrice,goods_marketprice,goods_commonid');
             }else{
                 $tempGoods = $goodsCommonDAO->getListWithSale(array('han_goods_common.goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price,goods_marketprice,han_goods_common.goods_commonid,IFNULL(discount_price,han_goods_common.goods_price) AS goodsPrice',$activities);
@@ -743,7 +743,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         $commonDAO = \DAO\GoodsCommonModel::getInstance();
         //$activities = $this->isJoin($storeId,$memberId);
         $activities = \DAO\SaleMemberModel::getInstance()->isJoinStore($storeId,$memberId);
-        if($activities === false){
+        if(empty($activities)){
             $field = 'goods_commonid AS goodsCommonId,goods_name AS goodsName,goods_price as goodsPrice,goods_marketprice AS goodsMarketPrice,goods_image AS goodsImage,goods_jingle AS goodsCopywriting';
             $list = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsCommonRedisModel::getInstance(),array(&$commonDAO, 'getGoodsList'),array($where,$field,$limit,$order),\Our\ApiConst::oneDaySecond,array($storeId));
         }else{