From a39422f2a8ce45dd6cf65701ed5f9e65391c46c1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 11:03:35 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
index eaf216f..957cf91 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
@@ -90,7 +90,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception;
+	public void useOrderCoupon(Long uid, Long id, String orderNo, Integer goodsType) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 鏍规嵁璁㈠崟鍙疯幏鍙栧鍔卞埜浣跨敤杩涘害
@@ -187,13 +187,6 @@
 	public void copyLotteryPrize(Long uid, int platform, String device) throws Exception;
 
 	
-	/**
-	 * 棰嗗彇鍒�
-	 * @param uid
-	 * @throws Exception
-	 */
-	public void receivedCoupon(Long uid) throws Exception;
-	
 
 	/**
 	 * 缁熻浠婃棩鎶藉涓殑鍒告暟閲�
@@ -211,5 +204,5 @@
 	 * @throws Exception
 	 */
 	public void randomRewardCoupon(int num, Long uid, String source) throws Exception;
-	
+
 }

--
Gitblit v1.8.0