Antiloveg лет назад: 8
Родитель
Сommit
8d6b8b6bdc

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementInterestService.java

@@ -6,7 +6,7 @@ import com.goafanti.portal.bo.AchievementInterestListBo;
 
 
 public interface AchievementInterestService {
 public interface AchievementInterestService {
 
 
-	void saveAchievementInterest(String id);
+	String saveAchievementInterest(String id);
 
 
 	int saveCancelAchievementInterest(String id);
 	int saveCancelAchievementInterest(String id);
 
 

+ 3 - 2
src/main/java/com/goafanti/achievement/service/impl/AchievementInterestServiceImpl.java

@@ -25,18 +25,19 @@ public class AchievementInterestServiceImpl extends BaseMybatisDao<AchievementIn
 	private AchievementInterestMapper achievementInterestMapper;
 	private AchievementInterestMapper achievementInterestMapper;
 
 
 	@Override
 	@Override
-	public void saveAchievementInterest(String id) {
+	public String saveAchievementInterest(String id) {
 		AchievementInterest ai = new AchievementInterest();
 		AchievementInterest ai = new AchievementInterest();
 		ai.setId(UUID.randomUUID().toString());
 		ai.setId(UUID.randomUUID().toString());
 		ai.setUid(TokenManager.getUserId());
 		ai.setUid(TokenManager.getUserId());
 		if (StringUtils.isBlank(ai.getUid())){
 		if (StringUtils.isBlank(ai.getUid())){
-			return;
+			return null;
 		}
 		}
 		ai.setAchievementId(id);
 		ai.setAchievementId(id);
 		Calendar now = Calendar.getInstance();
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		now.set(Calendar.MILLISECOND, 0);
 		ai.setCreateTime(now.getTime());
 		ai.setCreateTime(now.getTime());
 		achievementInterestMapper.insert(ai);
 		achievementInterestMapper.insert(ai);
+		return ai.getId();
 	}
 	}
 
 
 	@Override
 	@Override

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandInterestService.java

@@ -9,7 +9,7 @@ public interface DemandInterestService {
 
 
 	int saveCancelDemandInterest(String id);
 	int saveCancelDemandInterest(String id);
 
 
-	void saveAchievementInterest(String id);
+	String saveAchievementInterest(String id);
 
 
 	DemandInterest selectDemandInterestByUidAndDemandId(String userId, String id);
 	DemandInterest selectDemandInterestByUidAndDemandId(String userId, String id);
 
 

+ 3 - 2
src/main/java/com/goafanti/demand/service/impl/DemandInterestServiceImpl.java

@@ -29,7 +29,7 @@ public class DemandInterestServiceImpl extends BaseMybatisDao<DemandInterestMapp
 	}
 	}
 
 
 	@Override
 	@Override
-	public void saveAchievementInterest(String id) {
+	public String saveAchievementInterest(String id) {
 		DemandInterest di = new DemandInterest();
 		DemandInterest di = new DemandInterest();
 		di.setId(UUID.randomUUID().toString());
 		di.setId(UUID.randomUUID().toString());
 		di.setDemandId(id);
 		di.setDemandId(id);
@@ -38,9 +38,10 @@ public class DemandInterestServiceImpl extends BaseMybatisDao<DemandInterestMapp
 		di.setCreateTime(now.getTime());
 		di.setCreateTime(now.getTime());
 		di.setUid(TokenManager.getUserId());
 		di.setUid(TokenManager.getUserId());
 		if (StringUtils.isBlank(di.getUid())){
 		if (StringUtils.isBlank(di.getUid())){
-			return;
+			return null;
 		}
 		}
 		demandInterestMapper.insert(di);
 		demandInterestMapper.insert(di);
+		return di.getId();
 	}
 	}
 
 
 	@Override
 	@Override

+ 9 - 0
src/main/java/com/goafanti/portal/controller/PortalActivityController.java

@@ -53,6 +53,15 @@ public class PortalActivityController extends BaseController {
 	}
 	}
 	
 	
 	/**
 	/**
+	 * 活动详情列表
+	 */
+	@RequestMapping(value = "/portal/activity/activityList", method = RequestMethod.GET)
+	public ModelAndView portalActivityList(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/activity/activityList");
+		return modelview;
+	}
+	
+	/**
 	 * 活动列表
 	 * 活动列表
 	 */
 	 */
 	@RequestMapping(value = "/portal/activity/list", method = RequestMethod.GET)
 	@RequestMapping(value = "/portal/activity/list", method = RequestMethod.GET)

+ 1 - 1
src/main/java/com/goafanti/portal/controller/PortalInterestApiController.java

@@ -111,7 +111,7 @@ public class PortalInterestApiController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求ID"));
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求ID"));
 			return res;
 			return res;
 		}
 		}
-		demandInterestService.saveAchievementInterest(id);
+		res.setData(demandInterestService.saveAchievementInterest(id));
 		return res;
 		return res;
 	}
 	}