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

Merge branch 'master' into dev/feat/partner1.5.2_20231121

Browse Source
This commit is contained in:
feng.li
2023-11-15 13:07:31 +08:00
parent b58bc3a9e1 1bc5e6a688
commit 2e4e7daaed
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserChannelMapper.java
View File

@@ -28,4 +28,7 @@ public interface HyPartnerUserChannelMapper {
List<HyPartnerUserChannelDO> getAllUserChannel(); List<HyPartnerUserChannelDO> getAllUserChannel();
List<HyPartnerUserChannelDO> getUserChannelByIds(List<Integer> userChannelIds); List<HyPartnerUserChannelDO> getUserChannelByIds(List<Integer> userChannelIds);
HyPartnerUserChannelDO selectByChannel(@Param("channelId") Long channelId,@Param("channelName") String channelName);
} }

6
coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserChannelMapper.xml
View File

@@ -105,4 +105,10 @@
</if> </if>
</where> </where>
</select> </select>
<select id="selectByChannel" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from hy_partner_user_channel
where channel_id = #{channelId} and channel_name=#{channelName} limit 1
</select>
</mapper> </mapper>

4
coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java
View File

@@ -38,8 +38,8 @@ public class CreateQualifyVerifyReq {
@ApiModelProperty(value = "加盟商类型", required = true) @ApiModelProperty(value = "加盟商类型", required = true)
private KeyText fraType; private KeyText fraType;
@ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {StandardStore: 4.0标准版店铺} 2: {LiteEditionStore: 轻享版店铺}") @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}")
private KeyText franchiseType; private KeyText innerbrandtype;
@ApiModelProperty(value = "请求来源", required = true) @ApiModelProperty(value = "请求来源", required = true)
private KeyText fraSource; private KeyText fraSource;

4
coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java
View File

@@ -61,8 +61,8 @@ public class RpcCreateQualifyVerifyReq {
@ApiModelProperty(value = "加盟商类型", required = true) @ApiModelProperty(value = "加盟商类型", required = true)
private KeyText fraType; private KeyText fraType;
@ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {StandardStore: 4.0标准版店铺} 2: {LiteEditionStore: 轻享版店铺}") @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}")
private KeyText franchiseType; private KeyText innerbrandtype;
@ApiModelProperty(value = "意向人email", required = true) @ApiModelProperty(value = "意向人email", required = true)
private String intendedEmail; private String intendedEmail;

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

@@ -127,7 +127,7 @@ public class EcSyncServiceImpl implements EcSyncService {
UserSourceResponse userSourceResponse = JSONObject.parseObject(s, UserSourceResponse.class); UserSourceResponse userSourceResponse = JSONObject.parseObject(s, UserSourceResponse.class);
for (UserSourceResponse.ChannelSource channelSource : userSourceResponse.getData()) { for (UserSourceResponse.ChannelSource channelSource : userSourceResponse.getData()) {
Long id = channelSource.getId(); Long id = channelSource.getId();
HyPartnerUserChannelDO selectByChannel = hyPartnerUserChannelMapper.selectByChannelId(id); HyPartnerUserChannelDO selectByChannel = hyPartnerUserChannelMapper.selectByChannel(id,channelSource.getName());
HyPartnerUserChannelDO hyPartnerUserChannel = new HyPartnerUserChannelDO(); HyPartnerUserChannelDO hyPartnerUserChannel = new HyPartnerUserChannelDO();
hyPartnerUserChannel.setChannelId(channelSource.getId()).setChannelName(channelSource.getName()); hyPartnerUserChannel.setChannelId(channelSource.getId()).setChannelName(channelSource.getName());
//有就更新 没有插入 //有就更新 没有插入