|
|
@@ -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()){
|
|
|
@@ -308,6 +309,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}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.setStatus(4);
|
|
|
+ addOrderChangeLog(remarks, 2, orderNo, nb.getId());
|
|
|
+ pushCompleteOrderChange(nb);
|
|
|
+ return 1;
|
|
|
}else {
|
|
|
nb.setProcessState(OrderChangeProcess.CWZJ.getCode());
|
|
|
}
|
|
|
@@ -624,7 +630,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<NewOderCahngeListBo> selectOrderChangeList(String userName,Integer processState,Integer timeType,String startTime,String endTime,
|
|
|
- String deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
|
|
|
+ String deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
|
|
|
Map<String, Object> parameter=new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
@@ -688,12 +694,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
TOrderNew ton=new TOrderNew();
|
|
|
ton.setOrderNo(noc.getOrderNo());
|
|
|
ton.setDeleteSign(2);
|
|
|
+ if(t.getType()==OrderChangeType.KJXY.getCode()){
|
|
|
+ ton.setTotalAmount(t.getTotalAmount());
|
|
|
+ }
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(ton);
|
|
|
TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
if (t.getType()!=OrderChangeType.JBGGT.getCode()){
|
|
|
+ //不是仅合同变更就看营销经理是否存在
|
|
|
if (tOrderNew.getManagerName()!=null){
|
|
|
noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
|
}else {
|
|
|
+ //营销经理不存在判定营销管理员
|
|
|
date.setTime(date.getTime()+500);
|
|
|
addOrderChangeLog("未设置营销经理自动通过", 2, t.getOrderNo(), noc.getId(),date);
|
|
|
List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(tOrderNew.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
|
|
|
@@ -713,12 +724,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
//将所有审核重置
|
|
|
orderExamineMapper.updateByOrderNo(t.getOrderNo(),null,null);
|
|
|
pushZXS(t,date,1);
|
|
|
- }else if(t.getType()==OrderChangeType.ZS.getCode()){
|
|
|
+ }else if(t.getType()==OrderChangeType.ZS.getCode()||t.getType()==OrderChangeType.KJXY.getCode()){
|
|
|
noc.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
}else if(t.getType()==OrderChangeType.JJEBG.getCode()){
|
|
|
noc.setProcessState(OrderChangeProcess.JSZJ.getCode());
|
|
|
}
|
|
|
}else {
|
|
|
+ //不跳过就设置流程未营销管理员
|
|
|
noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
|
|
|
}
|
|
|
|
|
|
@@ -729,7 +741,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
sendNotice(0, t);
|
|
|
pushOrderCangeProcess(noc);
|
|
|
- pushOrderExamine(noc.getOrderNo(),noc.getType());
|
|
|
+ //框架协议不需要设置咨询师审核角色
|
|
|
+ if (t.getType()!=OrderChangeType.KJXY.getCode()){
|
|
|
+ pushOrderExamine(noc.getOrderNo(),noc.getType());
|
|
|
+ }
|
|
|
}else if (changeType==2) {
|
|
|
noc.setCwCost(t.getCwCost());
|
|
|
noc.setRefundableAmount(t.getRefundableAmount());
|