From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 9dd281f..2a0c112 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -166,7 +166,6 @@
 	@Resource
 	private HongBaoV2AddManager hongBaoV2AddManager;
 
-
 	/**
 	 * 鏄惁鏄垎浜鍗�
 	 * 
@@ -1194,7 +1193,9 @@
 				update.setUpdateTime(new Date());
 				hongBaoV2Service.updateByPrimaryKeySelective(update);
 			}
-		userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId, sourceType, "鍥犲晢瀹惰繚绾︽湭鑳界粨绠楄繑鍒╂垨鍟嗗宸茬粡鍏冲簵");
+		// TODO 鍟嗗鍏冲簵璺戣矾闇�瑕佽禒閫侀噾甯�
+		// userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId,
+		// sourceType, "鍥犲晢瀹惰繚绾︽湭鑳界粨绠楄繑鍒╂垨鍟嗗宸茬粡鍏冲簵");
 	}
 
 	@Transactional

--
Gitblit v1.8.0