|
|
@@ -1,5 +1,7 @@
|
|
|
package com.goafanti.portal.controller;
|
|
|
|
|
|
+import java.util.List;
|
|
|
+
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
@@ -56,14 +58,14 @@ public class PortalOrderApiController extends CertifyApiController {
|
|
|
private AchievementOrderLogService achievementOrderLogService;
|
|
|
@Resource
|
|
|
private AchievementOrderService achievementOrderService;
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 科技成果Log
|
|
|
*/
|
|
|
- @RequestMapping(value = "/achievementOrderLog", method =RequestMethod.GET)
|
|
|
- public Result achievementOrderLog(String achievementOrderId){
|
|
|
+ @RequestMapping(value = "/achievementOrderLog", method = RequestMethod.GET)
|
|
|
+ public Result achievementOrderLog(String achievementOrderId) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(achievementOrderId)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "科技成果订单ID"));
|
|
|
return res;
|
|
|
@@ -74,17 +76,17 @@ public class PortalOrderApiController extends CertifyApiController {
|
|
|
} else {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果订单ID"));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 关闭科技成果订单
|
|
|
*/
|
|
|
@RequestMapping(value = "/achievementShutdown", method = RequestMethod.POST)
|
|
|
- public Result achevementShutdown(String id){
|
|
|
+ public Result achevementShutdown(String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isBlank(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到订单ID", "订单ID"));
|
|
|
return res;
|
|
|
@@ -102,7 +104,7 @@ public class PortalOrderApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
res.setData(achievementOrderService.updateShutdownByUser(order));
|
|
|
-
|
|
|
+
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -140,19 +142,29 @@ public class PortalOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技成果ID", "科技成果ID"));
|
|
|
return res;
|
|
|
}
|
|
|
- AchievementOrder ao = achievementOrderService
|
|
|
+ List<AchievementOrder> ao = achievementOrderService
|
|
|
.selectAchievementOrderByUidAndAchievementId(TokenManager.getUserId(), achievementId);
|
|
|
- if (null != ao) {
|
|
|
- res.getError().add(buildError("", "当前科技成果已购买!"));
|
|
|
- return res;
|
|
|
+ if (!ao.isEmpty()) {
|
|
|
+ for (AchievementOrder os : ao) {
|
|
|
+ if (!AchievementOrderStatus.SHUTDOWN.getCode().equals(os.getStatus())) {
|
|
|
+ res.getError().add(buildError("", "当前科技成果已购买!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
Achievement a = achievementService.selectByPrimaryKey(achievementId);
|
|
|
+
|
|
|
if (null == a || !AchievementAuditStatus.AUDITED.getCode().equals(a.getAuditStatus())
|
|
|
|| !AchievementReleaseStatus.RELEASED.getCode().equals(a.getReleaseStatus())
|
|
|
|| !DeleteStatus.UNDELETE.getCode().equals(a.getDeletedSign())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果ID"));
|
|
|
return res;
|
|
|
}
|
|
|
+ if (TokenManager.getUserId().equals(a.getOwnerId())){
|
|
|
+ res.getError().add(buildError("", "无法购买本人发布科技成果!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
AchievementOrder achievementOrder = new AchievementOrder();
|
|
|
AchievementOrderLog aol = new AchievementOrderLog();
|
|
|
BeanUtils.copyProperties(order, achievementOrder);
|
|
|
@@ -253,11 +265,15 @@ public class PortalOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
|
|
|
return res;
|
|
|
}
|
|
|
- DemandOrder demandOrder = demandOrderService.selectDemandOrderByUidAndDemandId(TokenManager.getUserId(),
|
|
|
+ List<DemandOrder> demandOrder = demandOrderService.selectDemandOrderByUidAndDemandId(TokenManager.getUserId(),
|
|
|
demandId);
|
|
|
- if (null != demandOrder) {
|
|
|
- res.getError().add(buildError("", "当前科技需求已接单!"));
|
|
|
- return res;
|
|
|
+ if (!demandOrder.isEmpty()){
|
|
|
+ for (DemandOrder os : demandOrder){
|
|
|
+ if (!DemandOrderStatus.SHUTDOWN.getCode().equals(os.getStatus())){
|
|
|
+ res.getError().add(buildError("", "当前科技需求已接单!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
Demand d = demandService.selectByPrimaryKey(demandId);
|
|
|
if (null == d || d.getDeletedSign().equals(DeleteStatus.DELETED.getCode())
|
|
|
@@ -266,6 +282,10 @@ public class PortalOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技需求ID"));
|
|
|
return res;
|
|
|
}
|
|
|
+ if (TokenManager.getUserId().equals(d.getEmployerId())){
|
|
|
+ res.getError().add(buildError("", "无法对本人发布科技需求接单!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
|
|
|
DemandOrder order = new DemandOrder();
|
|
|
DemandOrderLog dol = new DemandOrderLog();
|