接口加密,分销
This commit is contained in:
1 parent
30176e7268
commit
c52bbc1a2c
15 files changed
+347
-19
No files matched your search
+9
-5
@@ -38,8 +38,8 @@ import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.BROKERAGE_C
|
||||
@Validated
|
||||
public class BrokerageCodeServiceImpl implements BrokerageCodeService {
|
||||
|
||||
/** v3:海报图印 trade_brokerage_code.code(不再用 member_user.user_code) */
|
||||
private static final String POSTER_VERSION_MARKER = "#poster-v3-code";
|
||||
/** v4:邀请链接改为 /invite.html?code=&userId=,二维码同步刷新 */
|
||||
private static final String POSTER_VERSION_MARKER = "#poster-v4-invite-html";
|
||||
|
||||
private static final String BROKERAGE_CODE_GENERATE_LOCK_KEY = "trade:brokerage-code:generate:";
|
||||
|
||||
@@ -152,8 +152,7 @@ public class BrokerageCodeServiceImpl implements BrokerageCodeService {
|
||||
if (ObjectUtil.isNotEmpty(user)) {
|
||||
userAvatar = user.getAvatar();
|
||||
}
|
||||
String posterUrl = ObjectUtil.isNotEmpty(currentCode.getUrl())
|
||||
? currentCode.getUrl() : generatePosterUrl(currentCode.getCode(), userId);
|
||||
String posterUrl = generatePosterUrl(currentCode.getCode(), userId);
|
||||
String posterPic = generatePosterPic(userAvatar, posterCode, posterUrl);
|
||||
if (ObjectUtil.isEmpty(posterPic)) {
|
||||
return currentCode;
|
||||
@@ -232,7 +231,12 @@ public class BrokerageCodeServiceImpl implements BrokerageCodeService {
|
||||
}
|
||||
|
||||
private String generatePosterUrl(String code, Long userId) {
|
||||
return brokerageConfiguration.getDownloadUrl() + "?code=" + code + "&userId=" + userId;
|
||||
String base = brokerageConfiguration.getDownloadUrl();
|
||||
if (base != null && base.endsWith("/")) {
|
||||
base = base.substring(0, base.length() - 1);
|
||||
}
|
||||
// 格式:http://download.htysapp.com/invite.html?code=569876&userId=90
|
||||
return base + "/invite.html?code=" + code + "&userId=" + userId;
|
||||
}
|
||||
|
||||
}
|
||||
+6
-6
@@ -84,9 +84,9 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService {
|
||||
return;
|
||||
}
|
||||
|
||||
// 1.1 获得一级推广人
|
||||
// 1.1 获得一级推广人(人人分销:只要绑定了上级即可分佣,不校验上级推广员开关)
|
||||
BrokerageUserDO firstUser = brokerageUserService.getBindBrokerageUser(userId);
|
||||
if (firstUser == null || !BooleanUtil.isTrue(firstUser.getBrokerageEnabled())) {
|
||||
if (firstUser == null) {
|
||||
return;
|
||||
}
|
||||
// 1.2 计算一级分佣
|
||||
@@ -98,7 +98,7 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService {
|
||||
return;
|
||||
}
|
||||
BrokerageUserDO secondUser = brokerageUserService.getBrokerageUser(firstUser.getBindUserId());
|
||||
if (secondUser == null || !BooleanUtil.isTrue(secondUser.getBrokerageEnabled())) {
|
||||
if (secondUser == null) {
|
||||
return;
|
||||
}
|
||||
// 2.2 计算二级分佣
|
||||
@@ -124,9 +124,9 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService {
|
||||
return;
|
||||
}
|
||||
|
||||
// 1.1 获得一级推广人
|
||||
// 1.1 获得一级推广人(人人分销:只要绑定了上级即可分佣,不校验上级推广员开关)
|
||||
BrokerageUserDO firstUser = brokerageUserService.getBindBrokerageUser(userId);
|
||||
if (firstUser == null || !BooleanUtil.isTrue(firstUser.getBrokerageEnabled())) {
|
||||
if (firstUser == null) {
|
||||
return;
|
||||
}
|
||||
// 1.1.1查看一级分销员是否已经分销过
|
||||
@@ -145,7 +145,7 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService {
|
||||
return;
|
||||
}
|
||||
BrokerageUserDO secondUser = brokerageUserService.getBrokerageUser(firstUser.getBindUserId());
|
||||
if (secondUser == null || !BooleanUtil.isTrue(secondUser.getBrokerageEnabled())) {
|
||||
if (secondUser == null) {
|
||||
return;
|
||||
}
|
||||
// 2.1.1查看二级分销员是否已经分销过
|
||||
|
||||
+2
-7
@@ -189,14 +189,9 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
|
||||
}
|
||||
// 2.3 校验能否绑定
|
||||
validateCanBindUser(brokerageUser, bindUserId);
|
||||
// 2.3 绑定用户
|
||||
// 2.3 绑定用户(人人分销:新用户默认具备分销资格)
|
||||
if (isNewBrokerageUser) {
|
||||
Integer enabledCondition = tradeConfigService.getTradeConfig().getBrokerageEnabledCondition();
|
||||
if (BrokerageEnabledConditionEnum.ALL.getCondition().equals(enabledCondition)) { // 人人分销:用户默认就有分销资格
|
||||
brokerageUser.setBrokerageEnabled(true).setBrokerageTime(LocalDateTime.now());
|
||||
} else {
|
||||
brokerageUser.setBrokerageEnabled(false).setBrokerageTime(LocalDateTime.now());
|
||||
}
|
||||
brokerageUser.setBrokerageEnabled(true).setBrokerageTime(LocalDateTime.now());
|
||||
brokerageUserMapper.insert(fillBindUserData(bindUserId, brokerageUser));
|
||||
} else {
|
||||
brokerageUserMapper.updateById(fillBindUserData(bindUserId, new BrokerageUserDO().setId(userId)));
|
||||
|
||||
Reference in new issue
Block a user