|
@@ -169,15 +169,8 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
*/
|
|
*/
|
|
private boolean checkChannelCode(KuaishouChannelCreateStrategy strategy) {
|
|
private boolean checkChannelCode(KuaishouChannelCreateStrategy strategy) {
|
|
String numberValue = strategy.getNumberValue().trim();
|
|
String numberValue = strategy.getNumberValue().trim();
|
|
- Integer min = null;
|
|
|
|
- Integer max = null;
|
|
|
|
- if (numberValue.contains("-")) {
|
|
|
|
- String[] split = numberValue.split("-");
|
|
|
|
- min = Integer.valueOf(split[0]);
|
|
|
|
- max = Integer.valueOf(split[1]);
|
|
|
|
- strategy.setNumberMin(min);
|
|
|
|
- strategy.setNumberMax(max);
|
|
|
|
- }
|
|
|
|
|
|
+ Integer min = strategy.getNumberMin();
|
|
|
|
+ Integer max = strategy.getNumberMax();
|
|
|
|
|
|
QueryWrapper<KuaishouChannelCreateStrategy> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<KuaishouChannelCreateStrategy> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.eq("product_id", strategy.getProductId());
|
|
queryWrapper.eq("product_id", strategy.getProductId());
|
|
@@ -243,6 +236,15 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
queryWrapper.eq("account_id", strategy.getAccountId());
|
|
queryWrapper.eq("account_id", strategy.getAccountId());
|
|
}
|
|
}
|
|
queryWrapper.eq("project_id", strategy.getProjectId());
|
|
queryWrapper.eq("project_id", strategy.getProjectId());
|
|
|
|
+ Integer numberMin = 0;
|
|
|
|
+ Integer numberMax = 0;
|
|
|
|
+ if (strategy.getNumberValue().contains("-")) {
|
|
|
|
+ String[] split = strategy.getNumberValue().split("-");
|
|
|
|
+ numberMin = Integer.valueOf(split[0]);
|
|
|
|
+ numberMax = Integer.valueOf(split[1]);
|
|
|
|
+ strategy.setNumberMin(numberMin);
|
|
|
|
+ strategy.setNumberMax(numberMax);
|
|
|
|
+ }
|
|
//查询是否已经创建过策略,若已创建则某些字段必须一致,比如是否循环、使用层级
|
|
//查询是否已经创建过策略,若已创建则某些字段必须一致,比如是否循环、使用层级
|
|
KuaishouChannelCreateStrategy one = channelCreateStrategyService.getOne(queryWrapper.last("limit 1"));
|
|
KuaishouChannelCreateStrategy one = channelCreateStrategyService.getOne(queryWrapper.last("limit 1"));
|
|
if (!Check.isNull(one)) {
|
|
if (!Check.isNull(one)) {
|
|
@@ -279,8 +281,6 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
if (!strategy.getNumberValue().contains("-")) {
|
|
if (!strategy.getNumberValue().contains("-")) {
|
|
return customizedCreate(strategy);
|
|
return customizedCreate(strategy);
|
|
}
|
|
}
|
|
- Integer numberMin = strategy.getNumberMin();
|
|
|
|
- Integer numberMax = strategy.getNumberMax();
|
|
|
|
Integer usageRange = strategy.getUsageRange();
|
|
Integer usageRange = strategy.getUsageRange();
|
|
if (usageRange == 2) {
|
|
if (usageRange == 2) {
|
|
/*==========================范围是 项目==========================*/
|
|
/*==========================范围是 项目==========================*/
|
|
@@ -918,6 +918,14 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
}
|
|
}
|
|
strategy.setCreateType(createType);
|
|
strategy.setCreateType(createType);
|
|
|
|
|
|
|
|
+ if (strategy.getNumberValue().contains("-")) {
|
|
|
|
+ String[] split = strategy.getNumberValue().split("-");
|
|
|
|
+ Integer numberMin = Integer.valueOf(split[0]);
|
|
|
|
+ Integer numberMax = Integer.valueOf(split[1]);
|
|
|
|
+ strategy.setNumberMin(numberMin);
|
|
|
|
+ strategy.setNumberMax(numberMax);
|
|
|
|
+ }
|
|
|
|
+
|
|
QueryWrapper<KuaishouChannelCreateStrategy> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<KuaishouChannelCreateStrategy> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.eq("product_id", strategy.getProductId());
|
|
queryWrapper.eq("product_id", strategy.getProductId());
|
|
if (!Check.isNull(strategy.getAccountId())) {
|
|
if (!Check.isNull(strategy.getAccountId())) {
|