From 8c66e480d8a3c129a9032a90d39688e875f45ee5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 14:50:02 +0800
Subject: [PATCH] 奖励订单到账逻辑添加

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
index f5c7b93..71849a7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
@@ -63,6 +63,16 @@
 			recommendActivity.setInviteInfo(info);
 		}
 
+		if (recommendActivity !=null) {
+			ActivityUser activityUser = recommendActivity.getActivityUser();
+			if (activityUser != null) {
+				ActivityUser resultUser = activityService.selectActivityUserByPrimaryKey(activityUser.getId());
+				if (resultUser != null) {
+					recommendActivity.setActivityUser(resultUser);
+				}
+			}
+		}
+		
 		if (StringUtil.isNullOrEmpty(callback)) {
 			out.print(JsonUtil.loadTrueResult(recommendActivity));
 		} else {

--
Gitblit v1.8.0