From af363be783b76cb08fe711190c4463fd48f13f73 Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Fri, 1 Sep 2023 17:36:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8E=88=E6=9D=83=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E7=BA=BF=E7=B4=A2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=90=8C=E6=AD=A5=E5=88=B0ec?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HyPartnerUserInfoMapper.xml | 83 ++++++++++--------- .../store/service/impl/EcSyncServiceImpl.java | 64 +++++++++----- 2 files changed, 88 insertions(+), 59 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index aded113d2..4142e993f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -53,42 +53,25 @@ - - SELECT - count(*) + a.id AS id, + b.partner_id, + b.username AS customername, + b.mobile AS customermobile, + d.`name` AS followname, + d.mobile AS followmobile, + a.line_status AS lineStatus, + c.channel_id AS channelId, + ifnull( tl_l.followCount, 0 ) AS followCount FROM - hy_partner_user_info a - LEFT JOIN hy_partner_line_info b ON a.partner_id = b.partner_id and b.deleted=0 - LEFT JOIN hy_partner_user_channel c ON a.user_channel_id = c.channel_id - LEFT JOIN enterprise_user d ON b.investment_manager = d.user_id and d.deleted=0 - LEFT JOIN ( + hy_partner_line_info a + LEFT JOIN hy_partner_user_info b ON a.partner_id = b.partner_id + AND a.deleted = 0 + LEFT JOIN hy_partner_user_channel c ON b.user_channel_id = c.channel_id + LEFT JOIN enterprise_user d ON a.investment_manager = d.user_id + AND d.deleted = 0 + LEFT JOIN ( SELECT partner_id, IFNULL( COUNT( 1 ), 0 ) AS followCount @@ -98,9 +81,35 @@ ( deleted = 1 OR ( deleted = 0 AND line_status IN ( 0, 3 ) AND close_time IS NOT NULL ) ) AND investment_manager IS NOT NULL GROUP BY - partner_id ) tl_l on b.partner_id=tl_l.partner_id + partner_id + ) tl_l ON b.partner_id = tl_l.partner_id + WHERE ( b.update_time BETWEEN #{selectTime} and #{now} or + a.update_time BETWEEN #{selectTime} and #{now} ) and b.partner_id is not null order by a.id Limit #{limit1},#{limit2} + + @@ -153,7 +162,7 @@ recommend_partner_mobile, - + user_channel_id, 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 fb273e541..df71f7a3d 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 @@ -9,6 +9,7 @@ import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.HyPartnerBaseInfoDAO; import com.cool.store.dao.HyPartnerLineInfoDAO; import com.cool.store.dao.HyPartnerUserInfoDAO; +import com.cool.store.dto.partner.LineCountDTO; import com.cool.store.entity.*; import com.cool.store.enums.LineStatusEnum; import com.cool.store.enums.WorkflowStageEnum; @@ -33,9 +34,11 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.io.IOException; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -174,25 +177,28 @@ public class EcSyncServiceImpl implements EcSyncService { hyPartnerLineInfoDAO.updateByPrimaryKeySelective(resultLine); } }else { - EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(partnerLine.getInvestmentManager()); - enterpriseUser.setMobile(getNoWith86Number(enterpriseUser.getMobile())); - //电话相同但是名字不同 - if (enterpriseUser.getMobile().equals(followUserMobile) && !enterpriseUser.getName().equals(followUserName)) { - ChangeFollowUserRequest changeFollowUserRequest = new ChangeFollowUserRequest(); - ChangeFollowUserBo changeFollowUserBo = new ChangeFollowUserBo(); - changeFollowUserBo.setFollowUserId(customerInfoItem.getLastFollowUserId()).setCrmId(customerInfoItem.getCrmId()) - .setType(1).setUsername(enterpriseUser.getName()).setMobile(enterpriseUser.getMobile()); - changeFollowUserRequest.setParameter(changeFollowUserBo); - ChangeFollowUserResponse changeFollowUserExec = ecClient.exec(baseUrl,changeFollowUserRequest); - } - //电话不同 - if (!enterpriseUser.getMobile().equals(followUserMobile)) { - ChangeFollowUserRequest changeFollowUserRequest = new ChangeFollowUserRequest(); - ChangeFollowUserBo changeFollowUserBo = new ChangeFollowUserBo(); - changeFollowUserBo.setFollowUserId(customerInfoItem.getLastFollowUserId()).setCrmId(customerInfoItem.getCrmId()) - .setType(2).setUsername(enterpriseUser.getName()).setMobile(enterpriseUser.getMobile()); - changeFollowUserRequest.setParameter(changeFollowUserBo); - ChangeFollowUserResponse changeFollowUserExec = ecClient.exec(baseUrl,changeFollowUserRequest); + if (!getFollowLineStatus(partnerLine)) { + //私海 + EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(partnerLine.getInvestmentManager()); + enterpriseUser.setMobile(getNoWith86Number(enterpriseUser.getMobile())); + //电话相同但是名字不同 + if (enterpriseUser.getMobile().equals(followUserMobile) && !enterpriseUser.getName().equals(followUserName)) { + ChangeFollowUserRequest changeFollowUserRequest = new ChangeFollowUserRequest(); + ChangeFollowUserBo changeFollowUserBo = new ChangeFollowUserBo(); + changeFollowUserBo.setFollowUserId(customerInfoItem.getLastFollowUserId()).setCrmId(customerInfoItem.getCrmId()) + .setType(1).setUsername(enterpriseUser.getName()).setMobile(enterpriseUser.getMobile()); + changeFollowUserRequest.setParameter(changeFollowUserBo); + ChangeFollowUserResponse changeFollowUserExec = ecClient.exec(baseUrl, changeFollowUserRequest); + } + //电话不同 + if (!enterpriseUser.getMobile().equals(followUserMobile)) { + ChangeFollowUserRequest changeFollowUserRequest = new ChangeFollowUserRequest(); + ChangeFollowUserBo changeFollowUserBo = new ChangeFollowUserBo(); + changeFollowUserBo.setFollowUserId(customerInfoItem.getLastFollowUserId()).setCrmId(customerInfoItem.getCrmId()) + .setType(2).setUsername(enterpriseUser.getName()).setMobile(enterpriseUser.getMobile()); + changeFollowUserRequest.setParameter(changeFollowUserBo); + ChangeFollowUserResponse changeFollowUserExec = ecClient.exec(baseUrl, changeFollowUserRequest); + } } } //base表 @@ -223,12 +229,26 @@ public class EcSyncServiceImpl implements EcSyncService { } } - public static void main(String[] args) { - Integer a=null; - System.out.println(a.equals("bb")); + /** + *招商公海内跟进次数大于等于1的用户EC同步该用户进去公海,假若跟进次数为0的同步到EC跟进人就是唐佑玉 + * @param partnerLine + * @return true为公海 false:私海 + */ + public Boolean getFollowLineStatus(HyPartnerLineInfoDO partnerLine){ + if(partnerLine.getLineStatus()!=0){ + return Boolean.FALSE; + } + ArrayList list = new ArrayList<>(); + list.add(partnerLine.getPartnerId()); + List followCountList = hyPartnerLineInfoDAO.getFollowCountList(list); + if (!CollectionUtils.isEmpty(followCountList)) { + return followCountList.get(0).getFollowCount()>0; + } + return Boolean.FALSE; } + /** * 得到不带86开头的号码 *