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

application/models/Business/Order/RefundService.php

@@ -214,12 +214,16 @@ class RefundServiceModel extends \Business\AbstractModel
 
     public function makeRefund($storeId,$refundId){
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
-        $returnDetail=$refundReturnDao->findByRefundId($refundId);
+        $returnDetail=$refundReturnDao->findByRefundId($refundId,$refundReturnDao->refundDetailField);
+        $storeDao=\DAO\StoreModel::getInstance(DbNameConst::masterDBConnectName);
         if($returnDetail['storeId']!=$storeId){
             ErrorModel::throwException(CodeConfigModel::notExistRefund);
         }$updateData=array();
         $updateData['is_suc_refund']=ApiConst::refundSuccess;
         $res=$refundReturnDao->update(array('refund_id'=>$refundId), $updateData);
+        \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));
+        $storeDao->deleteStoreCache($storeId,$refund['order_id']);
+        $storeDao->deleteStoreRefundCache($storeId,$refund['order_id']);
         if($res!==false){
             return true;
         }