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

Merge branch 'master' into dev/feat/partner1.1_20230727

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
This commit is contained in:
xiaodong.hu
2023-07-27 20:02:41 +08:00
parent 1884bae01c 4eed12c61f
commit 0669c4ad2d
4 changed files with 8 additions and 8 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

@@ -78,7 +78,7 @@
GROUP BY 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 ( a.create_time BETWEEN #{selectTime} and #{now} or 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}
</select> </select>
<select id="selectByHourDateCount" resultType="java.lang.Integer"> <select id="selectByHourDateCount" resultType="java.lang.Integer">
SELECT SELECT
@@ -100,7 +100,7 @@
GROUP BY 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 (a.create_time BETWEEN #{selectTime} and #{now} or WHERE (a.create_time BETWEEN #{selectTime} and #{now} or
a.update_time BETWEEN #{selectTime} and #{now} ) a.update_time BETWEEN #{selectTime} and #{now} ) and a.username is not null
</select> </select>
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true"> <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">

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

@@ -80,4 +80,6 @@ public class HyPartnerLineInfoDO implements Serializable {
@ApiModelProperty("移除黑名单原因") @ApiModelProperty("移除黑名单原因")
private String removeBlackReason; private String removeBlackReason;
@ApiModelProperty("hy_partner_user_channel.channel_id")
private Integer userChannelId;
} }

1
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
View File

@@ -71,5 +71,6 @@ public class HyPartnerUserInfoDO implements Serializable {
@ApiModelProperty("推荐加盟商手机号") @ApiModelProperty("推荐加盟商手机号")
private String recommendPartnerMobile; private String recommendPartnerMobile;
@ApiModelProperty("hy_partner_user_channel.channel_id")
private Integer userChannelId; private Integer userChannelId;
} }

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

@@ -114,14 +114,11 @@ public class EcSyncServiceImpl implements EcSyncService {
HyPartnerUserChannelDO hyPartnerUserChannelDO = hyPartnerUserChannelMapper.selectByChannelName(channel); HyPartnerUserChannelDO hyPartnerUserChannelDO = hyPartnerUserChannelMapper.selectByChannelName(channel);
Long channelId =null; Long channelId =null;
if (StringUtil.isNotEmpty(channel)) { if (StringUtil.isNotEmpty(channel)) {
if (ObjectUtil.isNull(hyPartnerUserChannelDO)||ObjectUtil.isNull(hyPartnerUserChannelDO.getId())) { if (ObjectUtil.isNull(hyPartnerUserChannelDO)||ObjectUtil.isNull(hyPartnerUserChannelDO.getChannelId())) {
getChannelSource(); 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(); String newPartnerId = UUIDUtils.get32UUID();
HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO(); HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO();