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

application/models/Business/Goods/EvaluationService.php

@@ -64,7 +64,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
                 $evaluation['geval_goodsprice'] = $orderGoods[$v['goodsId']]['goods_pay_price'];
                 $evaluation['geval_goodsimage'] = $orderGoods[$v['goodsId']]['goods_image'];
                 $evaluation['geval_scores'] = intval($v['scores']);
-                $evaluation['geval_content'] = $v['content'] ? trim($v['content']) : \Our\OrderConst::defaultComment;
+                $evaluation['geval_content'] = $v['content'] ? trim($v['content']) : \Our\OrderConst::beyondTimeDefaultComment;
                 $evaluation['geval_isanonymous'] = intval($data['isanonymous']);
                 $evaluation['geval_addtime'] = time();
                 $evaluation['geval_storeid'] = $order['store_id'];
@@ -252,12 +252,13 @@ class EvaluationServiceModel extends \Business\AbstractModel {
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
         $evaluateInstance = \DAO\EvaluateGoodsModel::getInstance();
         do{
-            $list = $orderDao->getList(array('finnshed_time'=>array('elt',time()-(\Our\ApiConst::sevenDaySecond)),'evaluation_state'=>\Our\ApiConst::waitEvaluation,'order_state'=>\Our\ApiConst::orderStateComplete,'delete_state'=>0,'lock_state'=>0),'order_id,buyer_id,buyer_name,store_name,store_id,order_sn,order_id,diliveryman_id',$pageBegin,\Our\PageConst::taskPageSize,'');
+            $list = $orderDao->getList(array('finnshed_time'=>array('elt',time()-(\Our\ApiConst::oneDaySecond)),'evaluation_state'=>\Our\ApiConst::waitEvaluation,'order_state'=>\Our\ApiConst::orderStateComplete,'delete_state'=>0,'lock_state'=>0),'order_id,buyer_id,buyer_name,store_name,store_id,order_sn,order_id,diliveryman_id',$pageBegin,\Our\PageConst::taskPageSize,'');
             foreach ($list['list'] as $order) {
-                $orderGoods = $orderGoodsDao->getOrderGoodsList(array('order_id'=>$order['order_id']),'rec_id,goods_id,goods_commonid,goods_name,goods_image,goods_pay_price,goods_num,goods_spec');
+                $orderGoods = $orderGoodsDao->getOrderGoodsList(array('order_id'=>$order['order_id'],'refund_id'=>0),'rec_id,goods_id,goods_commonid,goods_name,goods_image,goods_pay_price,goods_num,goods_spec');
+                $evaluations = array();
                 foreach ($orderGoods as $k=>$v){
+                    $evaluation = array();
                     if($v['goods_commonid'] > 0) {
-                        $evaluation = array();
                         $evaluation['geval_orderid'] = $order['order_id'];
                         $evaluation['geval_orderno'] = $order['order_sn'];
                         $evaluation['geval_ordergoodsid'] = $v['rec_id'];
@@ -280,10 +281,13 @@ class EvaluationServiceModel extends \Business\AbstractModel {
                         $evaluations[] = $evaluation;
                     }
                 }
-                $result = \DAO\EvaluateGoodsModel::getInstance()->insertAll($evaluations);
+                if($evaluations) {
+                    $result = \DAO\EvaluateGoodsModel::getInstance()->insertAll($evaluations);
+                }
                 if(!$result){
                     return false;
                 }
+                $insert = array();
                 foreach ($orderGoods as $v) {
                     if($v['goods_commonid'] > 0) {
                         //更新商品评分
@@ -301,7 +305,9 @@ class EvaluationServiceModel extends \Business\AbstractModel {
                     }
                 }
                 //批量插入或更新评论总分等
-                \DAO\GoodsScoreStatisticsModel::getInstance()->insertAllOrUpdate($insert);
+                if($insert) {
+                    \DAO\GoodsScoreStatisticsModel::getInstance()->insertAllOrUpdate($insert);
+                }
                 if($order['diliveryman_id']){
                     $delivery['deval_orderid'] = $order['order_id'];//配送评价表的内容
                     $delivery['deval_orderno'] = $order['order_sn'];

scripts/crontab/order/evaluate.php

@@ -2,7 +2,7 @@
 
 /**
  * 自动评价
- * 执行时间：十分钟执行一次
+ * 执行时间：一小时执行一次
  */
 
 define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向public的上一级