ccw:master_dev

application/models/Business/Order/RefundService.php

@@ -181,9 +181,7 @@ class RefundServiceModel extends \Business\AbstractModel
             }
             \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));
             $refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']);
-
             $orderDao->deleteOrderCache($refund['buyer_id'], $refund['order_id'], $refund['store_id']);
-
             $storeDAO->deleteStoreRefundCache($refund['store_id'],$refund['order_id']);
             $refundReturnDao->db->doCommit();
 
@@ -843,11 +841,13 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundArrayUnLine=Common::convertUnderline($refundArray);
         $state = $refundReturnDao->addRefundReturn($refundArray,$orderInfo,$orderGoods);
         $orderDao->deleteOrderCache($memberId,$orderInfo['orderId'],$orderInfo['storeId'],true);
-        $refundReturnDao->deleteRefundCache($memberId);
-        $storeDao->deleteStoreRefundCache($refundOne['storeId']);
+
+
         if ($state) {
             $refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine);
             $orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state));
+            $refundReturnDao->deleteRefundCache($memberId);
+            $storeDao->deleteStoreRefundCache($refundOne['storeId']);
             $orderLogDao->addRefundOrderLog($orderInfo['orderId'],$refundArray['refund_type'],DescribeConst::buyer,$orderInfo['buyerName'],$orderInfo['orderState']);
             $push=\Our\Push::getInstance();
             $pushData=array('storeId'=>$orderInfo['storeId'],
@@ -865,6 +865,7 @@ class RefundServiceModel extends \Business\AbstractModel
                     'orderId'=>$orderInfo['orderId']));
             $push->addOneToClient($pushData);
             $push->sendTcpMessage();
+
             //\Our\RedisHelper::rpush('client_push',array('storeId'=>$refund['storeId'],'type'=>ApiConst::messageRefundProccessing,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'getRefundDetail','refundId'=>$refund['refundId'])));
             if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) {
                 $orderDao->editOrderLock($orderInfo['orderId']);