Browse Source

变更审核修改

anderx 2 years ago
parent
commit
04e8720940

+ 1 - 0
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -256,6 +256,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	 *  退单退款:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁-董事长(大于2K,需董事长审核)-财务退票
 	 *  退单不退款:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁-财务退票
 	 * 	仅金额:营销-经理-总经理审核-技术总监-财务-财务总监-总裁
+	 * 	框架协议审核流程: 营销员发起-营销经理审核-营销管理员审核-财务审核-咨询师管理员审核-完成
 	 */
 	@RequestMapping(value = "/orderChangeAudit", method = RequestMethod.POST)
 	public Result orderChangeAudit(String changeId,String remarks,Integer status,Integer processState,Integer rejectState){

+ 12 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -280,6 +280,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				  退单退款:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁-董事长(大于2K,需董事长审核)-财务退票
 				 退单不退款:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁-财务退票
 					仅金额:营销-经理-总经理审核-技术总监-财务-财务总监-总裁
+				框架协议审核流程: 营销员发起-营销经理审核-营销管理员审核-财务审核-咨询师管理员审核-完成
 				 */
 					if (nb.getProcessState()==OrderChangeProcess.YXJL.getCode()){
 						nb.setProcessState(OrderChangeProcess.YXGLY.getCode());
@@ -292,7 +293,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							pushZXS(nb, date,1);
 						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
 							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
-						}else if (nb.getType()==OrderChangeType.ZS.getCode()){
+						}else if (nb.getType()==OrderChangeType.ZS.getCode()||nb.getType()==OrderChangeType.KJXY.getCode()){
 							nb.setProcessState(OrderChangeProcess.CWZY.getCode());
 						}
 					}else if (nb.getProcessState()==OrderChangeProcess.JSY.getCode()){
@@ -304,10 +305,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
 						pushZXSJL(nb,date,0);
 					}else if (nb.getProcessState()==OrderChangeProcess.JSZJ.getCode()){
-						nb.setProcessState(OrderChangeProcess.CWZY.getCode());
+						if (nb.getType()==OrderChangeType.KJXY.getCode()){
+							nb.setStatus(4);
+							addOrderChangeLog(remarks, 2, orderNo, nb.getId());
+							pushCompleteOrderChange(nb);
+							return 1;
+						}else {
+							nb.setProcessState(OrderChangeProcess.CWZY.getCode());
+						}
 					}else if (nb.getProcessState()==OrderChangeProcess.CWZY.getCode()){
 						if (nb.getType()==OrderChangeType.ZS.getCode()){
 							nb.setProcessState(OrderChangeProcess.ZC.getCode());
+						}if (nb.getType()==OrderChangeType.KJXY.getCode()){
+							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
 						}else {
 							nb.setProcessState(OrderChangeProcess.CWZJ.getCode());
 						}