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

application/controllers/User.php

@@ -146,4 +146,12 @@ class UserController extends \Our\Controller_AbstractIndex {
             $this->success(array('userFlag'=>\Our\ApiConst::zero));
         }
     }
+
+    public function isLoginAction(){
+        $isLogin = \Our\ApiConst::zero;
+        if(parent::isLogin()){
+            $isLogin = \Our\ApiConst::one;
+        }
+        $this->success(array('isLogin'=>$isLogin));
+    }
 }

application/models/Business/Cart/CartService.php

@@ -56,8 +56,11 @@ class CartServiceModel extends \Business\AbstractModel{
      */
     public function editCart($data,$cart,$memberId,$pBundlind=null){
         $validReturnData = $this->validEditCart($data,$cart,$memberId,$pBundlind);
-        $cartDao = \DAO\Cart\CartModel::getInstance(\Our\DbNameConst::masterDBConnectName);
+        if(isset($validReturnData['existCartFlag'])&&$validReturnData['existCartFlag']==\Our\ApiConst::one){
+            return $this->editDelCart($cart,$memberId);
+        }
         $cartArray = $this->getFormattedCartDataForEdit($data,$cart,$memberId,$pBundlind,$validReturnData);
+        $cartDao = \DAO\Cart\CartModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $result = $cartDao->update($cartArray['newCarts'][0],array('cart_id'=>$data['cartId']));
         if(!$result){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::editCartFailed);
@@ -73,6 +76,30 @@ class CartServiceModel extends \Business\AbstractModel{
         return $result;
     }
 
+    /**
+     * 编辑规格时出现当前规格已经在购物车时,删除当前购物车
+     * @param $cart
+     * @param $memberId
+     * @return mixed
+     * @throws \Error\OurExceptionModel
+     * @throws \Exception
+     */
+    public function editDelCart($cart,$memberId){
+        $cartRedis = \Redis\Db7\CartRedisModel::getInstance();
+        $cartDao = \DAO\Cart\CartModel::getInstance(\Our\DbNameConst::masterDBConnectName);
+        $result = $cartDao->del(array('cart_id'=>$cart['cart_id']));
+        if(!$result){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::editDelCartFailed);
+        }
+        $updateResult = $cartDao->update(array('gmt_update'=>TIMESTAMP),array('goods_id'=>$cart['goods_id'],'buyer_id'=>$memberId));
+        if(!$updateResult){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::editCartUploadCartFailed);
+        }
+        $memberStoreCartsKey = \Our\NameConst::memberStoreCartsPrefix.$memberId.\Our\NameConst::underline.$cart['store_id'];
+        $cartRedis->tableDel($memberStoreCartsKey);
+        return $result;
+    }
+
     /**
      * 批量删除购物车
      * @param $data
@@ -358,6 +385,11 @@ class CartServiceModel extends \Business\AbstractModel{
             if(!(isset($data['goodsNum'])&&intval($data['goodsNum'])>\Our\ApiConst::zero)){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyCartGoodsNum);
             }
+            $cartDao = \DAO\Cart\CartModel::getInstance(\Our\DbNameConst::masterDBConnectName);
+            $existCart = $cartDao->find(array('goods_id'=>$data['goodsId'],'buyer_id'=>$memberId,array('cart_id'=>array('neq ',$data['cartId']))));
+            if($existCart){
+                return array('existCartFlag'=>\Our\ApiConst::one);
+            }
             $goodsDao = \DAO\GoodsModel::getInstance(\Our\DbNameConst::masterDBConnectName);
             $goodsValidStatus = $goodsDao->validEditCartGoods($data,$cart);
             if(!$goodsValidStatus){

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'];

application/models/DAO/Cart/Cart.php

@@ -40,6 +40,9 @@ class CartModel extends \DAO\AbstractModel{
      */
     public function find($where,$field= \Our\NameConst::allField){
         $this->setDb($this->dbName);
+        if(is_array($where)){
+            $where = $this->db->getSqlWhereByArray($where);
+        }
         $data = $this->db->from($this->_tableName)->select($field)->where($where)->fetchOne();
         return $data;
     }

application/models/Error/CodeConfig.php

@@ -163,6 +163,8 @@ class CodeConfigModel {
     const emptyPBundlingdForOrder = 50038;
     const pBundlingOfflineForOrder = 50039;
     const pBundlingNoStorageForOrder = 50040;
+    const editDelCartFailed = 50041;
+    const editCartUploadCartFailed = 50042;
 
 
     //订单相关错误码
@@ -553,6 +555,8 @@ class CodeConfigModel {
             self::emptyPBundlingdForOrder => '组合销售商品不存在',
             self::pBundlingOfflineForOrder => '组合销售商品已经下架',
             self::pBundlingNoStorageForOrder => '组合销售商品库存不足',
+            self::editDelCartFailed => '编辑购物车时删除数据失败',
+            self::editCartUploadCartFailed => '编辑购物车更新购物车时间失败',
 
             self::addressNotExist=>'地址不存在',
             self::emptyAddressId=>'地址主键参数不能为空',

scripts/crontab/order/evaluate.php

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