wanghui лет назад: 8
Родитель
Сommit
171466b460

+ 13 - 2
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -52,7 +52,7 @@ public class AdminOrderApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 
+	 * 修改订单
 	 * @param orderNo
 	 * @param firstPayment
 	 * @param orderAmount
@@ -253,7 +253,7 @@ public class AdminOrderApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 部门服务订单
+	 * 特批订单
 	 * @return
 	 */
 	@RequestMapping(value="/listApprovalServiceOrder" ,method = RequestMethod.POST)
@@ -265,6 +265,17 @@ public class AdminOrderApiController extends CertifyApiController {
 	}
 	
 	/**
+	 * 
+	 * @param orderNo
+	 * @return
+	 */
+	public Result approvalServiceOrder(String orderNo,Integer confirm){
+		Result res = new Result();
+		orderServiceImpl.approvalServiceOrder(orderNo,confirm);
+		return res;
+	}
+	
+	/**
 	 * 创建订单
 	 * @param uid
 	 * @param orderType

+ 8 - 0
src/main/java/com/goafanti/order/service/OrderService.java

@@ -331,4 +331,12 @@ public interface OrderService {
 	 */
 	Pagination<OrderListBo> listSetUpServiceOrder(OrderListBo bo, String startDate, String endDate, String depIds, Integer pageNo,
 			Integer pageSize);
+
+	/**
+	 * 特批订单
+	 * @param orderNo
+	 * @param confirm
+	 * @return
+	 */
+	int approvalServiceOrder(String orderNo, Integer confirm);
 }

+ 22 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -875,6 +875,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			tOrder.setSignTotalAmount(new BigDecimal(signTotalAmount));
 			tOrder.setOrderStage(OrderStage.SIGNED.getCode());
 			tOrder.setOrderStatus(OrderState.ALREADY_SIGN.getCode());
+			tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
 			tOrder.setApproval(Integer.valueOf(approval));
 			tOrder.setUpdateTime(new Date());
 			tOrderMapper.updateByPrimaryKeySelective(tOrder);
@@ -1275,5 +1276,25 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		return  (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount", 
 				params, pageNo, pageSize);
 	}
-	
+
+	@Override
+	public int approvalServiceOrder(String orderNo, Integer confirm) {
+		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
+		checkOrder(tOrder);
+		if(tOrder.getProjectStage() != ProjectStage.NOT_SATISFY_CONDITION.getCode() 
+				|| tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
+				|| tOrder.getOrderStage() != OrderStage.SIGNED.getCode()
+				|| tOrder.getApproval() != ApprovalState.WAIT_AUDIT.getCode()){
+			throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo , ""));
+		}
+		tOrder.setUpdateTime(new Date());
+		if(confirm == AFTConstants.YES){
+			tOrder.setApproval(ApprovalState.AUDIT_PASS.getCode());
+			tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
+		}else if(confirm == AFTConstants.NO){
+			tOrder.setApproval(ApprovalState.AUDIT_REFUSE.getCode());
+		}
+		tOrderMapper.updateByPrimaryKeySelective(tOrder);
+		return 1;
+	}
 }