Browse Source

关闭科技需求订单

Antiloveg 8 years ago
parent
commit
dbddcfdfd4

+ 3 - 2
src/main/java/com/goafanti/common/enums/DemandOrderStatus.java

@@ -12,8 +12,9 @@ public enum DemandOrderStatus {
 	CONTRACTMONEY(3, "交付合同金"),
 	COMMISSION(4,"交付佣金"),
 	SERVICEMONEY(5, "交付服务金"),
-	SHUTDOWN(6,"关闭订单"),
-	OTHER(7, "其他");
+	SHUTDOWNUNSIGN(6,"关闭(未签合同)"),
+	SHUTDOWN(7,"关闭(已签合同)"),
+	OTHER(8, "其他");
 
 	private DemandOrderStatus(Integer code, String desc) {
 		this.code = code;

+ 2 - 0
src/main/java/com/goafanti/demand/service/DemandOrderService.java

@@ -14,4 +14,6 @@ public interface DemandOrderService {
 
 	Pagination<DemandOrder> listOrderList(Integer status, Integer pNo, Integer pSize);
 
+	int updateShutdownByUser(DemandOrder order);
+
 }

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

@@ -57,4 +57,5 @@ public interface DemandService {
 
 	DemandSearchDetailBo selectDemandSearchDetail(String uid, String id);
 
+
 }

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

@@ -77,4 +77,10 @@ public class DemandOrderServiceImpl extends BaseMybatisDao<DemandOrderMapper> im
 				"findDemandOrderCount", params, pNo, pSize);
 	}
 
+	@Override
+	public int updateShutdownByUser(DemandOrder order) {
+		order.setStatus(DemandOrderStatus.SHUTDOWNUNSIGN.getCode());
+		return demandOrderMapper.updateByPrimaryKey(order);
+	}
+
 }

+ 1 - 0
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -560,4 +560,5 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		}
 	}
 
+
 }

+ 12 - 5
src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java

@@ -19,6 +19,7 @@ import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.DemandAuditStatus;
 import com.goafanti.common.enums.DemandOrderFields;
+import com.goafanti.common.enums.DemandOrderStatus;
 import com.goafanti.common.enums.DemandReleaseStatus;
 import com.goafanti.common.model.Demand;
 import com.goafanti.common.model.DemandOrder;
@@ -38,13 +39,12 @@ public class PortalOrderApiController extends CertifyApiController {
 	private DemandService			demandService;
 	@Resource
 	private DemandOrderLogService	demandOrderLogService;
-	
-	
+
 	/**
 	 * 科技成果购买
 	 */
 	@RequestMapping(value = "/orderAchievement", method = RequestMethod.POST)
-	public Result orderAchievement(){
+	public Result orderAchievement() {
 		Result res = new Result();
 		return res;
 	}
@@ -136,7 +136,7 @@ public class PortalOrderApiController extends CertifyApiController {
 					DemandOrderFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(inputDemandOrder.getDemandId())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
 			return res;
@@ -165,7 +165,7 @@ public class PortalOrderApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 关闭订单
+	 * 关闭科技需求订单
 	 */
 	@RequestMapping(value = "/demandShutdown", method = RequestMethod.POST)
 	public Result shutdown(String id) {
@@ -180,6 +180,13 @@ public class PortalOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "订单ID"));
 			return res;
 		}
+
+		if (!DemandOrderStatus.CREATE.getCode().equals(order.getStatus())) {
+			res.getError().add(buildError("", "当前状态无法撤销!"));
+			return res;
+		}
+		
+		res.setData(demandOrderService.updateShutdownByUser(order));
 		return res;
 	}