diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
index 6e6b4459c..bd7380f2a 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
@@ -78,7 +78,7 @@
GROUP BY
partner_id ) tl_l on b.partner_id=tl_l.partner_id
WHERE ( a.create_time BETWEEN #{selectTime} and #{now} or
- a.update_time BETWEEN #{selectTime} and #{now} ) order by a.id Limit #{limit1},#{limit2}
+ a.update_time BETWEEN #{selectTime} and #{now} ) and a.username is not null order by a.id Limit #{limit1},#{limit2}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
index e6ff6ce8a..b590f2f48 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
@@ -80,4 +80,6 @@ public class HyPartnerLineInfoDO implements Serializable {
@ApiModelProperty("移除黑名单原因")
private String removeBlackReason;
+ @ApiModelProperty("hy_partner_user_channel.channel_id")
+ private Integer userChannelId;
}
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
index b770bc746..6302f7cd7 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
@@ -71,5 +71,6 @@ public class HyPartnerUserInfoDO implements Serializable {
@ApiModelProperty("推荐加盟商手机号")
private String recommendPartnerMobile;
+ @ApiModelProperty("hy_partner_user_channel.channel_id")
private Integer userChannelId;
}
\ No newline at end of file
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 c86e12600..117e4440d 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
@@ -114,14 +114,11 @@ public class EcSyncServiceImpl implements EcSyncService {
HyPartnerUserChannelDO hyPartnerUserChannelDO = hyPartnerUserChannelMapper.selectByChannelName(channel);
Long channelId =null;
if (StringUtil.isNotEmpty(channel)) {
- if (ObjectUtil.isNull(hyPartnerUserChannelDO)||ObjectUtil.isNull(hyPartnerUserChannelDO.getId())) {
+ if (ObjectUtil.isNull(hyPartnerUserChannelDO)||ObjectUtil.isNull(hyPartnerUserChannelDO.getChannelId())) {
getChannelSource();
- HyPartnerUserChannelDO channelDO = hyPartnerUserChannelMapper.selectByChannelName(channel);
- channelId=channelDO.getChannelId();
- }else {
- HyPartnerUserChannelDO channelDO = hyPartnerUserChannelMapper.selectByChannelName(channel);
- channelId=channelDO.getChannelId();
}
+ HyPartnerUserChannelDO channelDO = hyPartnerUserChannelMapper.selectByChannelName(channel);
+ channelId=channelDO.getChannelId();
}
String newPartnerId = UUIDUtils.get32UUID();
HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO();