diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index 4556e00e9..bf8536c1c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -52,16 +52,16 @@ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java index dfaf30931..0345e5d11 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java @@ -70,7 +70,6 @@ public class EcSyncServiceImpl implements EcSyncService { public boolean ecToApplet(List queryListData) { for (CustomerInfoRequest customerInfoItem : queryListData) { try { - Thread.sleep(500L); insertSelectiveSync(customerInfoItem); } catch (Exception e) { e.printStackTrace(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java index 8f7c5aa53..ca44812f5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java @@ -206,6 +206,7 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { // 把旧线索的身份证号置空,状态改为待提交 HyPartnerBaseInfoDO oldBaseInfo = hyPartnerBaseInfoDAO.getByIdCard(idCard); HyPartnerLineInfoDO oldLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(oldBaseInfo.getPartnerLineId()); + HyPartnerUserInfoDO oldPartnerUser = hyPartnerUserInfoDAO.selectByPartnerId(oldBaseInfo.getPartnerId()); // 该身份证当前申请状态同步至该账号下,原账号变为【加盟意向申请 待提交状态】 HyPartnerLineInfoDO newLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); Long newLindId = newLineInfo.getId(); @@ -230,8 +231,15 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { hyPartnerUserInfoDO.setUsername(oldBaseInfo.getUsername()); hyPartnerUserInfoDO.setWantShopArea(oldIntentInfo.getWantShopArea()); hyPartnerUserInfoDO.setAcceptAdjustType(oldIntentInfo.getAcceptAdjustType()); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); + } + hyPartnerUserInfoDO.setRecommendPartnerId(oldPartnerUser.getRecommendPartnerId()); + hyPartnerUserInfoDO.setRecommendPartnerName(oldPartnerUser.getRecommendPartnerName()); + hyPartnerUserInfoDO.setRecommendPartnerMobile(oldPartnerUser.getRecommendPartnerMobile()); + hyPartnerUserInfoDO.setShopCode(oldPartnerUser.getShopCode()); + hyPartnerUserInfoDO.setShopName(oldPartnerUser.getShopName()); + hyPartnerUserInfoDO.setShopId(oldPartnerUser.getShopId()); + hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); // 老的身份证信息置空 fillBaseInfoIdCard(oldBaseInfo, null, null, null, null, null, null, null, null, null); oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode()));