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

application/library/Our/DescribeConst.php

@@ -160,5 +160,7 @@ class DescribeConst
     const confirmButton='确认收货';
 
     const cancelOrderMessage='十分钟未支付，自动取消订单';
+
+    const anonymity = '匿名用户';
 }
 ?>
\ No newline at end of file

application/models/Business/Goods/GoodsCommonService.php

@@ -561,12 +561,19 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $evaluation = \Our\RedisHelper::cachedFunction(\Redis\Db4\EvaluateGoodsRedisModel::getInstance(),array(&$evaluateInstance, 'getList'),array(array('geval_goods_commonid'=>$goodsCommonId,'geval_state'=>0),'geval_frommemberid,geval_frommembername AS memberName,geval_content AS gevalContent,geval_addtime AS gevalTime,geval_image,geval_explain AS gevalExplain,geval_isanonymous AS isAnonymous,goods_spec,member_avatar AS memberAvatar',array('geval_addtime','DESC'),1,1),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
         if($evaluation){
             $evaluation = $evaluation[0];
+            if($evaluation['isAnonymous'] == 1) {
+                $evaluation['memberAvatar'] = \DAO\MemberModel::getInstance()->getMemberAvatarUrl(0);
+                $evaluation['memberName'] = \Our\DescribeConst::anonymity;
+            }else{
                 $member= \DAO\MemberModel::getInstance()->getInfo($evaluation['geval_frommemberid']);
                 $evaluation['memberAvatar'] = $member['memberAvatarUrl'];
+            }
             $gevalImage = [];
             if(unserialize($evaluation['geval_image'])){
                 foreach (unserialize($evaluation['geval_image']) as $v){
-                    $gevalImage[] = \Our\Common::getStaticFile($v,\Our\ImageConst::goodsEvaluation);;
+                    if($v) {
+                        $gevalImage[] = \Our\Common::getStaticFile($v,\Our\ImageConst::goodsEvaluation)."?x-oss-process=image/resize,m_fill,h_222,w_222";
+                    }
                 }
             }
             //规格
@@ -637,12 +644,12 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError);
         }
         $pageIndex=$pageIndex+\Our\ApiConst::one;
-        isset($param['commentType'])?$commentType = intval($param['commentType']):$commentType = 0;
+        isset($param['commentType'])?$commentType = intval($param['commentType']):$commentType = 1;
 
         $evaluateInstance = \DAO\EvaluateGoodsModel::getInstance();
         $where = array('geval_goods_commonid'=>$goodsCommonId,'geval_state'=>0);
         $args = array(array('geval_goods_commonid'=>$goodsCommonId,'geval_state'=>0),'geval_frommemberid,geval_frommembername AS memberName,geval_content AS gevalContent,geval_addtime AS addTime,geval_image,geval_explain AS gevalExplain,geval_isanonymous AS isAnonymous,goods_spec,member_avatar AS memberAvatar',array('geval_addtime','DESC'),$pageIndex,$pageSize);
-        if($commentType === 1){
+        if($commentType === 2){
             $args[] = true;
         }
         $evaluations = \Our\RedisHelper::cachedFunction(\Redis\Db4\EvaluateGoodsRedisModel::getInstance(),array(&$evaluateInstance, 'getList'),$args,\Our\ApiConst::oneDaySecond,array($goodsCommonId));
@@ -651,12 +658,19 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $data = [];
         if(is_array($evaluations) && !empty($evaluations)){
             foreach ($evaluations as $evaluation){
+                if($evaluation['isAnonymous'] == 1) {
+                    $evaluation['memberAvatar'] = \DAO\MemberModel::getInstance()->getMemberAvatarUrl(0);
+                    $evaluation['memberName'] = \Our\DescribeConst::anonymity;
+                }else{
                     $member= \DAO\MemberModel::getInstance()->getInfo($evaluation['geval_frommemberid']);
                     $evaluation['memberAvatar'] = $member['memberAvatarUrl'];
+                }
                 $gevalImage = [];
                 if($evaluation['geval_image']){
                     foreach (unserialize($evaluation['geval_image']) as $v){
-                        $gevalImage[] = \Our\Common::getStaticFile($v,\Our\ImageConst::goodsEvaluation);;
+                        if($v) {
+                            $gevalImage[] = \Our\Common::getStaticFile($v,\Our\ImageConst::goodsEvaluation)."?x-oss-process=image/resize,m_fill,h_222,w_222";
+                        }
                     }
                 }
                 //规格

application/models/DAO/EvaluateGoods.php

@@ -35,7 +35,7 @@ class EvaluateGoodsModel extends \DAO\AbstractModel {
     public function getList($where,$field,$order,$pageIndex,$pageSize,$haveImg = false){
         $this->setDb();
         if($haveImg){
-            return $this->db->select($field)->from($this->_tableName)->where($where)->where('geval_image is not null')->order($order[0],$order[1])->page($pageIndex,$pageSize)->fetchAll();
+            return $this->db->select($field)->from($this->_tableName)->where($where)->where("geval_image !='N;'")->order($order[0],$order[1])->page($pageIndex,$pageSize)->fetchAll();
         }
         return $this->db->select($field)->from($this->_tableName)->where($where)->order($order[0],$order[1])->page($pageIndex,$pageSize)->fetchAll();
     }