From b31a0784d46410a41bc2f07806f3b2fe7b1a8782 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 10 Oct 2018 12:47:57 +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=A7=9F=E9=87=91=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxMerchantServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 3161ba3e7..ba9d81d1c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -91,14 +91,14 @@ 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()); - } +// 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){ @@ -207,7 +207,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxRentContract.setReceivePeriod(wxMerchant.getReceivePeriod()); wxRentContractMapper.insertSelective(wxRentContract); - buildRent(wxRentContract,wxShopP); + //buildRent(wxRentContract,wxShopP); //保存商户商铺的关联 List shopidlist = wxMerchant.getShopids();