From aa66729ef758105dc1ced739ffe88e253affc37a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 15:49:28 +0800
Subject: [PATCH] Merge branch 'master-bug'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderRepairService.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderRepairService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderRepairService.java
index 9f71fff..d81834b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderRepairService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderRepairService.java
@@ -1,7 +1,12 @@
 package com.yeshi.fanli.service.inter.order;
 
+import java.util.List;
+
+import com.yeshi.fanli.entity.order.OrderRepairHistory;
+
 /**
  * 璁㈠崟淇鏈嶅姟
+ * 
  * @author Administrator
  *
  *
@@ -11,8 +16,31 @@
 	/**
 	 * 淇璁㈠崟
 	 */
-	public void repairOrder(String orderId);
-	
-	
-	
+	public void repairOrder(String orderId) throws Exception;
+
+	/**
+	 * 淇涓�绾�,浜岀骇璁㈠崟璁㈠崟
+	 * 
+	 * @param orderId
+	 * @throws Exception
+	 */
+	public void repireFirstAndSecondLevel(String orderId) throws Exception;
+
+	public void testTransaction();
+
+	/**
+	 * 鏍规嵁鐢ㄦ埛ID妫�绱�
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	List<OrderRepairHistory> listByUid(Long uid);
+
+	/**
+	 * 澶勭悊璧勯噾
+	 * 
+	 * @param uid
+	 */
+	public void doMoney(Long uid);
+
 }

--
Gitblit v1.8.0