From 1e17fb5664cd21ff1cf4610016bed2f216e885e6 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 14 三月 2019 18:17:25 +0800
Subject: [PATCH] mapper 文件调整

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
index b54d921..2596338 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -20,7 +20,7 @@
 import com.yeshi.fanli.entity.bus.user.ThreeSale;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
 import com.yeshi.fanli.entity.system.SystemClientParams;
 import com.yeshi.fanli.exception.NotExistObjectException;
 import com.yeshi.fanli.exception.banner.SwiperPictureException;
@@ -144,7 +144,7 @@
 
 		// 娲诲姩瑙勫垯
 		String key = "activityRules"; // key鍊�
-		com.yeshi.fanli.entity.system.System system = new System();
+		BusinessSystem system = new BusinessSystem();
 		system.setCreatetime(java.lang.System.currentTimeMillis());
 		system.setPlatform(1);
 		system.setId(4L);
@@ -180,6 +180,12 @@
 				hasCode = true;	// 宸叉湁閭�璇风爜
 			}
 		}
+		
+		// 閭�璇锋縺娲婚摼鎺�
+		if (!hasCode) {
+			data.put("activationlink", configService.get("invite_activation_url"));
+		}
+		
 		data.put("hasCode", hasCode);
 
 		
@@ -212,7 +218,7 @@
 
 		// 閭�璇疯鍒�
 		String key = "inviteRules"; // key鍊�
-		com.yeshi.fanli.entity.system.System system = new System();
+		com.yeshi.fanli.entity.system.BusinessSystem system = new BusinessSystem();
 		system.setCreatetime(java.lang.System.currentTimeMillis());
 		system.setPlatform(1);
 		system.setId(4L);
@@ -272,6 +278,7 @@
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("婵�娲诲け璐�"));
 				return;
 			}
+			
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("婵�娲绘垚鍔�"));
 			
 		} catch (UserInfoExtraException e) {

--
Gitblit v1.8.0