|
@@ -115,8 +115,8 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Result<Object> channelManagementHome(Long productId, Long projectId, Long accountId,String userId) {
|
|
|
|
- List<JSONObject> list = channelMapper.channelManagementHome(productId, projectId, accountId,userId);
|
|
|
|
|
|
+ public Result<Object> channelManagementHome(Long productId, Long projectId, Long accountId, String userId) {
|
|
|
|
+ List<JSONObject> list = channelMapper.channelManagementHome(productId, projectId, accountId, userId);
|
|
return Result.ok(new PageInfo<>(list));
|
|
return Result.ok(new PageInfo<>(list));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -386,10 +386,12 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
String newFileUrl = kuaishouAppPackageService.getDownloadPath(appIconUrl);
|
|
String newFileUrl = kuaishouAppPackageService.getDownloadPath(appIconUrl);
|
|
if (Check.isNull(newFileUrl)) {
|
|
if (Check.isNull(newFileUrl)) {
|
|
log.error("下载图片失败,原路径:" + appIconUrl);
|
|
log.error("下载图片失败,原路径:" + appIconUrl);
|
|
|
|
+ obj.put("message","下载图片失败,原路径:" + appIconUrl);
|
|
return obj;
|
|
return obj;
|
|
}
|
|
}
|
|
if (Check.isNull(token)) {
|
|
if (Check.isNull(token)) {
|
|
log.error("根据图片路径获取md5,获取token失败");
|
|
log.error("根据图片路径获取md5,获取token失败");
|
|
|
|
+ obj.put("message","根据图片路径获取md5,获取token失败");
|
|
return obj;
|
|
return obj;
|
|
}
|
|
}
|
|
String md5 = null;
|
|
String md5 = null;
|
|
@@ -400,6 +402,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
}
|
|
}
|
|
if (Check.isNull(md5)) {
|
|
if (Check.isNull(md5)) {
|
|
log.error("获取MD5签名失败,路径:" + newFileUrl);
|
|
log.error("获取MD5签名失败,路径:" + newFileUrl);
|
|
|
|
+ obj.put("message","获取MD5签名失败,路径:" + newFileUrl);
|
|
return obj;
|
|
return obj;
|
|
}
|
|
}
|
|
//获取图片MD5
|
|
//获取图片MD5
|
|
@@ -912,6 +915,21 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
return Result.error("未查到渠道号");
|
|
return Result.error("未查到渠道号");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public Result<Object> queryChannelLevel(Long accountId) {
|
|
|
|
+ KuaishouChannel channel = channelMapper.queryByAccountId(accountId);
|
|
|
|
+ if (Check.isNull(channel)) {
|
|
|
|
+ return Result.ok("没有渠道号");
|
|
|
|
+ }
|
|
|
|
+ JSONObject request = new JSONObject();
|
|
|
|
+ if (channel.getIsHaveItem() == 1) {
|
|
|
|
+ List<JSONObject> list = channelMapper.queryItemsListByAccountId(accountId);
|
|
|
|
+ request.put("list", list);
|
|
|
|
+ }
|
|
|
|
+ request.put("channel", channel);
|
|
|
|
+ return Result.ok(request);
|
|
|
|
+ }
|
|
|
|
+
|
|
private Result<Object> doAccountRangeAccountLevel(Long accountId, List<KuaishouChannelCreateStrategy> strategys) throws Exception {
|
|
private Result<Object> doAccountRangeAccountLevel(Long accountId, List<KuaishouChannelCreateStrategy> strategys) throws Exception {
|
|
List<KuaishouChannel> channelList = channelMapper.queryByAccountIdLevel(accountId, "account");
|
|
List<KuaishouChannel> channelList = channelMapper.queryByAccountIdLevel(accountId, "account");
|
|
if (!Check.isNull(channelList)) {
|
|
if (!Check.isNull(channelList)) {
|