| @@ -341,9 +341,6 @@ public class WxPropertyContract extends TenantEntity { | |||||
| return null; | return null; | ||||
| } | } | ||||
| @TableField(exist = false) | |||||
| private List<Long> merchantIds; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| List<WxEnergyFees> feeStandards; | List<WxEnergyFees> feeStandards; | ||||
| @@ -30,8 +30,6 @@ public interface WxPropertyContractMapper extends CommonMapper<WxPropertyContrac | |||||
| int updateRentContractEndStatus(WxPropertyContract wxRentContract); | int updateRentContractEndStatus(WxPropertyContract wxRentContract); | ||||
| void updateRentWaitSignStatus(WxPropertyContract wxRentContract); | |||||
| //void updateRentInvalidStatus(WxPropertyContract wxRentContract); | //void updateRentInvalidStatus(WxPropertyContract wxRentContract); | ||||
| //List<WxRentContract> getRentContractListByShop(Map<String, Object> params); | //List<WxRentContract> getRentContractListByShop(Map<String, Object> params); | ||||
| @@ -85,6 +85,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| @Lazy | @Lazy | ||||
| @Autowired | @Autowired | ||||
| WxRentContractService wxRentContractService; | WxRentContractService wxRentContractService; | ||||
| @Lazy | |||||
| @Autowired | |||||
| WxAgileContractService wxAgileContractService; | |||||
| @Lazy | @Lazy | ||||
| @Autowired | @Autowired | ||||
| @@ -108,11 +112,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| @Override | @Override | ||||
| public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { | ||||
| if (StringUtils.isNotBlank(record.getFloorForRule())) { | if (StringUtils.isNotBlank(record.getFloorForRule())) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | |||||
| record.setId(-1L); | |||||
| List<Long> contractIds = wxAgileContractService.findBuildingFloorContractIds(record, record.getFloorForRule(), null, null, null, 0); | |||||
| //List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); | |||||
| if (null == contractIds || contractIds.size() <= 0 ) { | |||||
| record.setId(-1L); | |||||
| } else { | } else { | ||||
| record.setMerchantIds(mids); | |||||
| record.setIds(contractIds); | |||||
| } | } | ||||
| } | } | ||||
| PageInfo<WxPropertyContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); | PageInfo<WxPropertyContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); | ||||
| @@ -122,13 +122,6 @@ | |||||
| and business_id in (${businessForRule}) | and business_id in (${businessForRule}) | ||||
| </if> | </if> | ||||
| <if test=" null != merchantIds "> | |||||
| and merchant_id in | |||||
| <foreach collection="merchantIds" index="index" item="mItem" open="(" separator="," close=")"> | |||||
| #{mItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||
| @@ -227,17 +220,6 @@ | |||||
| and rental_end_date <now() | and rental_end_date <now() | ||||
| </update> | </update> | ||||
| <update id="updateRentWaitSignStatus" parameterType="com.iformall.domain.po.WxPropertyContract"> | |||||
| update wx_property_contract set status=#{status} where status!=7 | |||||
| <if test=" null != tenantId and '' != tenantId"> | |||||
| and `tenant_id` = #{tenantId} | |||||
| </if> | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | |||||
| and `parent_tenant_id` = #{parentTenantId} | |||||
| </if> | |||||
| and merchant_id is null | |||||
| </update> | |||||
| <update id="updateApplyStatus" parameterType="com.iformall.domain.po.WxPropertyContract"> | <update id="updateApplyStatus" parameterType="com.iformall.domain.po.WxPropertyContract"> | ||||
| update wx_property_contract set apply_status=#{applyStatus} | update wx_property_contract set apply_status=#{applyStatus} | ||||
| <if test=" null != businessType ">,business_type=#{businessType}</if> | <if test=" null != businessType ">,business_type=#{businessType}</if> | ||||