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

application/models/Business/Order/OrderService.php

@@ -583,12 +583,13 @@ class OrderServiceModel extends \Business\AbstractModel
                         //$orderGoodsUpdateData['refund_state_name']='退款成功';
                         $orderGoodsUpdateData['is_refund']=ApiConst::refundSuccess;
                         $orderGoodsDao->update($where,$orderGoodsUpdateData);
-                        $orderDao->db->doCommit();
+
                     }else{
                         $orderDao->db->doRollback();
                         ErrorModel::throwException(CodeConfigModel::cancelRefundMoneyError);
                     }
                 }
+                $orderDao->db->doCommit();
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order['storeId'],
                     'type'=>ApiConst::messageWaitReceive,