From 9d9bd5cc670dde54c55b1c084b6d0ccffa0c1925 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 16 Jan 2019 17:36:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxMerchant.java | 12 ++++++------ .../iformall/service/impl/WxMerchantServiceImpl.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 11e5c8725..52aace07d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -49,7 +49,7 @@ public class WxMerchant implements Serializable { private List shops; @Transient - private List bUsers; + private List users; @Transient private Long rentContractId; @@ -238,12 +238,12 @@ public class WxMerchant implements Serializable { this.shops = shops; } - public List getbUsers() { - return bUsers; - } + public List getUsers() { + return users; + } - public void setbUsers(List bUsers) { - this.bUsers = bUsers; + public void setUsers(List users) { + this.users = users; } public Date getRentalStartDate() { 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 0d04d877d..1d8a3f09d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -147,8 +147,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); wxMerchantBUser.setMerchantId(wxMerchant.getId()); wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); - List bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); - wxMerchant.setbUsers(bUserList); + List userList = wxMerchantBUserMapper.findList(wxMerchantBUser); + wxMerchant.setUsers(userList); //分账信息 WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); @@ -470,7 +470,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } wxAppinfo = list.get(0); - List bUsers = wxMerchant.getbUsers(); + List users = wxMerchant.getUsers(); //删除之前的关联用户 WxMerchantBUser bUser = new WxMerchantBUser(); @@ -482,7 +482,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } final IdWorker idWorker = IdWorker.get(); //保存商户关联用户 - for (WxMerchantBUser user : bUsers) { + for (WxMerchantBUser user : users) { if (user.getId() == null) { long id = idWorker.nextId(); user.setId(id);