diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java index aa649d72c..4fc278c58 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; +import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileStationWhitelist; import com.jsowell.pile.service.IPileStationWhitelistService; @@ -73,7 +74,16 @@ public class PileStationWhitelistController extends BaseController { @Log(title = "站点白名单", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody PileStationWhitelist pileStationWhitelist) { - return toAjax(pileStationWhitelistService.insertPileStationWhitelist(pileStationWhitelist)); + AjaxResult result; + try { + pileStationWhitelistService.insertPileStationWhitelist(pileStationWhitelist); + result = AjaxResult.success(); + } catch (BusinessException e) { + result = AjaxResult.error(e.getMessage()); + } catch (Exception e) { + result = AjaxResult.error("添加站点白名单失败"); + } + return result; } /** diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index 6e1c5c04f..e5d9c3ce6 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -80,7 +80,7 @@ public enum ReturnCodeEnum { CODE_REFUND_ORDER_CALLBACK_RECORD_ERROR("00100038", "订单退款处理逻辑, 查询订单微信支付记录为空!"), - CODE_SELECT_MEMBER_NULL_ERROR("00100039", "没有查询到会员信息"), + CODE_MEMBER_NOT_FOUND_ERROR("00100039", "未查询用户会员信息"), CODE_REFUND_MEMBER_BALANCE_ERROR("00100040", "退款金额不能大于本金金额"), diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index e7567509a..f18637711 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1426,7 +1426,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 查会员余额 MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); if (memberVO == null) { - throw new BusinessException(ReturnCodeEnum.CODE_SELECT_MEMBER_NULL_ERROR); + throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_FOUND_ERROR); } // 校验退款金额 BigDecimal principalBalance = memberVO.getPrincipalBalance(); @@ -1964,7 +1964,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 查会员余额 MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); if (memberVO == null) { - throw new BusinessException(ReturnCodeEnum.CODE_SELECT_MEMBER_NULL_ERROR); + throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_FOUND_ERROR); } // 校验退款金额 BigDecimal principalBalance = memberVO.getPrincipalBalance(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java index 369de838c..a0c98343b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java @@ -1,5 +1,7 @@ package com.jsowell.pile.service.impl; +import com.jsowell.common.enums.ykc.ReturnCodeEnum; +import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; @@ -58,13 +60,13 @@ public class PileStationWhitelistServiceImpl implements IPileStationWhitelistSer public int insertPileStationWhitelist(PileStationWhitelist pileStationWhitelist) { // pileStationWhitelist.setCreateTime(DateUtils.getNowDate()); if (StringUtils.isBlank(pileStationWhitelist.getMobileNumber())) { - return 0; + throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } - MemberBasicInfo info = memberBasicInfoService.selectInfoByMobileNumber(pileStationWhitelist.getMobileNumber()); - if (info == null) { - return 0; + MemberBasicInfo memberInfo = memberBasicInfoService.selectInfoByMobileNumber(pileStationWhitelist.getMobileNumber()); + if (memberInfo == null) { + throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_FOUND_ERROR); } - pileStationWhitelist.setMemberId(info.getMemberId()); + pileStationWhitelist.setMemberId(memberInfo.getMemberId()); return pileStationWhitelistMapper.insertPileStationWhitelist(pileStationWhitelist); }