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

application/models/Business/Order/OrderService.php

@@ -300,7 +300,6 @@ class OrderServiceModel extends \Business\AbstractModel
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateComplete, TRUE);
             if ($res) {
                 $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id']);
-                \Our\RedisHelper::memberTotalFromStateToState($memberId, $order['order_state'], ApiConst::orderStateComplete);
                 return true;
             } else {
                 ErrorModel::throwException(CodeConfigModel::receiveError);

application/models/DAO/Order/Order.php

@@ -785,6 +785,9 @@ class OrderModel extends \DAO\AbstractModel
             $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
             $orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId);
             \DAO\MemberModel::getInstance()->deleteTotalCache($memberId);
+            $orderCommonDao= \DAO\Order\OrderCommonModel::getInstance(DbNameConst::masterDBConnectName);
+            \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField));
+
         }
         if (!empty($stroeId)) {
             if ($deleteGetShopKeeperCountByStoreId) {
@@ -795,6 +798,7 @@ class OrderModel extends \DAO\AbstractModel
                 $favoritesStoreDao->deleteGetFavoritesCountByStoreId($stroeId);
             }
         }
+        return true;
 
     }
 

public/index.php

@@ -7,7 +7,7 @@ define("APP_ENV",ini_get('yaf.environ'));
 if(APP_ENV=='develop'){
     error_reporting(E_ALL);
 }
-if(APP_ENV=='test' || APP_ENV=='pre'){
+if(APP_ENV=='test' || APP_ENV=='pre' ||APP_ENV=='ccwdevelop'){
     if(isset($_POST['data']['debug'])&&!empty($_POST['data']['debug'])){
         error_reporting(E_ALL);
     }else{