diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index 5d745947a..4556e00e9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -52,8 +52,8 @@ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java index aeaaaaff5..4dcc9a7fe 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java @@ -16,4 +16,6 @@ public class SyncEcCustomerDO { private String followname; private String followmobile; + + private Integer channelId; } 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 a8f1b768f..c70243c05 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 @@ -167,6 +167,9 @@ public class EcSyncServiceImpl implements EcSyncService { if (StringUtil.isEmpty(partnerLine.getInvestmentManager())) { if (StringUtil.isNotEmpty(resultLine.getInvestmentManager())) { resultLine.setId(partnerLine.getId()).setUpdateTime(new Date()); + //沪姨合伙人线索存在黑名单,EC该线索分配跟进人同步到沪姨合伙人但线索状态不变,还存在黑名单中 + resultLine.setLineStatus(partnerLine.getLineStatus().intValue()==LineStatusEnum.BLACKLIST.getCode().intValue() + ?LineStatusEnum.BLACKLIST.getCode():resultLine.getLineStatus()); hyPartnerLineInfoDAO.updateByPrimaryKeySelective(resultLine); } }else { diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index 7104fe0e5..c55d8d105 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -81,4 +81,4 @@ hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb hs.sms.templateCode = SMS_461530041 -ec.baseUrl=http://58.33.58.162:10019 \ No newline at end of file +ec.baseUrl=https://oapi-gateway.shpr.top/basic \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index 60eb43cbe..8bb7797e4 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -74,4 +74,4 @@ xxl.job.executor.logretentiondays = 3 xxl.job.accessToken = -ec.baseUrl=http://58.33.58.162:10019 \ No newline at end of file +ec.baseUrl=https://oapi-gateway.shpr.top/basic \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 977f9efde..23cb1713f 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -83,4 +83,4 @@ xxl.job.executor.logpath = logs/xxl-job/jobhandler xxl.job.executor.logretentiondays = 30 xxl.job.accessToken = -ec.baseUrl=http://58.33.58.162:10019 \ No newline at end of file +ec.baseUrl=http://127.0.0.1:8017 \ No newline at end of file