From 2a5d5cceee6a6659c3188c6bb7924a68ffcb7707 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 17 Jul 2019 14:55:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/contract/WxRentContractController.java | 9 ++++++++- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 725be33e6..fa56e420d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.enums.EnumFromType; import com.iformall.enums.EnumRentStartType; +import com.iformall.exception.MallinkException; import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxBillRentService; import com.iformall.service.WxMerchantService; @@ -128,7 +129,13 @@ public class WxRentContractController extends BaseController { if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } - return wxRentContractService.update(wxRentContract, user.getId(),user.getName(),EnumFromType.OTHER.getCode(),oldDate); + ResultData update = null; + try { + update = wxRentContractService.update(wxRentContract, user.getId(), user.getName(), EnumFromType.OTHER.getCode(), oldDate); + } catch (MallinkException e) { + return new ResultData(ErrorCode.SYS_SERVER_ERROR); + } + return update; } /** diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 9e3391e0a..c2510352d 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -12,7 +12,7 @@ public enum ErrorCode{ * 系统级别 * 1000-1999 */ - SYS_SERVER_ERROR(1000, "系统异常"), + SYS_SERVER_ERROR(1000, "系统繁忙"), SYS_PARAMETER_ERROR(1001, "参数不合法"), SYS_PARAMETER_NOT_NULL(1002, "参数不能为空"), SYS_PARAMETER_TYPE_ERROR(1003, "参数类型异常"),