suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hxd/fix/partner_ec_20240123' into dev/feat/partner1.6_20231226

Browse Source
This commit is contained in:
xiaodong.hu
2024-01-30 11:32:55 +08:00
parent b8ba6f6c99 acfa08165c
commit 1816fdca39
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
View File

@@ -291,15 +291,16 @@ public class EcSyncServiceImpl implements EcSyncService {
//base表 //base表
HyPartnerBaseInfoDO partnerIdAndLine = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(partnerLine.getPartnerId(), partnerLine.getId()); HyPartnerBaseInfoDO partnerIdAndLine = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(partnerLine.getPartnerId(), partnerLine.getId());
if (partnerIdAndLine == null) { if (partnerIdAndLine == null) {
resultBase.setPartnerId(newPartnerId).setPartnerLineId(partnerLine.getId()).setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())). resultBase.setPartnerId(oldPartnerId).setPartnerLineId(partnerLine.getId()).setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())).
setCreateTime(time).setUpdateTime(time); setCreateTime(time).setUpdateTime(time);
hyPartnerBaseInfoDAO.insertSelective(resultBase); hyPartnerBaseInfoDAO.insertSelective(resultBase);
} else { } else {
//标签共有 取并集 更改用户画像 //标签共有 取并集 更改用户画像
updateUserPortrait(partnerIdAndLine, partnerIdAndLine.getUserPortrait(), resultBase.getUserPortrait()); updateUserPortrait(partnerIdAndLine, partnerIdAndLine.getUserPortrait(), resultBase.getUserPortrait());
} }
} else { }
insertUserInfo(sendUserMap, newPartnerId, resultBase, resultUser, time, resultLine); else {
insertUserInfo(sendUserMap, oldPartnerId, resultBase, resultUser, time, resultLine);
} }
newUserInfo.setEcWantShopArea(resultUser.getEcWantShopArea()); newUserInfo.setEcWantShopArea(resultUser.getEcWantShopArea());
//添加ec意向区域同步 //添加ec意向区域同步