| @@ -215,7 +215,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| SysConfig sysConfig = sysConfigService.getByKey(SysConfigConstant.vierfy_seconds_key, getTenantInfo()); | SysConfig sysConfig = sysConfigService.getByKey(SysConfigConstant.vierfy_seconds_key, getTenantInfo()); | ||||
| if (null == sysConfig || StringUtils.isBlank(sysConfig.getConfigItemValue())) { | if (null == sysConfig || StringUtils.isBlank(sysConfig.getConfigItemValue())) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"系统设置[手动核销超时时间未配置]"); | |||||
| return new ResultData(ErrorCode.SYS_CONFIG_VIERFY_SECODES_UNSET); | |||||
| } | } | ||||
| Map retmap = new HashMap(); | Map retmap = new HashMap(); | ||||
| @@ -30,7 +30,12 @@ public enum ErrorCode{ | |||||
| REPORT_TYPE_UNKNOWN(1014, "不支持的报表类型"), | REPORT_TYPE_UNKNOWN(1014, "不支持的报表类型"), | ||||
| SYS_MCH_NOT_FOUND(1015, "微信商户号未找到"), | SYS_MCH_NOT_FOUND(1015, "微信商户号未找到"), | ||||
| SYS_AUTH_ERROR(1016, "该用户没有权限访问"), | SYS_AUTH_ERROR(1016, "该用户没有权限访问"), | ||||
| /** | |||||
| * 系统配置 | |||||
| */ | |||||
| SYS_CONFIG_VIERFY_SECODES_UNSET(1030,"系统设置【核销过期时间】未配置"), | |||||
| SYS_CONFIG_DEFAULT_MERCHANT_B_USER_UNSET(1031,"系统配置【外部设备核销默认商户员工编号】未配置"), | |||||
| /** | /** | ||||
| * 菜单 | * 菜单 | ||||
| */ | */ | ||||
| @@ -602,7 +602,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| SysConfig sysConfig = sysConfigService.getByKey(SysConfigConstant.default_merchant_b_user, tenantEntity); | SysConfig sysConfig = sysConfigService.getByKey(SysConfigConstant.default_merchant_b_user, tenantEntity); | ||||
| if (null == sysConfig) { | if (null == sysConfig) { | ||||
| throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL.getCode(),"系统配置【外部设备核销默认商户员工编号】为空"); | |||||
| throw new MallinkException(ErrorCode.SYS_CONFIG_DEFAULT_MERCHANT_B_USER_UNSET); | |||||
| } | } | ||||
| WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(Long.parseLong(sysConfig.getConfigItemValue())); | WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(Long.parseLong(sysConfig.getConfigItemValue())); | ||||