|
|
@@ -281,18 +281,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
userMapper.updateShareType(tn.getBuyerId(),tn.getSalesmanId());
|
|
|
}
|
|
|
//判定用户最后签单时间
|
|
|
- List<TOrderNewBo> tOrderNewBos = tOrderNewMapper.selectByuidandAid(tn.getBuyerId(), tn.getSalesmanId());
|
|
|
- Date lastSigningTime=tn.getSignTime();
|
|
|
- if (!tOrderNewBos.isEmpty()){
|
|
|
- for (TOrderNewBo e : tOrderNewBos) {
|
|
|
- if (e.getSignTime().getTime()>lastSigningTime.getTime()){
|
|
|
- lastSigningTime = e.getSignTime();
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- User u=new User();
|
|
|
- u.setId(tn.getBuyerId());
|
|
|
-
|
|
|
+ pushSignTime(tn);
|
|
|
//未锁定业务就锁定业务
|
|
|
if (userLockReleaseMapper.checkLock(tn.getSalesmanId(),tn.getBuyerId(),t.getCommodityId())<1) {
|
|
|
UserLockRelease ulr=new UserLockRelease();
|
|
|
@@ -326,6 +315,21 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
publicReleaseMapper.updateSignByAidAndUid(tn.getBuyerId(),tn.getSalesmanId());
|
|
|
}
|
|
|
|
|
|
+ private void pushSignTime(TOrderNew tn) {
|
|
|
+ List<TOrderNewBo> tOrderNewBos = tOrderNewMapper.selectByuidandAid(tn.getBuyerId(), tn.getSalesmanId());
|
|
|
+ Date lastSigningTime= tn.getSignTime();
|
|
|
+ if (!tOrderNewBos.isEmpty()){
|
|
|
+ for (TOrderNewBo e : tOrderNewBos) {
|
|
|
+ if (e.getSignTime().getTime()>lastSigningTime.getTime()){
|
|
|
+ lastSigningTime = e.getSignTime();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ User u=new User();
|
|
|
+ u.setId(tn.getBuyerId());
|
|
|
+ u.setSignTime(lastSigningTime);
|
|
|
+ userMapper.updateByPrimaryKeySelective(u);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
private void addtaskAttributionLog(Integer taskId, String taskReceiverId, String remarks, Integer type, Date date) {
|