Merge #89 into master from cc_20260402_minor_req
fix:诸多小需求 * cc_20260402_minor_req: (6 commits squashed) - fix:PC端新增租赁合同相关接口 - fix:新发标签不过滤私域码 - fix:开店管理新增签约阶段完成时间筛选条件 - fix:删除多余接口 - fix:网商激活短链显示 - fix:开店管理导出去除限制 Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/89
This commit is contained in:
@@ -4,7 +4,7 @@ import com.cool.store.utils.StringUtil;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
@@ -59,13 +59,13 @@ public enum FranchiseBrandEnum {
|
||||
if (StringUtils.isBlank(code)){
|
||||
return null;
|
||||
}
|
||||
int i = Integer.parseInt(code);
|
||||
for (FranchiseBrandEnum e : FranchiseBrandEnum.values()) {
|
||||
if (i == e.getCode()) {
|
||||
return e.getDesc();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
return Arrays.stream(code.split(","))
|
||||
.map(v -> {
|
||||
FranchiseBrandEnum brand = getEnumByCode(v);
|
||||
return Objects.nonNull(brand) ? brand.getDesc() : null;
|
||||
})
|
||||
.filter(StringUtils::isNotBlank)
|
||||
.collect(Collectors.joining(","));
|
||||
}
|
||||
|
||||
public static FranchiseBrandEnum getEnumByCode(String code) {
|
||||
|
||||
@@ -15,7 +15,9 @@ public enum SpecialTagEnum {
|
||||
ACTIVITY_CAROUSEL("活动轮播"),
|
||||
ACTIVITY_PACKAGE("活动套餐"),
|
||||
PROMOTIONAL_VIDEO("宣传视频"),
|
||||
CALLING_SCREEN("叫号屏");;
|
||||
CALLING_SCREEN("叫号屏"),
|
||||
PRIVATE_SPHERE_QR("私域码"),
|
||||
;
|
||||
|
||||
private final String tagName;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user