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

application/controllers/Common.php

@@ -58,6 +58,10 @@ class CommonController extends \Our\Controller_AbstractIndex{
     }
 
 
+    public function getSettingAction(){
+        $setting = \Business\Common\SettingServiceModel::getInstance()->getSetting();
+        $this->success($setting);
+    }
 
     public function getProblemListAction(){
         $commonProbleService = \Business\Common\CommonProblemServiceModel::getInstance();

application/library/Our/Common.php

@@ -220,7 +220,7 @@ class Common
             return false;
         }
 
-        if( !preg_match('/^1[34578]\d{9}$/', $phone) ){
+        if( !preg_match('/^1[345789]\d{9}$/', $phone) ){
             return false;
         }
 

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/Cart/CartService.php

@@ -826,7 +826,7 @@ class CartServiceModel extends \Business\AbstractModel{
                 $delivery['deliveryFee'] = $deliveryFee;
                 $deliverySettings[]= $delivery;
             }
-            if($deliverySetting['buyerDistribution']=\Our\ApiConst::one){
+            if($deliverySetting['buyerDistribution']==\Our\ApiConst::one){
                 $deliveryFee = \Our\ApiConst::zero;//到店自提
                 $delivery = array();
                 $delivery['name'] = \Our\DescribeConst::deliveryNameBuyer;

application/models/Business/Common/SettingService.php

@@ -20,6 +20,19 @@ class SettingServiceModel extends \Business\AbstractModel{
         $phone = $settingDAO->getListCache(array('qm_service_phone'))['qm_service_phone'];
         return array('servicePhone'=>$phone);
     }
+
+    public function getSetting(){
+        $settingDAO = \DAO\SettingModel::getInstance();
+        $setting = $settingDAO->getListCache(array('unpayed_order_close_minutes','unreceived_order_close_minutes'));
+        $return = array();
+        if($setting['unpayed_order_close_minutes']){
+            $return['unpayedOrderColseTime'] = (int)$setting['unpayed_order_close_minutes'];
+        }
+        if($setting['unreceived_order_close_minutes']){
+            $return['unreceivedOrderColseTime'] = (int)$setting['unreceived_order_close_minutes'];
+        }
+        return $return;
+    }
     private static $_instance = null;
 
     /**

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']);
@@ -118,7 +118,7 @@ class CouponServiceModel extends \Business\AbstractModel{
                 $whereSql = ' coupon_state ='.\Our\ApiConst::couponUnused.' and member_id ='.$memberId.'  and out_time > '.time();
                 $memberCoupons = $memberCouponDao->getList($whereSql);
             }else{//不允许领用多张的优惠券
-                $memberCoupons = \Our\RedisHelper::cachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array(array('coupon_id'=>$where['couponId'],'member_id'=>$memberId)),\Our\ApiConst::oneHour);
+                $memberCoupons = \Our\RedisHelper::cachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array(array('coupon_id'=>$where['couponId'],'member_id'=>$memberId)),\Our\ApiConst::oneHour,array($where['couponId']));
             }
             if($memberCoupons&&count($memberCoupons)>0){
                 $result['isGet'] = \Our\ApiConst::one;
@@ -167,6 +167,8 @@ class CouponServiceModel extends \Business\AbstractModel{
         return true;
     }
 
+
+
     public function receiveCouponBatch($coupons,$memberId,$orderId=\Our\ApiConst::zero){
         $dbName = \Our\DbNameConst::masterDBConnectName;
         $couponDao = \DAO\Coupon\CouponModel::getInstance($dbName);
@@ -256,7 +258,7 @@ class CouponServiceModel extends \Business\AbstractModel{
     public function getStorePromotionCouponTitles($where){
         $this->validCouponStore($where);
         $couponDao = \DAO\Coupon\CouponModel::getInstance();
-        $couponTitles = \Our\RedisHelper::cachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$couponDao, 'getStorePromotionCouponList'),array($where['storeId']),\Our\ApiConst::oneHour);
+        $couponTitles = \Our\RedisHelper::cachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$couponDao, 'getStorePromotionCouponList'),array($where['storeId']),\Our\ApiConst::oneHour,array($where['storeId']));
         return $couponTitles;
     }
 
@@ -266,7 +268,7 @@ class CouponServiceModel extends \Business\AbstractModel{
     public function getStoreCoupons($where,$memberId = null){
         $couponDao = \DAO\Coupon\CouponModel::getInstance();
         $couponDao->validStoreCouponParam($where);
-        $couponList = \Our\RedisHelper::cachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$this, 'getStoreCouponsById'),array($where['storeId'],$memberId),\Our\ApiConst::oneHour);
+        $couponList = \Our\RedisHelper::cachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$this, 'getStoreCouponsById'),array($where['storeId'],$memberId),\Our\ApiConst::oneHour,array($where['storeId']));
         if($couponList){
             $couponList = array_values($couponList);
         }
@@ -277,7 +279,7 @@ class CouponServiceModel extends \Business\AbstractModel{
         $this->validCouponStore($where);
         $couponDao = \DAO\Coupon\CouponModel::getInstance();
         $couponDao->validStoreCouponParam($where);
-        $couponList = \Our\RedisHelper::cachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$this, 'getStoreCouponsById'),array($where['storeId'],$memberId,true),\Our\ApiConst::oneHour);
+        $couponList = \Our\RedisHelper::cachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$this, 'getStoreCouponsById'),array($where['storeId'],$memberId,true),\Our\ApiConst::oneHour,array($where['storeId']));
         if($couponList){
             $couponList = array_values($couponList);
             if(count($couponList)>=\Our\ApiConst::defaultCouponTitleLength){
@@ -356,6 +358,22 @@ class CouponServiceModel extends \Business\AbstractModel{
         return $couponList;
     }
 
+    /**
+     * 删除店铺优惠券缓存
+     * @param $storeId 店铺ID
+     * @param bool $couponId 指定优惠券ID
+     * @throws \Our\Exception
+     */
+    public function deleteCouponCache($storeId,$couponId=false){
+        $couponDao = \DAO\Coupon\CouponModel::getInstance();
+        $memberCouponDao = \DAO\Coupon\MemberCouponModel::getInstance();
+        if($couponId){
+            \Our\RedisHelper::delCachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array(),array($couponId));
+        }
+        \Our\RedisHelper::delCachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$couponDao, 'getStorePromotionCouponList'),array(),array($storeId));
+        \Our\RedisHelper::delCachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$this, 'getStoreCouponsById'),array(),array($storeId));
+    }
+
     /**
      * 类实例
      */

application/models/Business/Message/MessageService.php

@@ -186,13 +186,15 @@ class MessageServiceModel extends \Business\AbstractModel
         $returnMemeber['toUserName']=$toMember['name'];
         $returnMemeber['toType']=(int)$toMember['type'];
         $returnMemeber['toAvatar']=$toMember['avatar'];
-        $returnMemeber['fromId']=(int)$self['uid'];
+        $returnMemeber['fromId']=$memberId;
+        $returnMemeber['fromUserId']=(int)$self['uid'];
         $returnMemeber['fromUserName']=$self['name'];
         $returnMemeber['fromType']=(int)$self['type'];
         $returnMemeber['fromAvatar']=$self['avatar'];
         $memberMessages=$messageHistory->getListByMemberIdAndToIdAndToType($memberId,$selfType,$toId,$toType,$field,$pageIndex,$pageSize);
         foreach($memberMessages['list'] as &$val){
             $val['message']=unserialize($val['message']);
+            $val['message']['title']=!empty($val['message']['title'])?$val['message']['title']:'';
         }
         $memberMessages['list']=array_reverse($memberMessages['list']);
         $returnMemeber['messages']=$memberMessages;

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){

application/models/DAO/Coupon/Coupon.php

@@ -394,6 +394,7 @@ class CouponModel extends \DAO\AbstractModel {
         return  false;
     }
 
+
     /**
      * 满额赠礼品券
      * @param $coupon