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

application/library/Our/ImageUtil.php

@@ -114,18 +114,22 @@ class ImageUtil {
      * @return mixed|string 返回图片路径
      */
     public static function getGoodsImgUrl($goodsImg,$type=240){
-        if(!in_array($type,\Our\ArrayConst::goodsImageExt)){
-            $type = 240;
-        }
+
+//        if(!in_array($type,\Our\ArrayConst::goodsImageExt)){
+//            $type = 240;
+//        }
         if (empty($goodsImg)) {
             $directory =\Our\ImageConst::defaultPath;
-            $goodsImg = str_ireplace('.', '_' . $type . '.', 'default_goods_image.gif');
+            //$goodsImg = str_ireplace('.', '_' . $type . '.', 'default_goods_image.gif');
+            $goodsImg .= 'default_goods_image.gif';
         }else{
             $storeId = substr ( $goodsImg, 0, strpos ( $goodsImg, '_' ) );
             $directory = \Our\ImageConst::goods.$storeId.\Our\NameConst::slash;
-            $goodsImg = str_ireplace('.', '_' . $type . '.', $goodsImg);
+            //$goodsImg = str_ireplace('.', '_' . $type . '.', $goodsImg);
+            //$goodsImg .= '?x-oss-process=image/resize,m_pad,h_226,w_334';
         }
         $goodsImg =  \Our\Common::getStaticFile($goodsImg,$directory);
+        $goodsImg .= '?x-oss-process=image/resize,m_fixed,h_226,w_334';
         return $goodsImg;
     }
 

application/models/Business/Coupon/CouponService.php

@@ -90,7 +90,7 @@ class CouponServiceModel extends \Business\AbstractModel{
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyCouponId);
         }
         $coupon = $couponDao->findById($where['couponId']);
-        if(!$coupon){
+        if(!$coupon || $coupon['is_del'] == 1 || time() > $coupon['end_time'] || time() < $coupon['start_time']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::couponNotExist);
         }
         $orderAmount = intval($coupon['order_amount']);

application/models/Business/Store/StoreService.php

@@ -203,8 +203,10 @@ class StoreServiceModel extends \Business\AbstractModel{
 
         $storeClassDAO = \DAO\StoreGoodsClassModel::getInstance();
         $tempStcs = $storeClassDAO->getList(array('store_id'=>$storeId),'stc_id,stc_name');
-        $storeClassGoodsDao = \DAO\StoreGoodsClassGoodsModel::getInstance();
-        $stcGoods = $storeClassGoodsDao->getList(array('store_id'=>$storeId),'stc_id,goods_common_id');
+        if($tempStcs) {
+            $storeClassGoodsDao = \DAO\StoreGoodsClassGoodsModel::getInstance();
+            $stcGoods = $storeClassGoodsDao->getList('stc_id in('.implode(',',array_column($tempStcs,'stc_id')).')','stc_id,goods_common_id');
+        }
         $recommendGoods = [];
         if($stcGoods){
             $goodsIds = array_column($stcGoods,'goods_common_id');

application/models/Business/User/MemberCenterService.php

@@ -35,7 +35,7 @@ class MemberCenterServiceModel extends \Business\AbstractModel
         //$sale_act = \Our\RedisHelper::cachedFunction(\Redis\Db1\SaleRedisModel::getInstance(),array(&$saleInstance, 'getOne'),array(array('member_id'=>$memberId,'is_closing'=>0),'sale_act_id'),0,array($memberId));
         $sale_act = $saleInstance->getOneByMIdCache($memberId);
         $sale_act ? $memberCenter['isSalesman'] = 1 : $memberCenter['isSalesman'] = 0;
-
+        $memberCenter['memberMobile'] = \DAO\MemberModel::getInstance()->getInfo($memberId)['memberMobile'];
         return $memberCenter;
     }
     public function getStatistics($memberId){