|
|
@@ -172,31 +172,34 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
//处理客户已派项目
|
|
|
projectDistributionPushUserMid(tn);
|
|
|
//处理限定项目状态
|
|
|
- RestrictProject use = restrictProjectMapper.selectByParam(new InputRestrictProject(tn.getBuyerId(), null, t.getCommodityId()));
|
|
|
- if (use!=null){
|
|
|
- RestrictProject newRP=new RestrictProject();
|
|
|
- newRP.setId(use.getId());
|
|
|
- newRP.setLockTime(date);
|
|
|
- newRP.setType(2);
|
|
|
- if (!use.getAid().equals(tn.getSalesmanId())){
|
|
|
+ BusinessProject businessProject = businessProjectMapper.selectByPrimaryKey(t.getCommodityId());
|
|
|
+ if (businessProject.getRestrictStatus()==1){
|
|
|
+ RestrictProject use = restrictProjectMapper.selectByParam(new InputRestrictProject(tn.getBuyerId(), null, t.getCommodityId()));
|
|
|
+ if (use!=null){
|
|
|
+ RestrictProject newRP=new RestrictProject();
|
|
|
+ newRP.setId(use.getId());
|
|
|
+ newRP.setLockTime(date);
|
|
|
+ newRP.setType(2);
|
|
|
+ if (!use.getAid().equals(tn.getSalesmanId())){
|
|
|
+ newRP.setAid(tn.getSalesmanId());
|
|
|
+ }
|
|
|
+ restrictProjectMapper.updateByPrimaryKeySelective(newRP);
|
|
|
+ UserTransferLog log=new UserTransferLog();
|
|
|
+ log.setAid(use.getAid());
|
|
|
+ log.setUid(use.getUid());
|
|
|
+ log.setPid(use.getPid());
|
|
|
+ log.setType(20);
|
|
|
+ log.setRemarks("签单触发锁定限时项目");
|
|
|
+ userTransferLogMapper.insertSelective(log);
|
|
|
+ } else {
|
|
|
+ RestrictProject newRP=new RestrictProject();
|
|
|
+ newRP.setUid(tn.getBuyerId());
|
|
|
newRP.setAid(tn.getSalesmanId());
|
|
|
+ newRP.setPid(t.getCommodityId());
|
|
|
+ newRP.setLockTime(date);
|
|
|
+ newRP.setType(2);
|
|
|
+ restrictProjectMapper.insertSelective(newRP);
|
|
|
}
|
|
|
- restrictProjectMapper.updateByPrimaryKeySelective(newRP);
|
|
|
- UserTransferLog log=new UserTransferLog();
|
|
|
- log.setAid(use.getAid());
|
|
|
- log.setUid(use.getUid());
|
|
|
- log.setPid(use.getPid());
|
|
|
- log.setType(20);
|
|
|
- log.setRemarks("签单触发锁定限时项目");
|
|
|
- userTransferLogMapper.insertSelective(log);
|
|
|
- } else {
|
|
|
- RestrictProject newRP=new RestrictProject();
|
|
|
- newRP.setUid(tn.getBuyerId());
|
|
|
- newRP.setAid(tn.getSalesmanId());
|
|
|
- newRP.setPid(t.getCommodityId());
|
|
|
- newRP.setLockTime(date);
|
|
|
- newRP.setType(2);
|
|
|
- restrictProjectMapper.insertSelective(newRP);
|
|
|
}
|
|
|
}else if(type==1) {
|
|
|
t.setManagerId(taskReceiverId);
|