From 7456f34eb98366cc0b4aea56c4b1bc59fbfc1f05 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 16 Oct 2018 19:52:06 +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][=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=90=8E=E6=B7=BB=E5=8A=A0=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxMerchantServiceImpl.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 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 f38d6fcf3..6c6b9ed62 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -94,15 +94,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); List> shops = new ArrayList<>(); -// WxRentContract wxRentContract = new WxRentContract(); -// wxRentContract.setMerchantId(id); -// List list = wxRentContractMapper.findList(wxRentContract); -// if(list.size()>0){ -// wxRentContract=list.get(0); -// wxMerchant.setPrice(wxRentContract.getPrice()); -// wxMerchant.setReceivePeriod(wxRentContract.getReceivePeriod()); -// } - List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); for (WxMerchantShop merchantShop : wxMerchantShopList) { wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate()); @@ -122,6 +113,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); List bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); wxMerchant.setbUsers(bUserList); + + //分账信息 + WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); + wxMerchant.setAccountId(receiver.getReceiverAccount()); + wxMerchant.setAccountName(receiver.getTrueName()); + wxMerchant.setAccountTypeValue(receiver.getReceiverType()); + return wxMerchant; } @@ -198,7 +196,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setCreateDate(date); wxMerchantMapper.insertSelective(wxMerchant); - //buildRent(wxRentContract,wxShopP); + buildRent(wxMerchant); //保存商户商铺的关联 List shopidlist = wxMerchant.getShopids();