From fc085a835870d8291f46f42faee15d59b282e3cc Mon Sep 17 00:00:00 2001 From: hanxueda Date: Tue, 23 Apr 2019 20:22:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=B6=E6=8A=9B=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCreditHistoryController.java | 10 ++++++++-- .../iformall/controller/WxCreditHistoryController.java | 9 +++++++-- .../iformall/controller/WxCreditHistoryController.java | 10 ++++++++-- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java index f3d490a10..ef64c99b6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -5,6 +5,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCreditHistoryVo; +import com.iformall.exception.MallinkException; import com.iformall.service.WxCreditHistoryService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -51,8 +52,13 @@ public class WxCreditHistoryController extends BaseController logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); wxCreditHistory.setTenantId(getTenantId()); wxCreditHistory.setOperatorId(getUser().getId()); - WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); - return new ResultData(Result.SUCCESS,"操作成功",credit); + try { + WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); + return new ResultData(Result.SUCCESS, "操作成功", credit); + } catch (MallinkException e) { + logger.error(e.getMessage()); + return new ResultData(e.getErrorCode(), e.getMessage()); + } } @ApiOperation("根据id查询接口") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index b442882e7..ef0580fa7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -81,8 +81,13 @@ public class WxCreditHistoryController extends BaseController { wxCreditHistory.setMerchantId(getUser().getMerchantId()); //B端操作用户 wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); - WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); - return new ResultData(Result.SUCCESS,"操作成功",credit); + try { + WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); + return new ResultData(Result.SUCCESS, "操作成功", credit); + } catch (MallinkException e) { + log.error(e.getMessage()); + return new ResultData(e.getErrorCode(), e.getMessage()); + } } @ApiOperation("分页列表接口") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 51f38d0a7..cc7b63207 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -5,6 +5,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCreditHistoryVo; +import com.iformall.exception.MallinkException; import com.iformall.service.WxCreditHistoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -29,8 +30,13 @@ public class WxCreditHistoryController extends BaseController{ log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); wxCreditHistory.setTenantId(getTenantId()); wxCreditHistory.setOperatorId(getUser().getId()); - WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); - return new ResultData(Result.SUCCESS,"操作成功",credit); + try { + WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); + return new ResultData(Result.SUCCESS, "操作成功", credit); + } catch (MallinkException e) { + log.error(e.getMessage()); + return new ResultData(e.getErrorCode(), e.getMessage()); + } } @ApiOperation("用户积分列表")