From c16bbb2a4ddbc8e7c3076836fdc6e07e366a8229 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 3 Sep 2018 16:38:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E5=95=86=E9=93=BA][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=95=86=E9=93=BA=E6=B7=BB=E5=8A=A0is=5Fde?= =?UTF-8?q?l=E5=AD=97=E6=AE=B5,=E5=95=86=E6=88=B7=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=A7=9F=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxMerchant.java | 58 +++++++++++++++---- .../com/simple/domain/po/WxMerchantShop.java | 23 ++++++-- .../service/impl/WxMerchantServiceImpl.java | 16 +++-- .../resources/mapper/WxMerchantMapper.xml | 11 +++- .../resources/mapper/WxMerchantShopMapper.xml | 12 ++-- 5 files changed, 91 insertions(+), 29 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index a7ea82a0d..91b924c4b 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -49,6 +49,13 @@ public class WxMerchant implements Serializable { @Transient private List bUsers; + /*租期开始时间**/ + @Transient + private Date rentalStartDate; + /*租期结束时间**/ + @Transient + private Date rentalEndDate; + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -86,6 +93,10 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value="状态1可用0停用",name="status") private Integer status; + @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkPerson") + private String linkPerson; + + public String getTenantId() { return tenantId; } @@ -196,20 +207,44 @@ public class WxMerchant implements Serializable { this.bUsers = bUsers; } + public Date getRentalStartDate() { + return rentalStartDate; + } + + public void setRentalStartDate(Date rentalStartDate) { + this.rentalStartDate = rentalStartDate; + } + + public Date getRentalEndDate() { + return rentalEndDate; + } + + public void setRentalEndDate(Date rentalEndDate) { + this.rentalEndDate = rentalEndDate; + } + + public String getLinkPerson() { + return linkPerson; + } + + public void setLinkPerson(String linkPerson) { + this.linkPerson = linkPerson; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,ImgUrl_ASC("`imgUrl` ASC"),ImgUrl_DESC("`imgUrl` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,ImgUrl_ASC("`img_url` ASC"),ImgUrl_DESC("`img_url` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,LinkPhone_ASC("`linkPhone` ASC"),LinkPhone_DESC("`linkPhone` DESC") - ,BankCard_ASC("`bankCard` ASC"),BankCard_DESC("`bankCard` DESC") - ,BankName_ASC("`bankName` ASC"),BankName_DESC("`bankName` DESC") - ,PayId_ASC("`payId` ASC"),PayId_DESC("`payId` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") - ,CarVendorType_ASC("`carVendorType` ASC"),CarVendorType_DESC("`carVendorType` DESC") - ,CarParams_ASC("`carParams` ASC"),CarParams_DESC("`carParams` DESC") + ,LinkPhone_ASC("`link_phone` ASC"),LinkPhone_DESC("`link_phone` DESC") + ,BankCard_ASC("`bank_card` ASC"),BankCard_DESC("`bank_card` DESC") + ,BankName_ASC("`bank_name` ASC"),BankName_DESC("`bank_name` DESC") + ,PayId_ASC("`pay_id` ASC"),PayId_DESC("`pay_id` DESC") + ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") + ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") + ,CarVendorType_ASC("`car_vendor_type` ASC"),CarVendorType_DESC("`car_vendor_type` DESC") + ,CarParams_ASC("`car_params` ASC"),CarParams_DESC("`car_params` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ; @@ -244,7 +279,8 @@ public class WxMerchant implements Serializable { sb.append(","); sb.append(fields[k].toString()); } - + this.sortColumns=sb.toString(); + } public void setSortColumns(String sortColumns) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java index c34c957e2..65690ca40 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java @@ -1,12 +1,11 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; +import java.util.List; @Table(name = "wx_merchant_shop") public class WxMerchantShop implements Serializable { @@ -62,6 +61,10 @@ public class WxMerchantShop implements Serializable { /*租期结束时间**/ @io.swagger.annotations.ApiModelProperty(value="租期结束时间",name="rentalEndDate") private Date rentalEndDate; + + @io.swagger.annotations.ApiModelProperty(value="删除状态",name="isDel") + private Integer isDel; + public String getTenantId() { return tenantId; } @@ -105,7 +108,13 @@ public class WxMerchantShop implements Serializable { rentalEndDate = _rentalEndDate; } + public Integer getIsDel() { + return isDel; + } + public void setIsDel(Integer isDel) { + this.isDel = isDel; + } public static enum Field { @@ -149,7 +158,9 @@ public class WxMerchantShop implements Serializable { sb.append(","); sb.append(fields[k].toString()); } - + + this.sortColumns=sb.toString(); + } public void setSortColumns(String sortColumns) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 2a599d4b5..138854892 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -50,10 +50,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id); WxMerchantShop wxMerchantShop=new WxMerchantShop(); wxMerchantShop.setMerchantId(wxMerchant.getId()); + wxMerchantShop.setIsDel(0); List shops = new ArrayList<>(); List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); for(WxMerchantShop merchantShop:wxMerchantShopList){ + wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate()); + wxMerchant.setRentalEndDate(merchantShop.getRentalStartDate()); WxShop wxShop = WxShopMapper.selectByPrimaryKey(merchantShop.getShopId()); if(wxShop!=null) shops.add(wxShop); @@ -113,8 +116,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { Date shopdate = new Date(); wxMerchantShop.setUpdateDate(shopdate); wxMerchantShop.setCreateDate(shopdate); - wxMerchantShop.setRentalEndDate(shopdate); - wxMerchantShop.setRentalStartDate(shopdate); + wxMerchantShop.setIsDel(0); + wxMerchantShop.setRentalStartDate(wxMerchant.getRentalStartDate()); + wxMerchantShop.setRentalEndDate(wxMerchant.getRentalEndDate()); wxMerchantShopMapper.insertSelective(wxMerchantShop); //更新商铺状态 @@ -155,7 +159,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantShopQuery.setMerchantId(wxMerchant.getId()); List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShopQuery); for(WxMerchantShop merchantShop:wxMerchantShopList){ - wxMerchantShopMapper.delete(merchantShop); + merchantShop.setIsDel(1); + wxMerchantShopMapper.updateByPrimaryKeySelective(merchantShop); //更新商铺状态 WxShop wxShop = new WxShop(); @@ -175,8 +180,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { Date shopdate = new Date(); wxMerchantShop.setUpdateDate(shopdate); wxMerchantShop.setCreateDate(shopdate); - wxMerchantShop.setRentalEndDate(shopdate); - wxMerchantShop.setRentalStartDate(shopdate); + wxMerchantShop.setRentalStartDate(wxMerchant.getRentalStartDate()); + wxMerchantShop.setRentalEndDate(wxMerchant.getRentalEndDate()); + wxMerchantShop.setIsDel(0); wxMerchantShopMapper.insertSelective(wxMerchantShop); //更新商铺状态 diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 0f12d3297..9257890a8 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -15,11 +15,12 @@ + - `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`receiver_account`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status` + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`receiver_account`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person` @@ -87,8 +88,12 @@ - and `status` = #{status} - + and `status` = #{status} + + + + and `link_person` = #{linkPerson} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml index e6d6c6a51..9a50b07f6 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml @@ -10,10 +10,12 @@ + + - `id`,`tenant_id`,`merchant_id`,`shop_id`,`create_date`,`update_date`,`rental_start_date`,`rental_end_date` + `id`,`tenant_id`,`merchant_id`,`shop_id`,`create_date`,`update_date`,`rental_start_date`,`rental_end_date`,`is_del` @@ -55,9 +57,11 @@ - and `rental_end_date` = #{rentalEndDate} - - + and `rental_end_date` = #{rentalEndDate} + + + and `is_del` = #{isDel} + and id in