Browse Source

update

Signed-off-by: anderx <anderx@qq.com>
anderx 5 years ago
parent
commit
bcdc4c3f44

+ 1 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -180,7 +180,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if (userMapper.checkLock(tn.getBuyerId())<1) {
 				userMapper.updateShareType(tn.getBuyerId(),tn.getSalesmanId());
 			}
-			if (userLockReleaseMapper.checkLock(taskReceiverId,tn.getBuyerId(),t.getCommodityId())<1) {
+			if (userLockReleaseMapper.checkLock(tn.getSalesmanId(),tn.getBuyerId(),t.getCommodityId())<1) {
 				UserLockRelease ulr=new UserLockRelease();
 				ulr.setId(UUID.randomUUID().toString());
 				ulr.setBusinessProjectId(t.getCommodityId());
@@ -191,7 +191,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				ulr.setLockTime(date);
 				userLockReleaseMapper.insertSelective(ulr);
 			}
-			if (userBusinessMapper.checkLock(taskReceiverId,tn.getBuyerId(),t.getCommodityId())<1) {
 				UserBusiness ub=new UserBusiness();
 				ub.setId(UUID.randomUUID().toString());
 				ub.setUid(tn.getBuyerId());
@@ -203,7 +202,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				ub.setRemarks("派单自动锁定客户");
 				ub.setBusinessProjectId(t.getCommodityId());
 				userBusinessMapper.insertSelective(ub);
-			}
 		}else if (specially==0) {
 			addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode(),remarks);
 			t.setConsultantId(taskReceiverId);