|
|
@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
+import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.dao.OrganizationContactBookMapper;
|
|
|
import com.goafanti.common.dao.OrganizationIdentityMapper;
|
|
|
import com.goafanti.common.dao.TOrderBonusMapper;
|
|
|
@@ -84,6 +85,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
public int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially) {
|
|
|
TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(taskId);
|
|
|
+ checkDeleteSign(t.getOrderNo());
|
|
|
t.setTaskStatus(TaskState.DISTRIBUTION.getCode());
|
|
|
t.setTaskAllocator(TokenManager.getAdminId());
|
|
|
t.setTaskReceiver(taskReceiverId);
|
|
|
@@ -100,6 +102,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
return 1;
|
|
|
}
|
|
|
+ private TOrderNew checkDeleteSign(String orderNo) {
|
|
|
+ TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
|
|
|
+ return t;
|
|
|
+ }
|
|
|
public void addOrderLog(String orderNo, Integer code) {
|
|
|
TOrderLog tl=new TOrderLog();
|
|
|
tl.setOrderNo(orderNo);
|
|
|
@@ -165,6 +172,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Transactional
|
|
|
public int updateOrderTask(TOrderTaskDetailBo t) {
|
|
|
TOrderTask task=new TOrderTask();
|
|
|
+ TOrderNew tn=checkDeleteSign(t.getOrderNo());
|
|
|
task.setAttachmentUrl(t.getAttachmentUrl());
|
|
|
task.setId(Integer.valueOf(t.getId()));
|
|
|
task.setTaskStatus(t.getTaskStatus());
|
|
|
@@ -182,7 +190,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
task.setSetUpAmount(t.getSetUpAmount());
|
|
|
task.setOutsourceName(t.getOutsourceName());
|
|
|
if(StringUtils.isNotBlank(t.getOutsourcePrice()))task.setOutsourcePrice(new BigDecimal(t.getOutsourcePrice()));
|
|
|
- TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
|
|
|
//根据修改的修改订单法人与联系人
|
|
|
if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());
|
|
|
if(StringUtils.isNotEmpty(t.getContactMobile())) tn.setContactMobile(t.getContactMobile());
|