| @@ -85,6 +85,14 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| if (null == wxPropertyContract.getIsPrivateMerchant()) { | if (null == wxPropertyContract.getIsPrivateMerchant()) { | ||||
| wxPropertyContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); | wxPropertyContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); | ||||
| } | } | ||||
| //如果是已售,则查询虚拟商户,并且店铺类型是商业的 | |||||
| if (wxPropertyContract.getIsPrivateMerchant()==EnumShopSellStatus.SELLED.getCode()) { | |||||
| wxPropertyContract.setIsPrivateMerchant(EnumYesOrNo.YES.getCode()); | |||||
| List<Integer> rentShopTypeList = new ArrayList<Integer>(); | |||||
| rentShopTypeList.add(EnumRentShopType.SHOP.getCode()); | |||||
| rentShopTypeList.add(EnumRentShopType.POINT.getCode()); | |||||
| wxPropertyContract.setPrivateRentShopTypeList(rentShopTypeList); | |||||
| } | |||||
| PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| if (null != pageInfo && null != pageInfo.getList()) { | if (null != pageInfo && null != pageInfo.getList()) { | ||||
| @@ -214,6 +222,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| wxPropertyContract.setLinkPhone(merchant.getLinkPhone()); | wxPropertyContract.setLinkPhone(merchant.getLinkPhone()); | ||||
| //wxPropertyContract.setRentShopType(merchant.getType()); | //wxPropertyContract.setRentShopType(merchant.getType()); | ||||
| wxPropertyContract.setIsPrivateMerchant(merchant.getIsPrivate()); | wxPropertyContract.setIsPrivateMerchant(merchant.getIsPrivate()); | ||||
| wxPropertyContract.setPrivateRentShopType(merchant.getCreateShopType()); | |||||
| wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode()); | wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode()); | ||||
| return wxPropertyContractService.save(wxPropertyContract, user, user.getName(),false); | return wxPropertyContractService.save(wxPropertyContract, user, user.getName(),false); | ||||
| @@ -81,6 +81,14 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| if (null == wxRentContract.getIsPrivateMerchant()) { | if (null == wxRentContract.getIsPrivateMerchant()) { | ||||
| wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); | wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); | ||||
| } | } | ||||
| //如果是已售,则查询虚拟商户,并且店铺类型是商业的 | |||||
| if (wxRentContract.getIsPrivateMerchant()==EnumShopSellStatus.SELLED.getCode()) { | |||||
| wxRentContract.setIsPrivateMerchant(EnumYesOrNo.YES.getCode()); | |||||
| List<Integer> rentShopTypeList = new ArrayList<Integer>(); | |||||
| rentShopTypeList.add(EnumRentShopType.SHOP.getCode()); | |||||
| rentShopTypeList.add(EnumRentShopType.POINT.getCode()); | |||||
| wxRentContract.setPrivateRentShopTypeList(rentShopTypeList); | |||||
| } | |||||
| PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| if (null != page && null != page.getList()) { | if (null != page && null != page.getList()) { | ||||
| @@ -277,7 +285,7 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| shopList = new ArrayList<Long>(); | shopList = new ArrayList<Long>(); | ||||
| //不从这取,因为这是存的第一次创建时店铺的编号,这个店铺有可能被删除重新创建 | //不从这取,因为这是存的第一次创建时店铺的编号,这个店铺有可能被删除重新创建 | ||||
| //shopList.add(Long.parseLong(merchant.getCreateFromId())); | //shopList.add(Long.parseLong(merchant.getCreateFromId())); | ||||
| String shopNumber = merchant.getCreateFromData(); | |||||
| String shopNumber = merchant.getCreateShopNumber(); | |||||
| WxShop shop = wxShopService.getShopByShopNumber(merchant, shopNumber); | WxShop shop = wxShopService.getShopByShopNumber(merchant, shopNumber); | ||||
| if (null != shop) { | if (null != shop) { | ||||
| shopList.add(shop.getId()); | shopList.add(shop.getId()); | ||||
| @@ -9,6 +9,9 @@ import com.iformall.domain.po.MallUserInfo; | |||||
| import com.iformall.domain.po.WxRentContract; | import com.iformall.domain.po.WxRentContract; | ||||
| import com.iformall.domain.po.WxUserDataRule; | import com.iformall.domain.po.WxUserDataRule; | ||||
| import com.iformall.domain.vo.WxRentPropertyContractVo; | import com.iformall.domain.vo.WxRentPropertyContractVo; | ||||
| import com.iformall.enums.EnumRentShopType; | |||||
| import com.iformall.enums.EnumShopSellStatus; | |||||
| import com.iformall.enums.EnumYesOrNo; | |||||
| import com.iformall.service.WxMallBuildingService; | import com.iformall.service.WxMallBuildingService; | ||||
| import com.iformall.service.WxMallFloorService; | import com.iformall.service.WxMallFloorService; | ||||
| import com.iformall.service.WxRentPropertyContractService; | import com.iformall.service.WxRentPropertyContractService; | ||||
| @@ -58,6 +61,9 @@ public class WxRentPropertyContractController extends WxContractBaseController { | |||||
| wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); | wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopTypes()); | wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopTypes()); | ||||
| } | } | ||||
| if (null == wxRentPropertyContractVo.getIsPrivateMerchant()) { | |||||
| wxRentPropertyContractVo.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); | |||||
| } | |||||
| PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| if (null != page && null != page.getList()) { | if (null != page && null != page.getList()) { | ||||
| @@ -2,3 +2,9 @@ ALTER TABLE wx_shop ADD COLUMN sell_status INT(1) NOT NULL DEFAULT 1 COMMENT ' | |||||
| 更新虚拟商户的铺位为待出租状态。 | 更新虚拟商户的铺位为待出租状态。 | ||||
| 删除虚拟商户的关联铺位。 | 删除虚拟商户的关联铺位。 | ||||
| ALTER TABLE wx_merchant CHANGE `create_from_data` create_shop_number VARCHAR(100); | |||||
| ALTER TABLE wx_merchant ADD COLUMN create_shop_type INT(1) COMMENT '创建店铺类型'; | |||||
| ALTER TABLE wx_rent_contract ADD COLUMN private_rent_shop_type INT(1) COMMENT '虚拟商户店铺类型'; | |||||
| ALTER TABLE wx_property_contract ADD COLUMN private_rent_shop_type INT(1) COMMENT '虚拟商户店铺类型'; | |||||
| @@ -158,8 +158,11 @@ public class WxMerchant extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建来源Id", name = "createFromId") | @io.swagger.annotations.ApiModelProperty(value = "创建来源Id", name = "createFromId") | ||||
| private String createFromId; | private String createFromId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "创建来源数据", name = "createFromData") | |||||
| private String createFromData; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建来源铺位号", name = "createShopNumber") | |||||
| private String createShopNumber; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建来源铺位号类型", name = "createShopType") | |||||
| private Integer createShopType; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "startTime") | @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "startTime") | ||||
| @@ -57,6 +57,8 @@ public class WxPropertyContract extends TenantEntity { | |||||
| private Long merchantId; | private Long merchantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "是不是私密商户(虚拟)", name = "isPrivateMerchant") | @io.swagger.annotations.ApiModelProperty(value = "是不是私密商户(虚拟)", name = "isPrivateMerchant") | ||||
| private Integer isPrivateMerchant; | private Integer isPrivateMerchant; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "虚拟商户店铺类型EnumRentShopType", name = "privateRentShopType") | |||||
| private Integer privateRentShopType; | |||||
| /*月租金/分成(分)**/ | /*月租金/分成(分)**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price") | @io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price") | ||||
| private String price; | private String price; | ||||
| @@ -373,5 +375,8 @@ public class WxPropertyContract extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String queryShopNumber; | private String queryShopNumber; | ||||
| @TableField(exist = false) | |||||
| private List<Integer> privateRentShopTypeList; | |||||
| } | } | ||||
| @@ -230,6 +230,8 @@ public class WxRentContract extends TenantEntity { | |||||
| private Long merchantId; | private Long merchantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "是不是私密商户(虚拟)", name = "isPrivateMerchant") | @io.swagger.annotations.ApiModelProperty(value = "是不是私密商户(虚拟)", name = "isPrivateMerchant") | ||||
| private Integer isPrivateMerchant; | private Integer isPrivateMerchant; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "虚拟商户店铺类型EnumRentShopType", name = "privateRentShopType") | |||||
| private Integer privateRentShopType; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(元)", name = "price") | @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(元)", name = "price") | ||||
| private String price; | private String price; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -631,5 +633,7 @@ public class WxRentContract extends TenantEntity { | |||||
| private Date yearsEnd; | private Date yearsEnd; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String queryShopNumber; | private String queryShopNumber; | ||||
| @TableField(exist = false) | |||||
| private List<Integer> privateRentShopTypeList; | |||||
| } | } | ||||
| @@ -432,6 +432,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| // | // | ||||
| WxMerchant merchant = wxMerchantMapper.selectById(record.getMerchantId()); | WxMerchant merchant = wxMerchantMapper.selectById(record.getMerchantId()); | ||||
| record.setIsPrivateMerchant(merchant.getIsPrivate()); | record.setIsPrivateMerchant(merchant.getIsPrivate()); | ||||
| record.setPrivateRentShopType(merchant.getCreateShopType()); | |||||
| try { | try { | ||||
| record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); | record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); | ||||
| record.setStatus(EnumRentContractStatus.UNWRITE.getCode()); | record.setStatus(EnumRentContractStatus.UNWRITE.getCode()); | ||||
| @@ -391,7 +391,7 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| WxMerchant merchant = new WxMerchant(); | WxMerchant merchant = new WxMerchant(); | ||||
| merchant.updateTenantInfo(record); | merchant.updateTenantInfo(record); | ||||
| merchant.setName("[系统铺位号]"+record.getShopNumber()); | merchant.setName("[系统铺位号]"+record.getShopNumber()); | ||||
| merchant.setCreateFromData(record.getShopNumber()); | |||||
| merchant.setCreateShopNumber(record.getShopNumber()); | |||||
| merchant.setCreateFrom(EnumMerchantCreateFrom.SYS_SHOP_CREATE.getCode()); | merchant.setCreateFrom(EnumMerchantCreateFrom.SYS_SHOP_CREATE.getCode()); | ||||
| List<Long> ids = wxMerchantMapper.findIdList(merchant); | List<Long> ids = wxMerchantMapper.findIdList(merchant); | ||||
| if (null == ids || ids.size() <= 0 ) { | if (null == ids || ids.size() <= 0 ) { | ||||
| @@ -405,6 +405,7 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| merchant.setUpdateDate(new Date()); | merchant.setUpdateDate(new Date()); | ||||
| merchant.setIsPublic(EnumMerchantPublic.PRIVATE.getCode()); | merchant.setIsPublic(EnumMerchantPublic.PRIVATE.getCode()); | ||||
| merchant.setIsPrivate(EnumYesOrNo.YES.getCode()); | merchant.setIsPrivate(EnumYesOrNo.YES.getCode()); | ||||
| merchant.setCreateShopType(record.getType()); | |||||
| merchant.setBillSetting(3); | merchant.setBillSetting(3); | ||||
| merchant.setCreateFromId(String.valueOf(record.getId())); | merchant.setCreateFromId(String.valueOf(record.getId())); | ||||
| merchant.setCarVendorType(0); | merchant.setCarVendorType(0); | ||||
| @@ -50,14 +50,15 @@ | |||||
| <result column="create_from" jdbcType="INTEGER" property="createFrom"/> | <result column="create_from" jdbcType="INTEGER" property="createFrom"/> | ||||
| <result column="create_from_id" jdbcType="VARCHAR" property="createFromId"/> | <result column="create_from_id" jdbcType="VARCHAR" property="createFromId"/> | ||||
| <result column="create_from_data" jdbcType="VARCHAR" property="createFromData"/> | |||||
| <result column="create_shop_number" jdbcType="VARCHAR" property="createShopNumber"/> | |||||
| <result column="create_shop_type" jdbcType="INTEGER" property="createShopType"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`img_url`,m.`name`,m.`encode`,m.`link_phone`,m.`create_date`,m.`update_date`,m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, | m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`img_url`,m.`name`,m.`encode`,m.`link_phone`,m.`create_date`,m.`update_date`,m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, | ||||
| m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`is_public`,m.`is_private`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, | m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`is_public`,m.`is_private`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, | ||||
| m.`introduction`,m.`action_desc`,m.`mark`,m.mark_time,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,m.search_card_by_phone,m.credit_locked,m.credit_locked,m.entry_amount,m.cash_out_count, | m.`introduction`,m.`action_desc`,m.`mark`,m.mark_time,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,m.search_card_by_phone,m.credit_locked,m.credit_locked,m.entry_amount,m.cash_out_count, | ||||
| m.cash_out_last_time,m.create_from,m.create_from_id,m.create_from_data | |||||
| m.cash_out_last_time,m.create_from,m.create_from_id,m.create_shop_number,m.create_shop_type | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -178,8 +179,12 @@ | |||||
| and m.`create_from_id` = #{createFromId} | and m.`create_from_id` = #{createFromId} | ||||
| </if> | </if> | ||||
| <if test=" null != createFromData and '' != createFromData"> | |||||
| and m.`create_from_data` = #{createFromData} | |||||
| <if test=" null != createShopNumber and '' != createShopNumber"> | |||||
| and m.`create_shop_number` = #{createShopNumber} | |||||
| </if> | |||||
| <if test=" null != createShopType "> | |||||
| and m.`create_shop_type` = #{createShopType} | |||||
| </if> | </if> | ||||
| <if test=" null != searchKey and '' != searchKey "> | <if test=" null != searchKey and '' != searchKey "> | ||||
| @@ -5,6 +5,7 @@ | |||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | ||||
| <result column="is_private_merchant" jdbcType="INTEGER" property="isPrivateMerchant"/> | <result column="is_private_merchant" jdbcType="INTEGER" property="isPrivateMerchant"/> | ||||
| <result column="private_rent_shop_type" jdbcType="INTEGER" property="privateRentShopType"/> | |||||
| <result column="decimal_size" jdbcType="INTEGER" property="decimalSize"/> | <result column="decimal_size" jdbcType="INTEGER" property="decimalSize"/> | ||||
| <result column="price" jdbcType="VARCHAR" property="price"/> | <result column="price" jdbcType="VARCHAR" property="price"/> | ||||
| <result column="rental_start_date" jdbcType="TIMESTAMP" property="rentalStartDate"/> | <result column="rental_start_date" jdbcType="TIMESTAMP" property="rentalStartDate"/> | ||||
| @@ -72,7 +73,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`merchant_id`,`is_private_merchant`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,`shop_ids`,`shop_numbers`, | |||||
| `id`,`merchant_id`,`is_private_merchant`,`private_rent_shop_type`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,`shop_ids`,`shop_numbers`, | |||||
| `sign_date`,`receive_period`,`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`, | `sign_date`,`receive_period`,`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`, | ||||
| `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`receive_period_unit`,`create_by`,`update_by`,`first_bill_receive_date`, | `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`receive_period_unit`,`create_by`,`update_by`,`first_bill_receive_date`, | ||||
| `shop_type`,`updatetime`,`createtime`,`rent_area`,`fees_standards_info`,`first_bill_date_start`,`first_bill_date_end`, | `shop_type`,`updatetime`,`createtime`,`rent_area`,`fees_standards_info`,`first_bill_date_start`,`first_bill_date_end`, | ||||
| @@ -86,6 +87,7 @@ | |||||
| <if test=" null != id ">and `id` = #{id}</if> | <if test=" null != id ">and `id` = #{id}</if> | ||||
| <if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if> | <if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if> | ||||
| <if test=" null != isPrivateMerchant ">and `is_private_merchant` = #{isPrivateMerchant}</if> | <if test=" null != isPrivateMerchant ">and `is_private_merchant` = #{isPrivateMerchant}</if> | ||||
| <if test=" null != privateRentShopType ">and `private_rent_shop_type` = #{privateRentShopType}</if> | |||||
| <if test=" null != price ">and `price` = #{price}</if> | <if test=" null != price ">and `price` = #{price}</if> | ||||
| <if test=" null != rentalStartDate ">and `rental_start_date` = #{rentalStartDate}</if> | <if test=" null != rentalStartDate ">and `rental_start_date` = #{rentalStartDate}</if> | ||||
| <if test=" null != rentalEndDate ">and `rental_end_date` = #{rentalEndDate}</if> | <if test=" null != rentalEndDate ">and `rental_end_date` = #{rentalEndDate}</if> | ||||
| @@ -132,6 +134,14 @@ | |||||
| <if test=" null != queryShopNumber and queryShopNumber!=''"> | <if test=" null != queryShopNumber and queryShopNumber!=''"> | ||||
| and concat(',',shop_numbers,',') like concat('%,',#{queryShopNumber},',%') | and concat(',',shop_numbers,',') like concat('%,',#{queryShopNumber},',%') | ||||
| </if> | </if> | ||||
| <if test=" null != privateRentShopTypeList "> | |||||
| and private_rent_shop_type in | |||||
| <foreach collection="privateRentShopTypeList" index="index" item="pmItem" open="(" separator="," close=")"> | |||||
| #{pmItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | ||||
| @@ -5,6 +5,7 @@ | |||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | ||||
| <result column="is_private_merchant" jdbcType="INTEGER" property="isPrivateMerchant"/> | <result column="is_private_merchant" jdbcType="INTEGER" property="isPrivateMerchant"/> | ||||
| <result column="private_rent_shop_type" jdbcType="INTEGER" property="privateRentShopType"/> | |||||
| <result column="shop_type_sub" jdbcType="VARCHAR" property="shopTypeSub"/> | <result column="shop_type_sub" jdbcType="VARCHAR" property="shopTypeSub"/> | ||||
| <result column="lease_purpose" jdbcType="VARCHAR" property="leasePurpose"/> | <result column="lease_purpose" jdbcType="VARCHAR" property="leasePurpose"/> | ||||
| <result column="contractual_rules" jdbcType="VARCHAR" property="contractualRules"/> | <result column="contractual_rules" jdbcType="VARCHAR" property="contractualRules"/> | ||||
| @@ -132,7 +133,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`merchant_id`,`is_private_merchant`, | |||||
| `id`,`merchant_id`,`is_private_merchant`,`private_rent_shop_type`, | |||||
| `shop_type_sub`,`lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`,`scope_metre`, | `shop_type_sub`,`lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`,`scope_metre`, | ||||
| `decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`receive_period_unit`, | `decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`receive_period_unit`, | ||||
| `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by`,`update_by`, | `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by`,`update_by`, | ||||
| @@ -156,6 +157,7 @@ | |||||
| <if test=" null != fromId ">and `from_id` = #{fromId}</if> | <if test=" null != fromId ">and `from_id` = #{fromId}</if> | ||||
| <if test=" null != merchantId and '' != merchantId">and `merchant_id` = #{merchantId}</if> | <if test=" null != merchantId and '' != merchantId">and `merchant_id` = #{merchantId}</if> | ||||
| <if test=" null != isPrivateMerchant">and `is_private_merchant` = #{isPrivateMerchant}</if> | <if test=" null != isPrivateMerchant">and `is_private_merchant` = #{isPrivateMerchant}</if> | ||||
| <if test=" null != privateRentShopType">and `private_rent_shop_type` = #{privateRentShopType}</if> | |||||
| <if test=" null != price and '' != price">and `price` = #{price}</if> | <if test=" null != price and '' != price">and `price` = #{price}</if> | ||||
| <if test=" null != rentalStartDate and '' != rentalStartDate">and `rental_start_date` = #{rentalStartDate}</if> | <if test=" null != rentalStartDate and '' != rentalStartDate">and `rental_start_date` = #{rentalStartDate}</if> | ||||
| <if test=" null != rentalEndDate and '' != rentalEndDate">and `rental_end_date` = #{rentalEndDate}</if> | <if test=" null != rentalEndDate and '' != rentalEndDate">and `rental_end_date` = #{rentalEndDate}</if> | ||||
| @@ -207,6 +209,13 @@ | |||||
| and business_id in (${businessForRule}) | and business_id in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != privateRentShopTypeList "> | |||||
| and private_rent_shop_type in | |||||
| <foreach collection="privateRentShopTypeList" index="index" item="pmItem" open="(" separator="," close=")"> | |||||
| #{pmItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | ||||