diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 21bc55f29..19cd85631 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -100,10 +100,10 @@ public class WxCouponSendController extends BaseController { try { wxCouponSendService.handSel(wxCouponSend, cUserId); } catch (MallinkException e) { - logger.error("注异常: " + e.getMessage()); + logger.error("注券异常: " + e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { - logger.error("注异常: " + e.getMessage()); + logger.error("注券异常: " + e.getMessage()); return new ResultData(ErrorCode.COUPON_HANDSEL_VERIFY, e.getMessage()); } return new ResultData(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index f2084fe0f..65a31ed19 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -73,6 +73,8 @@ public class WxCreditHistoryController extends BaseController { WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { wxCUserBasicInfo = wxCUserBasicInfoList.get(0); + } else { + return new ResultData(ErrorCode.USER_NOT_AUTH_PHONE); } return new ResultData(wxCUserBasicInfo); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 9bca2362d..765ac0730 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -605,9 +605,12 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { public void handSel(WxCouponSend wxCouponSend, Object cUserId) { WxCUser cu = wxCUserMapper.selectByPrimaryKey(cUserId); if (Objects.isNull(cu)) { - throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL); + throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); + } + + if(StringUtils.isEmpty(cu.getPhone())) { + throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); } - // 1002 ,11012,2020 ,2000,2022,2021,3005,3999,1050,3000 WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(cu.getId()); if (Objects.isNull(wxCUserBasicInfo)) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 0c3810dbc..c121ab847 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -194,6 +194,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return wxCreditHistoryMapper.selectByPrimaryKey(id); } + @Override public void check(Long cUserId) { WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(cUserId); if (wxCUserBasicInfo == null) { @@ -208,7 +209,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId()); if (wxCUser == null && wxCUserBasicInfo == null) { //验证此用户是否存在 - throw new MallinkException(ErrorCode.USER_IS_EMPTY); + throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); } if (StringUtils.isNotEmpty(record.getSpendStr())) { record.setSpend(new BigDecimal(record.getSpendStr()).multiply(new BigDecimal(100)).intValue());