Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb 8 years ago
parent
commit
03f90cc62c

+ 4 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementInterestServiceImpl.java

@@ -12,6 +12,7 @@ import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.common.dao.AchievementInterestMapper;
 import com.goafanti.common.model.AchievementInterest;
 import com.goafanti.common.model.User;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -28,6 +29,9 @@ public class AchievementInterestServiceImpl extends BaseMybatisDao<AchievementIn
 		AchievementInterest ai = new AchievementInterest();
 		ai.setId(UUID.randomUUID().toString());
 		ai.setUid(TokenManager.getUserId());
+		if (StringUtils.isBlank(ai.getUid())){
+			return;
+		}
 		ai.setAchievementId(id);
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);

+ 3 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementOrderServiceImpl.java

@@ -50,6 +50,9 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 		ao.setCreateTime(now.getTime());
 		ao.setStatus(AchievementOrderStatus.CREATE.getCode());
 		ao.setUid(TokenManager.getUserId());
+		if (StringUtils.isBlank(ao.getUid())){
+			return;
+		}
 		achievementOrderMapper.insert(ao);
 
 		aol.setId(UUID.randomUUID().toString());

+ 4 - 0
src/main/java/com/goafanti/demand/service/impl/DemandInterestServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import com.goafanti.common.dao.DemandInterestMapper;
 import com.goafanti.common.model.DemandInterest;
 import com.goafanti.common.model.User;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -36,6 +37,9 @@ public class DemandInterestServiceImpl extends BaseMybatisDao<DemandInterestMapp
 		now.set(Calendar.MILLISECOND, 0);
 		di.setCreateTime(now.getTime());
 		di.setUid(TokenManager.getUserId());
+		if (StringUtils.isBlank(di.getUid())){
+			return;
+		}
 		demandInterestMapper.insert(di);
 	}
 

+ 3 - 0
src/main/java/com/goafanti/demand/service/impl/DemandOrderServiceImpl.java

@@ -47,6 +47,9 @@ public class DemandOrderServiceImpl extends BaseMybatisDao<DemandOrderMapper> im
 		now.set(Calendar.MILLISECOND, 0);
 		demandOrder.setCreateTime(now.getTime());
 		demandOrder.setUid(TokenManager.getUserId());
+		if (StringUtils.isBlank(demandOrder.getUid())){
+			return;
+		}
 		demandOrder.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 		demandOrder.setStatus(DemandOrderStatus.CREATE.getCode());
 		demandOrderMapper.insert(demandOrder);

+ 4 - 1
src/main/java/com/goafanti/news/bo/NewsSummary.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class NewsSummary {
@@ -41,7 +43,8 @@ public class NewsSummary {
 	 * 简介
 	 */
 	private String	summary;
-
+	
+	@JsonFormat(shape = Shape.STRING)
 	public Long getId() {
 		return id;
 	}

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

@@ -34,6 +34,7 @@ import com.goafanti.common.enums.DemandReleaseStatus;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.AchievementOrder;
 import com.goafanti.common.model.AchievementOrderLog;
+import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Demand;
 import com.goafanti.common.model.DemandOrder;
 import com.goafanti.common.model.DemandOrderLog;
@@ -132,6 +133,10 @@ public class PortalOrderApiController extends CertifyApiController {
 	@RequestMapping(value = "/orderAchievement", method = RequestMethod.POST)
 	public Result orderAchievement(@Valid InputAchievementOrder order, BindingResult bindingResult) {
 		Result res = new Result();
+		if(TokenManager.getToken() instanceof Admin){
+			res.getError().add(buildError(ErrorConstants.NON_LOGIN));
+			return res;
+		}
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					AchievementOrderFields.getFieldDesc(bindingResult.getFieldError().getField())));
@@ -255,6 +260,10 @@ public class PortalOrderApiController extends CertifyApiController {
 	@RequestMapping(value = "/orderDemand", method = RequestMethod.POST)
 	public Result orderDemand(@Valid InputDemandOrder inputDemandOrder, BindingResult bindingResult) {
 		Result res = new Result();
+		if(TokenManager.getToken() instanceof Admin){
+			res.getError().add(buildError(ErrorConstants.NON_LOGIN));
+			return res;
+		}
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					DemandOrderFields.getFieldDesc(bindingResult.getFieldError().getField())));

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html

@@ -81,7 +81,7 @@
 		<div class="active_content_list">
 			<ul>
 				<li th:each="it : ${activityList}">
-					<a href="details.html">
+					<a th:href="${'/portal/activity/activityDetails.html?id='+it.id}">
 						<div class="active_content_img">
 							<img th:if="${it.titleUrl} != null" th:src="${avatarUploadHost + it.titleUrl}">
 						</div>

File diff suppressed because it is too large
+ 3 - 3
src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html