From 77198d63fc8cd8f79baa30d2170eaff762e0cdd1 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 11 May 2023 15:56:56 +0800 Subject: [PATCH] =?UTF-8?q?//=E5=88=B8=E6=9C=89=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCampaignController.java | 13 +++++++++++-- .../controller/market/WxGameController.java | 18 ++++++++++++++---- .../controller/market/WxTopicController.java | 14 ++++++++++++-- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 384fc1bea..a56343087 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -15,6 +15,7 @@ import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.*; +import com.iformall.exception.MallinkException; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; @@ -83,7 +84,11 @@ public class WxCampaignController extends BaseController { if(wxCampaign.getPlat() == null){ wxCampaign.setPlat(EnumAppPlat.WX.getCode()); } - return wxCampaignService.saveOrUpdate(wxCampaign); + try{ + return wxCampaignService.saveOrUpdate(wxCampaign); + }catch(MallinkException e){ + return new ResultData(e.getErrorCode(),e.getMessage()); + } } @ApiOperation(value = "新增接口-小程序路径", notes = "produceType,produceId,pagePath,pageScene必填") @@ -127,7 +132,11 @@ public class WxCampaignController extends BaseController { if(wxCampaign.getPlat() == null){ wxCampaign.setPlat(EnumAppPlat.WX.getCode()); } - return wxCampaignService.saveOrUpdate(wxCampaign); + try{ + return wxCampaignService.saveOrUpdate(wxCampaign); + }catch(MallinkException e){ + return new ResultData(e.getErrorCode(),e.getMessage()); + } } @ApiOperation("根据id更新接口") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java index 0dc9d0f01..1b4846b45 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java @@ -10,6 +10,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxGame; import com.iformall.enums.EnumGameStatus; +import com.iformall.exception.MallinkException; import com.iformall.service.WxGameService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -65,8 +66,13 @@ public class WxGameController extends BaseController { } wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); wxGame.updateTenantInfo(getTenantInfo()); - wxGameService.saveOrUpdate(wxGame); - return new ResultData(); + try{ + wxGameService.saveOrUpdate(wxGame); + return new ResultData(); + }catch(MallinkException e){ + return new ResultData(e.getErrorCode(),e.getMessage()); + } + } @ApiOperation("根据id更新接口") @@ -86,8 +92,12 @@ public class WxGameController extends BaseController { } } wxGame.updateTenantInfo(getTenantInfo()); - wxGameService.saveOrUpdate(wxGame); - return new ResultData(); + try{ + wxGameService.saveOrUpdate(wxGame); + return new ResultData(); + }catch(MallinkException e){ + return new ResultData(e.getErrorCode(),e.getMessage()); + } } @ApiOperation("根据id删除接口") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java index d6a290540..5bae333ca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java @@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.enums.EnumWxTopicStatus; import com.iformall.enums.EnumWxTopicType; +import com.iformall.exception.MallinkException; import com.iformall.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -72,7 +73,12 @@ public class WxTopicController extends BaseController { if(wxTopic.getTopicType() == null){ wxTopic.setTopicType(EnumWxTopicType.SPECIAL_TOPIC.getCode()); } - return wxTopicService.saveOrUpdate(wxTopic); + try{ + return wxTopicService.saveOrUpdate(wxTopic); + }catch(MallinkException e){ + return new ResultData(e.getErrorCode(),e.getMessage()); + } + } @GetMapping("findByType") @@ -101,7 +107,11 @@ public class WxTopicController extends BaseController { if(StringUtils.isBlank(wxTopic.getName())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - return wxTopicService.saveOrUpdate(wxTopic); + try{ + return wxTopicService.saveOrUpdate(wxTopic); + }catch(MallinkException e){ + return new ResultData(e.getErrorCode(),e.getMessage()); + } } }