Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
597c0cca5b
4 zmienionych plików z 9 dodań i 27 usunięć
  1. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  2. +0
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java
  3. +9
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  4. +0
    -18
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml

+ 0
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java Wyświetl plik

@@ -341,9 +341,6 @@ public class WxPropertyContract extends TenantEntity {
return null;
}
@TableField(exist = false)
private List<Long> merchantIds;
@TableField(exist = false)
List<WxEnergyFees> feeStandards;


+ 0
- 2
mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java Wyświetl plik

@@ -30,8 +30,6 @@ public interface WxPropertyContractMapper extends CommonMapper<WxPropertyContrac

int updateRentContractEndStatus(WxPropertyContract wxRentContract);

void updateRentWaitSignStatus(WxPropertyContract wxRentContract);

//void updateRentInvalidStatus(WxPropertyContract wxRentContract);

//List<WxRentContract> getRentContractListByShop(Map<String, Object> params);


+ 9
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Wyświetl plik

@@ -85,6 +85,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
@Lazy
@Autowired
WxRentContractService wxRentContractService;
@Lazy
@Autowired
WxAgileContractService wxAgileContractService;

@Lazy
@Autowired
@@ -108,11 +112,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
@Override
public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) {
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 {
record.setMerchantIds(mids);
record.setIds(contractIds);
}
}
PageInfo<WxPropertyContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record));


+ 0
- 18
mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml Wyświetl plik

@@ -122,13 +122,6 @@
and business_id in (${businessForRule})
</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 ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -227,17 +220,6 @@
and rental_end_date &lt;now()
</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 wx_property_contract set apply_status=#{applyStatus}
<if test=" null != businessType ">,business_type=#{businessType}</if>


Ładowanie…
Anuluj
Zapisz