Browse Source

Merge branch 'test'

anderx 3 years ago
parent
commit
802d349527

+ 1 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1208,6 +1208,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			uList = Arrays.asList(uid.split(","));
 		}
 		user.setId(uid);
+		user.setTransferTime(now);
 		int flag = 0;
 		//领取
 		if (AFTConstants.USER_RECEIVE.equals(operatorType)) {
@@ -1215,7 +1216,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
 			user.setInformationMaintainer(TokenManager.getAdminId());
 			user.setSource(2);// 客户来源设置为领取
-			user.setTransferTime(now);
 			flag = addUserLock(uid, TokenManager.getAdminId(), now, uList); // 指定用户锁定客户
 			addUserTransferLog(uid, TokenManager.getAdminId(), null,1, null, now, uList);
 			updateUserMid(aid,uid,0,null);

+ 1 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -434,7 +434,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				np.setAid(s);
 				np.setStatus(2);
 				np.setType(3);
-				np.setMainId(use.getMainId());
+				np.setMainId(use.getId());
 				np.setId(null);
 				publicReleaseMapper.insertSelective(np);
 				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(u.getUsername()).append("]。");