diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index eedcc1c67..13707b314 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -31,6 +32,7 @@ import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -2492,6 +2494,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public Map selectRentContractByShopIds(Collection shopIds, String shopIdsRegexp) { List list = wxRentContractMapper.selectRentContractByShopIds(shopIds, shopIdsRegexp); + List shopIdArr = Arrays.asList(StringUtils.split(shopIdsRegexp,"|")) ; Map allShopContract = new HashMap<>(); for (WxRentContract wxRentContract : list) { if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { @@ -2501,13 +2504,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { //查询rent_info 包括 shopId for (int i = 0; i < size; i++) { JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); - WxRentContract rentContract = new WxRentContract(); - rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); - rentContract.setRentalEndDate(wxRentContract.getRentalEndDate()); Long shopId = rentInfoObject.getLong("shopId"); - if (Objects.isNull(shopId) || !shopIdsRegexp.contains(String.valueOf(shopId))) { + if (!shopIdArr.contains(String.valueOf(shopId))) { continue; } + WxRentContract rentContract = new WxRentContract(); + BeanUtils.copyProperties(wxRentContract,rentContract); + rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); + rentContract.setRentalEndDate(wxRentContract.getRentalEndDate()); rentContract.setShopId(shopId); allShopContract.put(shopId, rentContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 98e4207cf..97831fa6a 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -152,7 +152,7 @@ public class InvestBizServiceImpl implements InvestBizService { WxRentContract contract = shopContractMap.get(shop.getId()); if (Objects.nonNull(contract)) { shop.setStartdate(contract.getRentalStartDate()); - shop.setEnddate(contract.getEndDate()); + shop.setEnddate(contract.getRentalEndDate()); } }