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

Merge branch 'hxd/feat/ecSync' into cc_20230520_partner

Browse Source
This commit is contained in:
xiaodong.hu
2023-06-29 16:38:38 +08:00
parent cf8ac81632 6aa4bbd61d
commit f73d231d7f
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
View File

@@ -52,8 +52,8 @@
</where>
</select>
<select id="selectByHourDate" resultType="com.cool.store.entity.SyncEcCustomerDO" >
SELECT a.id as id, a.username as customername,a.mobile as customermobile,c.`name` as followname,c.mobile as followmobile FROM hy_partner_user_info a LEFT join hy_partner_line_info b on
a.partner_id=b.partner_id left join enterprise_user c on b.investment_manager=c.user_id
SELECT a.id as id, a.username as customername,a.mobile as customermobile,c.`name` as followname,c.mobile as followmobile ,d.channel_id as channelId FROM hy_partner_user_info a LEFT join hy_partner_line_info b on
a.partner_id=b.partner_id left join enterprise_user c on b.investment_manager=c.user_id LEFT join hy_partner_user_channel d on b.user_channel_id=d.id
WHERE a.create_time BETWEEN #{selectTime} and #{now} or
a.update_time BETWEEN #{selectTime} and #{now} order by a.id Limit #{limit1},#{limit2}
</select>

2
coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java
View File

@@ -16,4 +16,6 @@ public class SyncEcCustomerDO {
private String followname;
private String followmobile;
private Integer channelId;
}

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

@@ -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 {

2
coolstore-partner-webb/src/main/resources/application-ab.properties
View File

@@ -81,4 +81,4 @@ hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb
hs.sms.templateCode = SMS_461530041
ec.baseUrl=http://58.33.58.162:10019
ec.baseUrl=https://oapi-gateway.shpr.top/basic

2
coolstore-partner-webb/src/main/resources/application-dev.properties
View File

@@ -74,4 +74,4 @@ xxl.job.executor.logretentiondays = 3
xxl.job.accessToken =
ec.baseUrl=http://58.33.58.162:10019
ec.baseUrl=https://oapi-gateway.shpr.top/basic

2
coolstore-partner-webb/src/main/resources/application-local.properties
View File

@@ -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
ec.baseUrl=http://127.0.0.1:8017