From 7c8a12207b8c622395d9ad101ea3153848a1811d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 16 Oct 2018 20:21:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=9B=9E=E6=98=BE=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 6c6b9ed62..2a29f38f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -116,9 +116,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { //分账信息 WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); - wxMerchant.setAccountId(receiver.getReceiverAccount()); - wxMerchant.setAccountName(receiver.getTrueName()); - wxMerchant.setAccountTypeValue(receiver.getReceiverType()); + if(receiver!=null){ + wxMerchant.setAccountId(receiver.getReceiverAccount()); + wxMerchant.setAccountName(receiver.getTrueName()); + wxMerchant.setAccountTypeValue(receiver.getReceiverType()); + } + return wxMerchant; }