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

application/controllers/Message.php

@@ -129,9 +129,11 @@ class MessageController extends \Our\Controller_AbstractApi {
     }
     public function setAction(){
         $messageService = \Business\Message\MessageServiceModel::getInstance();
-        $type=$this->req['data']['type'];
-        if(!empty($type)){
-            $res=$messageService->set($this->memberId,$type);
+        $pushSet['canPush']=$this->req['data']['canPush'];
+        $pushSet['sound']=$this->req['data']['sound'];
+        $pushSet['vibrate']=$this->req['data']['vibrate'];
+        if(isset($pushSet['canPush'])&& isset($pushSet['sound']) && isset($pushSet['vibrate']) ){
+            $res=$messageService->set($this->memberId,$pushSet);
             if($res){
                 $this->success(\Our\DescribeConst::setMessageSuccess);
             }

application/models/Business/Goods/EvaluationService.php

@@ -12,7 +12,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
         $order = $this->_validate(intval($param['orderId']),$memberId);
         //获取订单商品
         $orderGoodsDAO =\DAO\Order\OrderGoodsModel::getInstance();
-        $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderGoodsRedisModel::getInstance(),array(&$orderGoodsDAO, 'getOrderGoodsList'),array(array('order_id'=>$order['order_id']),'rec_id,goods_id,goods_commonid,goods_name,goods_image,goods_pay_price,goods_num,goods_spec'),\Our\ApiConst::oneHour);
+        $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderGoodsRedisModel::getInstance(),array(&$orderGoodsDAO, 'getOrderGoodsList'),array(array('order_id'=>$order['order_id']),'rec_id,goods_id,goods_commonid,goods_name,goods_image,goods_pay_price,goods_num,goods_spec'),\Our\ApiConst::tenMinSecond,array($order['order_id']));
         if(!$orderGoods){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::orderError);
         }
@@ -45,7 +45,6 @@ class EvaluationServiceModel extends \Business\AbstractModel {
      */
     public function submit($data,$memberId){
         list($data, $order, $orderGoods) = $this->_submitValite($data,$memberId);
-        $log = \Our\Log::getInstance();
         foreach ($orderGoods as $v){
             $orderGoods[$v['goods_id']] = $v;
         }
@@ -205,7 +204,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
         //验证订单状态 是否待评价
         $orderInstance = \DAO\Order\OrderModel::getInstance();
         $orderInstance->setDb(\Our\DbNameConst::masterDBConnectName);
-        $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),array(&$orderInstance, 'find'),array(array('order_id'=>$orderId)),\Our\ApiConst::oneMinSecond,array($orderId));
+        $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),array(&$orderInstance, 'find'),array(array('order_id'=>$orderId)),\Our\ApiConst::tenMinSecond,array($orderId));
         if($order['evaluation_state'] != 0 || $order['order_state'] != 40 || $order['buyer_id'] != $memberId){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::orderError);
         }
@@ -218,19 +217,19 @@ class EvaluationServiceModel extends \Business\AbstractModel {
         $param['descCredit'] || \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyDescCredit);
         $param['deliveryCredit'] || \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyDeliveryCredit);
         $param['deliveryCredit'] || \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyServiceCredit);
-        $log = \Our\Log::getInstance();
-        $log->write(json_encode($param['goods']));
         if(!is_array($param['goods'])) {
             $param['goods'] = json_decode($param['goods'],true);
         }
-        $log->write(json_encode($param['goods']));
         foreach ($param['goods'] as $v){
             $v['goodsId'] || \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyGoodsId);
             $v['scores'] || \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyScores);
+            if(!empty($v['content']) && ( mb_strlen($v['content']) < 6 ||  mb_strlen($v['content']) > 500 )) {
+                \Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongEvaluation);
+            }
         }
         //获取订单商品
         $orderGoodsInstance = \DAO\Order\OrderGoodsModel::getInstance(\Our\DbNameConst::masterDBConnectName);
-        $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderGoodsRedisModel::getInstance(),array(&$orderGoodsInstance, 'getOrderGoodsList'),array(array('order_id'=>$order['order_id']),'rec_id,goods_id,goods_commonid,goods_name,goods_image,goods_pay_price,goods_num,goods_spec'),\Our\ApiConst::oneMinSecond,array($order['order_id']));
+        $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderGoodsRedisModel::getInstance(),array(&$orderGoodsInstance, 'getOrderGoodsList'),array(array('order_id'=>$order['order_id']),'rec_id,goods_id,goods_commonid,goods_name,goods_image,goods_pay_price,goods_num,goods_spec'),\Our\ApiConst::tenMinSecond,array($order['order_id']));
 //        $orderGoods = \DAO\OrderGoodsModel::getInstance()->getOrderGoodsList(array('order_id'=>$order['order_id']),'rec_id,goods_id,goods_name,goods_image,goods_pay_price,goods_num');
         if(!$orderGoods){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::orderError);

application/models/Business/Message/MessageService.php

@@ -445,9 +445,9 @@ class MessageServiceModel extends \Business\AbstractModel
             return false;
         }
     }
-    public function set($memberId,$type){
+    public function set($memberId,$pushData){
         $memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
-        if($memberDao->setIsWxsend($memberId,$type)!==false){
+        if($memberDao->setIsWxsend($memberId,$pushData)!==false){
             return true;
         }
         return false;

application/models/Business/Store/StoreService.php

@@ -48,6 +48,14 @@ class StoreServiceModel extends \Business\AbstractModel{
                         \Redis\Db4\SaleActivityRedisModel::getInstance()->tableDel('storeId:'.$storeId);
                     }
                 }
+                $storeMembers = array();
+                $storeMember = array();
+                $storeMember['store_id'] = $storeId;
+                $storeMember['member_id'] = $memberId;
+                $storeMember['fav_from'] = \Our\ApiConst::scanFavor;
+                $storeMembers[] = $storeMember;
+                $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
+                $result = $favoritesStoreDao->insertAll($storeMembers);
             }else{
                 $sess=\Yaf\Session::getInstance();
                 $scan_store_ids = $sess->get('scan_store_ids');

application/models/Business/User/MemberCenterService.php

@@ -29,10 +29,15 @@ class MemberCenterServiceModel extends \Business\AbstractModel
         $memberInfo['diliverymanId'] ? $memberCenter['isDeliveryman'] = 1 : $memberCenter['isDeliveryman'] = 0;
         //是否店主
         $memberInfo['storeId'] ? $memberCenter['isSeller'] = 1 : $memberCenter['isSeller'] = 0;
-        if($memberInfo['isWxsend']>=ApiConst::zero){
-            $memberCenter['canSendMsg']=ApiConst::canSendMsg;
+
+        if(!empty($memberInfo['pushSet'])){
+            $memberInfo['pushSet']=unserialize($memberInfo['pushSet']);
         }else{
-            $memberCenter['canSendMsg']=ApiConst::cannotSendMsg;
+            $memberInfo['pushSet']=array(
+                'canPush'=>ApiConst::openMessae,
+                'sound'=>ApiConst::openMessae,
+                'vibrate'=>ApiConst::openMessae,
+            );
         }
         $memberInfo['storeId'] ? $memberCenter['is'] = 1 : $memberCenter['isSeller'] = 0;
         //是否销售员
@@ -42,6 +47,9 @@ class MemberCenterServiceModel extends \Business\AbstractModel
         $sale_act = $saleInstance->getOneByMIdCache($memberId);
         $sale_act ? $memberCenter['isSalesman'] = 1 : $memberCenter['isSalesman'] = 0;
         $memberCenter['memberMobile'] = \DAO\MemberModel::getInstance()->getInfo($memberId)['memberMobile'];
+        $memberCenter['canSendMsg']= (int)$memberInfo['pushSet']['canPush'];
+        $memberCenter['sound']= (int)$memberInfo['pushSet']['sound'];
+        $memberCenter['vibrate']=(int)$memberInfo['pushSet']['vibrate'];
         return $memberCenter;
     }
     public function getStatistics($memberId){

application/models/DAO/Member.php

@@ -176,6 +176,7 @@ class MemberModel extends \DAO\AbstractModel
                     'storeId' => (int)$member['store_id'],
                     'memberAvatarUrl' => $member['memberAvatarUrl'],
                     'isWxsend'=>$member['is_wxsend'],
+                    'pushSet'=>$member['push_set'],
                 );
             } else {
                 $member = $this->getOneByMemberId($memberId, '*');
@@ -197,6 +198,7 @@ class MemberModel extends \DAO\AbstractModel
                     'storeId' => $member['store_id'],
                     'memberAvatarUrl' => $member['memberAvatarUrl'],
                     'isWxsend'=>$member['is_wxsend'],
+                    'pushSet'=>$member['push_set'],
                 );
                 foreach ($member as $key => $value) {
                     if (empty($value) || is_null($value)) {
@@ -580,13 +582,14 @@ class MemberModel extends \DAO\AbstractModel
         $this->changeNum($memberId, $fromState, null, -1);
         $this->changeNum($memberId, $toState, null, 1);
     }
-    public function setIsWxsend($memberId,$type){
-           if(in_array($type,array(ApiConst::closeMessage,ApiConst::openMessae))){
-               $data['is_wxsend']=$type;
-           }else{
-               ErrorModel::throwException(CodeConfigModel::paramsError);
+    public function setIsWxsend($memberId,$pushData){
+           foreach($pushData as $val){
+               if(!in_array($val,array(ApiConst::closeMessage,ApiConst::openMessae))){
+                   ErrorModel::throwException(CodeConfigModel::paramsError);
+               }
            }
-        if(isset( $data['is_wxsend'])){
+           $data['push_set']=serialize($pushData);
+        if(isset( $data['push_set'])){
             $res=$this->saveInfo($data,$memberId);
             return $res;
         }

application/models/Error/CodeConfig.php

@@ -282,6 +282,7 @@ class CodeConfigModel {
 
     const noEnoughStorageForBundlingGoods = 30118;
     const noOrderWaitToPay = 30119;
+    const wrongEvaluation = 30120;
     //店铺相关错误码
 
     //商品分类
@@ -758,6 +759,7 @@ class CodeConfigModel {
             self::goodsNoStoreForCartOrOrder1 => '商品库存紧张,您的购买数量太多啦',
             self::noEnoughStorageForBundlingGoods =>'组合销售库存紧张,您购买的数量太多啦',
             self::noOrderWaitToPay => '您的订单已支付,请勿重复支付',
+            self::wrongEvaluation => '商品评论应在6-500字之间',
             //销售员
             self::emptySaleGoodsId=>'商品id不能为空',
             self::emptySaleGoods=>'销售商品不存在',

public/test/message/set.php

@@ -10,8 +10,10 @@
 <body>
 <form action="/message/set" method="post">
     用户登录状态key:<input name="data[key]" value="ca44044c38f5a6d06ddd7304e1c7666c"/><br />
-   是否 接受消息:<input name="data[type]" value="1"/><br />
-    是否 接受消息:<input name="data[debug]" value="1"/><br />
+   是否 接受消息:<input name="data[canPush]" value="1"/><br />
+     声音消息:<input name="data[sound]" value="1"/><br />
+    是否震动:<input name="data[vibrate]" value="0"/><br />
+    debug:<input name="data[debug]" value="1"/><br />
     <input type="submit" value="提交">
 </form>