diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 87583201e..03c8abdc4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -2,11 +2,13 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxBillSettleVo; import com.iformall.enums.*; +import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.ExcelService; import com.iformall.service.WxBillSettleService; @@ -103,6 +105,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(billSettle != null) { WxMerchant merchant = wxMerchantMapper.selectById(billSettle.getMerchantId()); + if (null == merchant) { + throw new MallinkException(ErrorCode.MALL_INFO_NOT_FOUND); + } if(merchant != null){ billSettle.setMerchantName(merchant.getName()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index 339737843..ffbec3202 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -10,7 +10,8 @@ import com.iformall.enums.EnumMsgSendStatus; import com.iformall.mapper.*; import com.iformall.service.WxMsgCallbackService; import com.iformall.utils.HMACSHA256; -import jodd.util.StringUtil; + +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -191,7 +192,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { wxMsgCallback.setBatchNo(param.get("biz_id")); if("true".equals(success)){ wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode()); - if(StringUtil.isNotBlank(param.get("out_id"))){ + if(StringUtils.isNotBlank(param.get("out_id"))){ WxCouponPassword couponPassword = new WxCouponPassword(); couponPassword.setId(Long.valueOf(param.get("out_id"))); couponPassword.setStatus(EnumCouponPasswordStatus.MSG_SENDED.getCode());