diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 7fb89038a..2a3fc1d66 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -117,7 +117,7 @@ public class WxPropertyContractController extends WxContractBaseController { return new ResultData("createType参数不能为空"); } if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { - if (StringUtils.isBlank(wxPropertyContract.getShopIds())) { + if (StringUtils.isBlank(wxPropertyContract.getRentInfo())) { return new ResultData(Result.ERROR,"请选择店铺"); } if (null == wxPropertyContract.getRentalStartDate()) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index e4d39f984..73eb64787 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -349,8 +349,5 @@ public class WxPropertyContract extends TenantEntity { @TableField(exist = false) private Long queryShopId; - - @TableField(exist = false) - private String shopIds; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 0d9182555..7ed104cf7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -333,17 +333,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService Date date = new Date(); if (record.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { - List shopIds = record.shopIdsByShop(); - WxShop shopq = new WxShop(); - shopq.updateTenantInfo(record); - shopq.setIds(shopIds); - List shlist = wxShopService.selectList(shopq); + Map areaMap = record.getRentShopArea(); BigDecimal rentArea = new BigDecimal(0); - for (int i = 0 ; i< shlist.size(); i ++) { - rentArea = rentArea.add(new BigDecimal(shlist.get(i).getOperationArea())); - } - if (null != shlist) { - record.setRentInfo(JSON.toJSONString(shlist)); + for (Iterator it = areaMap.keySet().iterator();it.hasNext();) { + Long sid = it.next(); + BigDecimal sa = areaMap.get(sid); + rentArea = rentArea.add(sa); } record.setRentArea(rentArea.toPlainString()); }