From 23ee0868e02c72850c0523405b89344323bab28d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 17 Oct 2018 14:13:10 +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][=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9C=89=E5=85=B3=E8=81=94=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E6=97=B6=E5=85=B3=E8=81=94=E5=B9=B6?= =?UTF-8?q?=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 --- .../com/iformall/domain/po/WxMerchant.java | 11 ++++++ .../java/com/iformall/domain/po/WxShop.java | 34 ++++++++++++++++++- .../service/impl/WxMerchantServiceImpl.java | 12 +++++-- .../main/resources/mapper/WxShopMapper.xml | 4 ++- 4 files changed, 57 insertions(+), 4 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 e798013a9..01ef1edf0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -51,6 +51,9 @@ public class WxMerchant implements Serializable { @Transient private List bUsers; + @Transient + private Long rentContractId; + /*租期开始时间**/ @Transient private Date rentalStartDate; @@ -276,6 +279,14 @@ public class WxMerchant implements Serializable { this.accountTypeValue = accountTypeValue; } + public Long getRentContractId() { + return rentContractId; + } + + public void setRentContractId(Long rentContractId) { + this.rentContractId = rentContractId; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index f68095ffc..ad91fb338 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -38,7 +38,15 @@ public class WxShop implements Serializable { public void setIds(List ids) { this.ids = ids; } - + + @Transient + private Long rentContractId; + + @Transient + private String linkPerson; + + @Transient + private String linkPhone; /*租户ID**/ @@ -189,6 +197,30 @@ public class WxShop implements Serializable { this.imgUrl = imgUrl; } + public Long getRentContractId() { + return rentContractId; + } + + public void setRentContractId(Long rentContractId) { + this.rentContractId = rentContractId; + } + + public String getLinkPerson() { + return linkPerson; + } + + public void setLinkPerson(String linkPerson) { + this.linkPerson = linkPerson; + } + + public String getLinkPhone() { + return linkPhone; + } + + public void setLinkPhone(String linkPhone) { + this.linkPhone = linkPhone; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 2a29f38f7..0edfa207e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -199,8 +199,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setCreateDate(date); wxMerchantMapper.insertSelective(wxMerchant); - buildRent(wxMerchant); - //保存商户商铺的关联 List shopidlist = wxMerchant.getShopids(); for (Long shopid : shopidlist) { @@ -251,6 +249,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxProfitSharingReceiverService.addReceiver(wxMerchant, receiver); } + //关联合同 + if(wxMerchant.getRentContractId()!=null){ + WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxMerchant.getRentContractId()); + wxRentContract.setMerchantId(merchantid); + wxRentContract.setUpdatetime(new Date()); + wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract); + //创建账单 + buildRent(wxMerchant); + } + } else { //更新商户 diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 7c8e33134..151ee0b83 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -127,12 +127,14 @@ select s.id,s.shop_number shopNumber,s.build_area buildArea, s.img_url imgUrl,s.operation_area operationArea, - s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId + s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, + rc.id rentContractId,rc.link_person linkPerson,rc.link_phone linkPhone from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0 left join wx_merchant m on ms.merchant_id=m.id left join wx_mall_building b on s.building=b.id left join wx_mall_floor f on s.floor=f.id + left join wx_rent_contract rc on s.id=rc.shop_id where 1 = 1