From c4cbb4b50807581a170f31f1e780301637a364ef Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 29 Jul 2022 15:03:23 +0800 Subject: [PATCH] // test --- .../impl/TtGoodsCategoryServiceImpl.java | 4 ++ .../sms/aliyun/bean/SendDetailsErrCode.java | 71 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/sms/aliyun/bean/SendDetailsErrCode.java diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java index ed955192b..aed973bad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java @@ -109,6 +109,8 @@ public class TtGoodsCategoryServiceImpl implements TtGoodsCategoryService { for (GoodsTemplateGet.ProductAttrs attr: temp.getProductAttrs()) { if(getProductAdminIsNotShowKey().contains(attr.getKey())){ attr.setIsShow(false); + }else if(!attr.getIsRequired()){ + attr.setIsShow(false); }else{ attr.setIsShow(true); } @@ -116,6 +118,8 @@ public class TtGoodsCategoryServiceImpl implements TtGoodsCategoryService { for (GoodsTemplateGet.ProductAttrs attr: temp.getSkuAttrs()) { if(getSkuAttrAdminIsNotShowKey().contains(attr.getKey())){ attr.setIsShow(false); + }else if(!attr.getIsRequired()){ + attr.setIsShow(false); }else{ attr.setIsShow(true); } diff --git a/mallinkService/src/main/java/com/iformall/sms/aliyun/bean/SendDetailsErrCode.java b/mallinkService/src/main/java/com/iformall/sms/aliyun/bean/SendDetailsErrCode.java new file mode 100644 index 000000000..e4f19e368 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/sms/aliyun/bean/SendDetailsErrCode.java @@ -0,0 +1,71 @@ +package com.iformall.sms.aliyun.bean; + +/** + * app平台 + * @author alascor + */ +public enum SendDetailsErrCode { + DELIVERED("DELIVERED","发送成功"), + ISP_RAM_PE("isp.RAM_PE","RAM权限DENY(建议联系平台核查原因)"), + ISV_OUT_OF("isv.OUT_OF","业务停机(建议联系平台核查原因)"), + ISV_PRODUC("isv.PRODUC","产品未开通"), + ISV_ACCOUN("isv.ACCOUN","账户异常(联系平台确认账号)"), + ISV_SMS_TE("isv.SMS_TE","短信模板不合法"), + ISV_SMS_SI("isv.SMS_SI","短信签名不合法"), + ISV_INVALI("isv.INVALI","参数异常"), + ISP_SYSTEM("isp.SYSTEM","系统错误"), + ISV_MOBILE("isv.MOBILE","非法手机号"), + ISV_TEMPLA("isv.TEMPLA","模板缺少变量或非法关键字"), + ISV_BUSINE("isv.BUSINE","业务限流"), + ISV_BLACK("isv.BLACK","黑名单管控"), + ISV_PARAM("isv.PARAM","参数超出长度限制"), + ISV_AMOUNT("isv.AMOUNT","账户余额不足"), + FILTER("FILTER","关键字拦截"), + VALVE_M_MC("VALVE:M_MC","重复过滤(建议减少每分钟发送数量)"), + VALVE_H_MC("VALVE:H_MC","重复过滤(建议减少每小时发送数量)"), + VALVE_D_MC("VALVE:D_MC","重复过滤(建议减少每天发送数量)"), + MOBILE_SEND_LIMIT("MOBILE_SEND_LIMIT","单个号码日或月发送上限,流控超限,频繁发送超限"), + PARAMS_ILLEGAL("PARAMS_ILLEGAL","参数错误"), + MOBILE_IN_BLACK("MOBILE_IN_BLACK","手机号在黑名单(平台或运营商)"), + MOBLLE_TERMINAL_ERROR("MOBLLE_TERMINAL_ERROR","手机终端问题、内存满、SIM卡满、非法设备等"), + MOBILE_NOT_ON_SERVICE("MOBILE_NOT_ON_SERVICE","停机、空号、暂停服务、关机、不在服务区"), + SP_NOT_BY_INTER_SMS("SP_NOT_BY_INTER_SMS","未开通国际短信"), + USER_REJECT("USER_REJECT","用户手机退订此业务、产品未开通"), + SP_UNKNOWN_ERROR("SP_UNKNOWN_ERROR","运营商未知错误"), + MOBILE_ACCOUNT_ABNORMAL("MOBILE_ACCOUNT_ABNORMAL","用户账户异常、携号转网、欠费等"), + REQUEST_SUCCESS("REQUEST_SUCCESS","请求成功"), + CONTENT_KEYWORD("CONTENT_KEYWORD","内容关键字拦截"), + SIGNATURE_BLACKLIST("SIGNATURE_BLACKLIST","签名黑名单"), + INVALID_NUMBER("INVALID_NUMBER","号码不合法"), + NO_ROUTE("NO_ROUTE","无路由器"), + CONTENT_ERROR("CONTENT_ERROR","模板内容无退订"); + + SendDetailsErrCode(String code, String msg) { + this.code = code; + this.msg = msg; + } + + private String code; + private String msg; + public String getCode() { + return code; + } + public void setCode(String code) { + this.code = code; + } + public String getMsg() { + return msg; + } + public void setMsg(String msg) { + this.msg = msg; + } + + public static SendDetailsErrCode getByCode(String code) { + for (SendDetailsErrCode e : SendDetailsErrCode.values()) { + if (e.getCode().equals(code)) { + return e; + } + } + return null; + } +}