From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:54:11 +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/impl/integral/IntegralTaskRecordServiceImpl.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
index 95ebd4d..d251491 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
@@ -431,9 +431,7 @@
 	 * @param beizu
 	 */
 	private void firstOrderReward(Long uid, Long originUid, Integer addGoldCoin, String level, String beizu) {
-		if (uid == null)
-		     return;
-		String uniqueKey = uid.toString();
+		String uniqueKey = "firstOrder-"+ uid.toString();
 		if (originUid != null) 
 			uniqueKey = uniqueKey + "-" + originUid;
 		

--
Gitblit v1.8.0