|
|
|
@@ -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()); |
|
|
|
} |
|
|
|
|