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 08d295866..85f4c2bed 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -272,4 +272,7 @@ public class WxMerchant extends BaseEntity { @SortColumn(column = "consumeCount") private String consumeCount; + @io.swagger.annotations.ApiModelProperty(value = "1已关联合同", name = "hasContract") + @TableField(exist = false) + private Integer hasContract; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumHasContract.java b/mallinkService/src/main/java/com/iformall/enums/EnumHasContract.java new file mode 100644 index 000000000..abe96216e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumHasContract.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumHasContract { + + + NO(0, "无"), + HAS(1, "有"), + ; + + public static EnumHasContract getEnum(Integer code) { + for (EnumHasContract value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumHasContract(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} 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 8e110318f..f57eb1b8a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -21,6 +21,8 @@ import com.iformall.mapper.*; import com.iformall.service.*; import com.iformall.utils.DateUtils; import com.iformall.utils.EventUtil; +import jodd.util.CollectionUtil; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -748,6 +750,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { } merchant.setShoplist(shops); } + + WxRentContract rc = new WxRentContract(); + rc.setMerchantId(record.getId()); + rc.setTenantId(record.getTenantId()); + List rentContractList = wxRentContractMapper.findList(rc); + if(CollectionUtils.isEmpty(rentContractList)){ + merchant.setHasContract(EnumHasContract.NO.getCode()); + }else{ + merchant.setHasContract(EnumHasContract.HAS.getCode()); + } } PageInfo pageInfo = new PageInfo<>(merchants); return pageInfo; diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 37afa1f59..c98058a82 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -498,7 +498,7 @@ and s.id not in( - SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status in(1,2,3,4) + SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status in(1,2,3,4,8) and rent_shop_type=2 )