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

application/models/Business/Order/RefundService.php

@@ -220,10 +220,11 @@ class RefundServiceModel extends \Business\AbstractModel
             ErrorModel::throwException(CodeConfigModel::notExistRefund);
         }$updateData=array();
         $updateData['is_suc_refund']=ApiConst::refundSuccess;
+        $updateData['refund_type']=ApiConst::refundStateComplete;
         $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']);
+        \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refundId));
+        $storeDao->deleteStoreCache($storeId,$refundId);
+        $storeDao->deleteStoreRefundCache($storeId,$refundId);
         if($res!==false){
             return true;
         }