From f5358bdfa30cd468b972bd26125e87706ac38685 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 4 Jul 2020 19:20:42 +0800 Subject: [PATCH] fix bug --- .../com/iformall/service/impl/WxBillSettleServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) 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()); }