From 49427bcc106b8743598abe0a4c71db3dca5dd00d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 19 Jan 2019 13:21:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=8C=89=E5=BA=97=E9=93=BA=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 10 ++-- .../controller/WxRentContractController.java | 5 +- .../domain/po/WxPropertyContract.java | 11 ++++ .../service/WxPropertyContractService.java | 4 +- .../service/WxRentContractService.java | 2 +- .../impl/WxPropertyContractServiceImpl.java | 52 ++++++++++--------- .../impl/WxRentContractServiceImpl.java | 20 +++---- .../mapper/WxPropertyContractMapper.xml | 19 +++++-- .../resources/mapper/WxRentContractMapper.xml | 15 ++++-- 9 files changed, 88 insertions(+), 50 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java index 55e07e1f3..9f9b761e6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java @@ -77,9 +77,10 @@ public class WxPropertyContractController extends BaseController } @GetMapping("/getPropertyContractStatusInfo") - public ResultData getPropertyContractStatusInfo() { + public ResultData getPropertyContractStatusInfo(@ModelAttribute WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getPropertyContractStatusInfo"); - return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractStatusInfo(getTenantId())); + wxPropertyContract.setTenantId(getTenantId()); + return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractStatusInfo(wxPropertyContract)); } @GetMapping("/endPropertyContract") @@ -90,9 +91,10 @@ public class WxPropertyContractController extends BaseController } @GetMapping("/getRentContractList") - public ResultData getRentContractList() { + public ResultData getRentContractList(@ModelAttribute WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getRentContractList"); - return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractList(getTenantId())); + wxPropertyContract.setTenantId(getTenantId()); + return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractList(wxPropertyContract)); } @GetMapping("/endPropertyContractByRentContractId") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index 17d3c974c..658aaf817 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -90,9 +90,10 @@ public class WxRentContractController extends BaseController { } @GetMapping("/getRentContractStatusInfo") - public ResultData getRentContractStatusInfo() { + public ResultData getRentContractStatusInfo(@ModelAttribute WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractStatusInfo"); - return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getRentContractStatusInfo(getTenantId())); + wxRentContract.setTenantId(getTenantId()); + return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getRentContractStatusInfo(wxRentContract)); } @GetMapping("/endRentContract") 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 a6605445d..eb18c482e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -153,6 +153,9 @@ public class WxPropertyContract implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "起租结束时间", name = "rentalEndDate") private Date endDate; + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") + private Integer rentShopType; + public Integer getApplyStatus() { return applyStatus; } @@ -340,6 +343,14 @@ public class WxPropertyContract implements Serializable { this.endDate = endDate; } + public Integer getRentShopType() { + return rentShopType; + } + + public void setRentShopType(Integer rentShopType) { + this.rentShopType = rentShopType; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 0a771e588..079485791 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -47,11 +47,11 @@ public interface WxPropertyContractService { void download(HttpServletRequest request, HttpServletResponse response, String tenantId); - Object getRentContractStatusInfo(String tenantId); + Object getRentContractStatusInfo(WxPropertyContract record); ResultData endRentContract(Long id); - Object getRentContractList(String tenantId); + Object getRentContractList(WxPropertyContract record); ResultData endPropertyContractByRentContractId(Long rentContractId); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 95678d3b4..cb886abc5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -51,7 +51,7 @@ public interface WxRentContractService { void download(HttpServletRequest request, HttpServletResponse response, String tenantId); - Object getRentContractStatusInfo(String tenantId); + Object getRentContractStatusInfo(WxRentContract record); ResultData endRentContract(Long id, Integer status); 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 5cabee440..fa16058d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -55,7 +55,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public Map listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { - Object rentContractStatusInfo = getRentContractStatusInfo(record.getTenantId()); + Object rentContractStatusInfo = getRentContractStatusInfo(record); PageHelper.startPage(pageIndex, pageSize); List> rentContractData = wxPropertyContractMapper.queryPropertyContractData(record); PageInfo> pageInfo = new PageInfo<>(rentContractData); @@ -416,12 +416,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Transactional(rollbackFor = {Exception.class}) @Override - public Object getRentContractStatusInfo(String tenantId) { + public Object getRentContractStatusInfo(WxPropertyContract record) { Map resultData = new HashMap(); //商铺信息 WxShop wxShop = new WxShop(); - wxShop.setTenantId(tenantId); + wxShop.setTenantId(record.getTenantId()); + wxShop.setType(record.getRentShopType()); wxShop.setStatus(EnumShopStatus.RENT.getCode()); List rentedList = wxShopMapper.findList(wxShop); wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); @@ -436,7 +437,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService resultData.put("shopCountInfo", shopMap); //需要更新的状态 - resultData.putAll(updateStatus(tenantId)); + resultData.putAll(updateStatus(record)); return resultData; } @@ -461,9 +462,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override - public Object getRentContractList(String tenantId) { + public Object getRentContractList(WxPropertyContract record) { Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", record.getTenantId()); + params.put("rentShopType", record.getRentShopType()); return wxPropertyContractMapper.getRentContractList(params); } @@ -511,41 +513,41 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return new ResultData(false); } - public Map updateStatus(String tenantId) { + public Map updateStatus(WxPropertyContract record) { Map resultData = new HashMap(); - WxPropertyContract wxRentContract = new WxPropertyContract(); - wxRentContract.setTenantId(tenantId); - + WxPropertyContract wxPropertyContract = new WxPropertyContract(); + wxPropertyContract.setTenantId(record.getTenantId()); + wxPropertyContract.setRentShopType(record.getRentShopType()); - int allCount = wxPropertyContractMapper.selectCount(wxRentContract); + int allCount = wxPropertyContractMapper.selectCount(wxPropertyContract); resultData.put("allCount", allCount); //作废合同 - wxRentContract.setStatus(EnumRentContractStatus.INVALID.getCode()); - wxPropertyContractMapper.updateRentInvalidStatus(wxRentContract); + wxPropertyContract.setStatus(EnumRentContractStatus.INVALID.getCode()); + wxPropertyContractMapper.updateRentInvalidStatus(wxPropertyContract); //待签约 - wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); - wxPropertyContractMapper.updateRentWaitSignStatus(wxRentContract); - int waitSignCount = wxPropertyContractMapper.queryRentContractWaitSignStatus(wxRentContract); + wxPropertyContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); + wxPropertyContractMapper.updateRentWaitSignStatus(wxPropertyContract); + int waitSignCount = wxPropertyContractMapper.queryRentContractWaitSignStatus(wxPropertyContract); resultData.put("waitSignCount", waitSignCount); //计租中 - wxRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); - int rendPaidCount = wxPropertyContractMapper.queryRentContractPaidStatus(wxRentContract); - wxPropertyContractMapper.updateRentContractPaidStatus(wxRentContract); + wxPropertyContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); + int rendPaidCount = wxPropertyContractMapper.queryRentContractPaidStatus(wxPropertyContract); + wxPropertyContractMapper.updateRentContractPaidStatus(wxPropertyContract); resultData.put("rendPaidCount", rendPaidCount); //将到期 - wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_END_SOON.getCode()); - int endSoonCount = wxPropertyContractMapper.queryRentContractEndSoonStatus(wxRentContract); - wxPropertyContractMapper.updateRentContractEndSoonStatus(wxRentContract); + wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_END_SOON.getCode()); + int endSoonCount = wxPropertyContractMapper.queryRentContractEndSoonStatus(wxPropertyContract); + wxPropertyContractMapper.updateRentContractEndSoonStatus(wxPropertyContract); resultData.put("endSoonCount", endSoonCount); //到期 - wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_END.getCode()); - int endCount = wxPropertyContractMapper.queryRentContractEndStatus(wxRentContract); - wxPropertyContractMapper.updateRentContractEndStatus(wxRentContract); + wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_END.getCode()); + int endCount = wxPropertyContractMapper.queryRentContractEndStatus(wxPropertyContract); + wxPropertyContractMapper.updateRentContractEndStatus(wxPropertyContract); resultData.put("endCount", endCount); return resultData; 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 2cf1f1652..f043e4732 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -83,7 +83,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public Map listAsPage(WxRentContract record, Integer pageIndex, Integer pageSize) { - Object rentContractStatusInfo = getRentContractStatusInfo(record.getTenantId()); + Object rentContractStatusInfo = getRentContractStatusInfo(record); PageHelper.startPage(pageIndex, pageSize); List> rentContractData = wxRentContractMapper.queryRentContractData(record); PageInfo> pageInfo = new PageInfo<>(rentContractData); @@ -177,7 +177,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } wxRentContractMapper.insertSelective(record); //建立账单 - /*if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) + if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setMerchantId(record.getMerchantId()); @@ -191,7 +191,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //押金 buildDeposit(wxMerchant, userId); } - }*/ + } } catch (Exception e) { logger.error("保存租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -525,12 +525,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Transactional(rollbackFor = {Exception.class}) @Override - public Object getRentContractStatusInfo(String tenantId) { + public Object getRentContractStatusInfo(WxRentContract rentContract) { Map resultData = new HashMap(); //商铺信息 WxShop wxShop = new WxShop(); - wxShop.setTenantId(tenantId); + wxShop.setTenantId(rentContract.getTenantId()); + wxShop.setType(rentContract.getRentShopType()); wxShop.setStatus(EnumShopStatus.RENT.getCode()); List rentedList = wxShopMapper.findList(wxShop); wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); @@ -545,7 +546,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { resultData.put("shopCountInfo", shopMap); //需要更新的状态 - resultData.putAll(updateStatus(tenantId)); + resultData.putAll(updateStatus(rentContract)); return resultData; } @@ -609,10 +610,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(tenantId)); } - public Map updateStatus(String tenantId) { + public Map updateStatus(WxRentContract record) { Map resultData = new HashMap(); WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setTenantId(tenantId); + wxRentContract.setTenantId(record.getTenantId()); + wxRentContract.setRentShopType(record.getRentShopType()); int allCount = wxRentContractMapper.selectCount(wxRentContract); resultData.put("allCount", allCount); @@ -687,7 +689,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { resultData.put("endCount", endCount); //合同到期 - contractEnd(tenantId); + contractEnd(record.getTenantId()); return resultData; } diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index bc421658a..7d6e88add 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -77,6 +77,8 @@ and `rent_contract_id` = #{rentContractId} and `start_date` = #{startDate} and `end_date` = #{endDate} + and `rent_shop_type` = #{rentShopType} + and id in @@ -115,6 +117,8 @@ and rc.`status` = #{status} and rc.`rent_contract_id` = #{rentContractId} and rc.`id` = #{id} + and rc.`rent_shop_type` = #{rentShopType} + order by rc.id desc @@ -122,19 +126,26 @@ @@ -165,7 +176,7 @@ and rc.id not in (select pc.rent_contract_id from ( select rent_contract_id from wx_property_contract where status not in(1,5,6,7) and tenant_id=#{tenantId} ) pc) - + and rent_shop_type = #{rentShopType} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index c46a18ff6..ed5ece095 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -125,18 +125,26 @@ @@ -172,6 +180,7 @@ left join wx_mall_building b on s.building=b.id left join wx_mall_floor f on s.floor=f.id where rc.status not in(1,5,6,7) and rc.tenant_id=#{tenantId} + and rent_shop_type = #{rentShopType} order by id desc