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

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/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/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/DAO/Order/Order.php

@@ -838,20 +838,20 @@ class OrderModel extends \DAO\AbstractModel
     }
 
     public function updateCancelUnpayedOrderTimeCache($time){
-        \Redis\Db5\OrderRedisModel::getInstance()->update(\Our\NameConst::cancelUnPayedOrderTimePrefix,$time);
+        \Redis\Db5\OrderRedisModel::getInstance()->tableCacheSet(\Our\NameConst::cancelUnPayedOrderTimePrefix,$time);
     }
 
 
     public function getCancelUnpayedOrderTimeCache(){
-        \Redis\Db5\OrderRedisModel::getInstance()->tableCacheGet(\Our\NameConst::cancelUnPayedOrderTimePrefix);
+         return \Redis\Db5\OrderRedisModel::getInstance()->tableCacheGet(\Our\NameConst::cancelUnPayedOrderTimePrefix);
     }
 
     public function updateCancelUnReceivedOrderTimeCache($time){
-        \Redis\Db5\OrderRedisModel::getInstance()->update(\Our\NameConst::cancelUnReceivedOrderTimePrefix,$time);
+        \Redis\Db5\OrderRedisModel::getInstance()->tableCacheSet(\Our\NameConst::cancelUnReceivedOrderTimePrefix,$time);
     }
 
     public function getCancelUnReceivedOrderTimeCache(){
-        \Redis\Db5\OrderRedisModel::getInstance()->tableCacheGet(\Our\NameConst::cancelUnReceivedOrderTimePrefix);
+        return \Redis\Db5\OrderRedisModel::getInstance()->tableCacheGet(\Our\NameConst::cancelUnReceivedOrderTimePrefix);
     }
 
     /**

scripts/crontab/push/bridge.php

@@ -19,8 +19,13 @@ $http->on('request', function ($request, $response) {
             $info=$respData['content'];
             $memberDao=$info['className']::getInstance(\Our\DbNameConst::masterDBConnectName);
             echo json_encode($info['params']);
+            if(empty($info['params'])){
+                $res=call_user_func_array(array($memberDao,$info['method']));
+            }else{
                 $res=call_user_func_array(array($memberDao,$info['method']),$info['params']);
-            $res=isset($res)?$res:true;
+            }
+
+            $res=(isset($res)&&!empty($res))?$res:false;
             unset($memberDao);
             if($res!==false){
                 echo 'success';