|
|
@@ -133,7 +133,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (a==null||a.getId()==null) {
|
|
|
throw new BusinessException(new Error("分配人员不存在!","分配人员不存在!"));
|
|
|
}
|
|
|
- checkProjiectAllocation(t.getOrderNo());
|
|
|
if (type==0) {
|
|
|
addOrderLog(t.getOrderNo(), OrderLogProcess.XMDDPD.getCode(),remarks);
|
|
|
t.setManagerId(taskReceiverId);
|
|
|
@@ -143,18 +142,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
//未锁定客户就锁定客户
|
|
|
pushUser(t, tn, date);
|
|
|
//处理客户已派项目
|
|
|
- UserMid um=new UserMid();
|
|
|
- String taskNames=userMidMapper.getUserTaskNames(tn.getBuyerId());
|
|
|
- UserMid use=userMidMapper.getUserDtails(tn.getBuyerId());
|
|
|
- um.setUid(tn.getBuyerId());
|
|
|
- um.setTaskNames(taskNames);
|
|
|
- um.setLastSigningTime(tn.getCreateTime());
|
|
|
- um.setLastSalesType(tn.getSalesType());
|
|
|
- um.setFirstSigningTime(use.getFirstSigningTime());
|
|
|
- um.setSignAmount(use.getSignAmount());
|
|
|
- um.setSignNumber(use.getSignNumber());
|
|
|
-
|
|
|
- userMidMapper.updateByUid(um);
|
|
|
+ projectDistributionPushUserMid(tn);
|
|
|
}else if(type==1) {
|
|
|
t.setManagerId(taskReceiverId);
|
|
|
t.setConsultantId(null);
|
|
|
@@ -171,10 +159,26 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
aids.add(taskReceiverId);
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_TASK_TO.getCode(),order, TokenManager.getAdminId(),0,taskId);
|
|
|
-
|
|
|
+ checkProjiectAllocation(t.getOrderNo());
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ private void projectDistributionPushUserMid(TOrderNew tn) {
|
|
|
+ if (tn.getProcessStatus()==4){
|
|
|
+ UserMid um=new UserMid();
|
|
|
+ String taskNames=userMidMapper.getUserTaskNames(tn.getBuyerId());
|
|
|
+ UserMid use=userMidMapper.getUserDtails(tn.getBuyerId());
|
|
|
+ um.setUid(tn.getBuyerId());
|
|
|
+ um.setTaskNames(taskNames);
|
|
|
+ um.setLastSigningTime(tn.getCreateTime());
|
|
|
+ um.setLastSalesType(tn.getSalesType());
|
|
|
+ um.setFirstSigningTime(use.getFirstSigningTime());
|
|
|
+ um.setSignAmount(use.getSignAmount().add(tn.getTotalAmount()));
|
|
|
+ um.setSignNumber(use.getSignNumber()+1);
|
|
|
+ userMidMapper.updateByUid(um);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 推动客户、业务渠道的锁定
|