diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java index a26d98e45..1810dced2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java @@ -12,6 +12,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + /** * @author gongbiao */ @@ -65,5 +68,12 @@ public class WxBrandController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxBrandService.getById(id)); } + @GetMapping("/queryBrand") + public ResultData queryBrand() { + List> brandList = wxBrandService.queryBrand(getTenantId()); + return new ResultData(brandList); + } + + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index f61af509d..f333a860e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -50,9 +50,19 @@ public class WxPropertyContract implements Serializable { public void setShopNumber(String shopNumber) { this.shopNumber = shopNumber; } - - - /*商户**/ + + @Transient + private String brandName; + + public String getBrandName() { + return brandName; + } + + public void setBrandName(String brandName) { + this.brandName = brandName; + } + + /*商户**/ @io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId") private Long merchantId; /*月租金/分成(分)**/ @@ -96,7 +106,7 @@ public class WxPropertyContract implements Serializable { private String merchantName; /*经营品牌**/ @io.swagger.annotations.ApiModelProperty(value="经营品牌",name="brand") - private String brand; + private Long brand; /*经营业态ID:参照wx_business表**/ @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") private Integer businessId; @@ -224,10 +234,10 @@ public class WxPropertyContract implements Serializable { public void setMerchantName(String _merchantName) { merchantName = _merchantName; } - public String getBrand() { + public Long getBrand() { return brand; } - public void setBrand(String _brand) { + public void setBrand(Long _brand) { brand = _brand; } public Integer getBusinessId() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 08c36d11e..a5b046524 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -52,6 +52,9 @@ public class WxRentContract implements Serializable { @Transient private String floor; + @Transient + private String brandName; + public String getBuilding() { return building; } @@ -121,7 +124,7 @@ public class WxRentContract implements Serializable { private String merchantName; /*经营品牌**/ @io.swagger.annotations.ApiModelProperty(value = "经营品牌", name = "brand") - private String brand; + private Long brand; /*经常业态ID**/ @io.swagger.annotations.ApiModelProperty(value = "经常业态ID", name = "businessId") private Integer businessId; @@ -289,11 +292,11 @@ public class WxRentContract implements Serializable { merchantName = _merchantName; } - public String getBrand() { + public Long getBrand() { return brand; } - public void setBrand(String _brand) { + public void setBrand(Long _brand) { brand = _brand; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java index efd1e352c..2ffab76fa 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java @@ -5,6 +5,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBrand; import java.util.List; +import java.util.Map; /** * @author gongbiao @@ -12,10 +13,8 @@ import java.util.List; public interface WxBrandMapper extends CommonMapper { List findList(WxBrand wxBrand); - - - - - + + List> queryBrand(String tenantId); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java index e4ed0739b..357fcdc1c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java @@ -4,6 +4,9 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBrand; +import java.util.List; +import java.util.Map; + /** * @author gongbiao */ @@ -39,4 +42,5 @@ public interface WxBrandService { ResultData update(WxBrand wxBrand); + List> queryBrand(String id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index da746ab52..17b84c79e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -17,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; +import java.util.Map; /** * @author gongbiao @@ -52,6 +54,9 @@ public class WxBrandServiceImpl implements WxBrandService { try { final IdWorker idWorker = IdWorker.get(); wxBrand.setId(idWorker.nextId()); + Date date = new Date(); + wxBrand.setCreatetime(date); + wxBrand.setUpdatetime(date); wxBrandMapper.insertSelective(wxBrand); return new ResultData(Result.SUCCESS, "操作成功"); } catch (Exception e) { @@ -75,5 +80,10 @@ public class WxBrandServiceImpl implements WxBrandService { } } + @Override + public List> queryBrand(String tenantId) { + return wxBrandMapper.queryBrand(tenantId); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml index fb9999724..5b4031b2c 100644 --- a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml @@ -34,7 +34,9 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 6762089c2..89cc0d069 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -96,11 +96,12 @@ rentalEndDate,rc.`status`,rc.price,rc.contract_number contractNumber,s.shop_number shopNumber, f.floor_name floorName,b.building_name buildingName,receive_period receivePeriod, rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate, - start_date startDate,end_date endDate,rc.rent_contract_id rentContractId + start_date startDate,end_date endDate,rc.rent_contract_id rentContractId,b.`name` brandName from wx_property_contract rc left join wx_shop s on rc.shop_id=s.id left join wx_mall_floor f on s.floor=f.id left join wx_mall_building b on s.building=b.id + left join wx_brand b on rc.brand=b.id rc.tenant_id=#{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index b4a10a00d..96197f51e 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -99,11 +99,12 @@ select rc.id,rc.merchant_name merchantName,rc.rental_start_date rentalStartDate,rc.rental_end_date rentalEndDate,rc.`status`, rc.price,rc.contract_number contractNumber,s.shop_number shopNumber,f.floor_name floorName,b.building_name buildingName, rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate,rc.merchant_id merchantId,rc.type, - rc.start_date startDate,rc.end_date endDate + rc.start_date startDate,rc.end_date endDate,b.`name` brandName from wx_rent_contract rc left join wx_shop s on rc.shop_id=s.id left join wx_mall_floor f on s.floor=f.id left join wx_mall_building b on s.building=b.id + left join wx_brand b on rc.brand=b.id rc.tenant_id=#{tenantId} and rc.`merchant_name` like concat('%',#{merchantName},'%')