From 1c90cfc59ca1110b0d93e01a24bd753e9962b58f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Oct 2018 15:32:46 +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][=E7=BB=91=E5=AE=9A=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxMerchantServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 026d8db36..beee20b93 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -311,15 +311,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { receiver.setReceiverComments(wxMerchant.getName()); receiver.setReceiverType(wxMerchant.getAccountTypeValue()); receiver.setTrueName(wxMerchant.getAccountName()); - wxProfitSharingReceiverService.updateReceiver(wxMerchant, receiver); + return wxProfitSharingReceiverService.updateReceiver(wxMerchant, receiver); } else { - wxProfitSharingReceiverService.delReceiver(wxMerchant); + return wxProfitSharingReceiverService.delReceiver(wxMerchant); } - return new ResultData(Result.SUCCESS, "账户操作成功"); } catch (Exception e) { logger.error("db failed: 账户操作失败, e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } + } @Transactional(rollbackFor = {Exception.class}) @@ -332,7 +332,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxAppinfo wxAppinfo = new WxAppinfo(); wxAppinfo.setTenantId(wxMerchant.getTenantId()); wxAppinfo.setType(EnumAppType.B.getCode()); - wxAppinfo = wxAppinfoMapper.findList(wxAppinfo).get(0); + List list = wxAppinfoMapper.findList(wxAppinfo); + if(list.size()==0){ + return new ResultData(ErrorCode.APP_ID_NOT_FOUND); + } + wxAppinfo=list.get(0); List bUsers = wxMerchant.getbUsers(); //删除之前的关联用户