| @@ -91,14 +91,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| List<Map<String,Object>> shops = new ArrayList<>(); | List<Map<String,Object>> shops = new ArrayList<>(); | ||||
| WxRentContract wxRentContract = new WxRentContract(); | |||||
| wxRentContract.setMerchantId(id); | |||||
| List<WxRentContract> 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<WxRentContract> list = wxRentContractMapper.findList(wxRentContract); | |||||
| // if(list.size()>0){ | |||||
| // wxRentContract=list.get(0); | |||||
| // wxMerchant.setPrice(wxRentContract.getPrice()); | |||||
| // wxMerchant.setReceivePeriod(wxRentContract.getReceivePeriod()); | |||||
| // } | |||||
| List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); | List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); | ||||
| for(WxMerchantShop merchantShop:wxMerchantShopList){ | for(WxMerchantShop merchantShop:wxMerchantShopList){ | ||||
| @@ -207,7 +207,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| wxRentContract.setReceivePeriod(wxMerchant.getReceivePeriod()); | wxRentContract.setReceivePeriod(wxMerchant.getReceivePeriod()); | ||||
| wxRentContractMapper.insertSelective(wxRentContract); | wxRentContractMapper.insertSelective(wxRentContract); | ||||
| buildRent(wxRentContract,wxShopP); | |||||
| //buildRent(wxRentContract,wxShopP); | |||||
| //保存商户商铺的关联 | //保存商户商铺的关联 | ||||
| List<Long> shopidlist = wxMerchant.getShopids(); | List<Long> shopidlist = wxMerchant.getShopids(); | ||||