Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828

This commit is contained in:
xiaodong.hu
2023-08-24 18:45:58 +08:00

View File

@@ -147,6 +147,11 @@ public class EcSyncServiceImpl implements EcSyncService {
EcClient ecClient=new EcClient(); EcClient ecClient=new EcClient();
//有就更新ec没有就插入 //有就更新ec没有就插入
if (newUserInfo != null) { if (newUserInfo != null) {
//招商客户姓名为空
if (StringUtil.isEmpty(newUserInfo.getUsername())) {
newUserInfo.setUsername(newUserInfo.getUsername());
hyPartnerUserInfoDAO.updateByPrimaryKeySelective(newUserInfo);
}
// EC与沪姨合伙人同时存在的线索用户但用户姓名不同将沪姨合伙人线索姓名同步至EC覆盖原EC线索姓名 // EC与沪姨合伙人同时存在的线索用户但用户姓名不同将沪姨合伙人线索姓名同步至EC覆盖原EC线索姓名
if (!newUserInfo.getUsername().equals(resultUser.getUsername())) { if (!newUserInfo.getUsername().equals(resultUser.getUsername())) {
UpdateCustomerRequest updateUserRequest=new UpdateCustomerRequest(); UpdateCustomerRequest updateUserRequest=new UpdateCustomerRequest();