From ff8741ab365139f311f3b1e527ce25e39e80a514 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 29 Oct 2018 13:16:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E6=80=BB=E8=A7=88][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E5=89=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=90=84=E8=B4=A6=E5=8D=95=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBillDepositController.java | 33 ++++++------ .../controller/WxBillPropertyController.java | 39 ++++++++------ .../WxBillPropertyDepositController.java | 11 +++- .../java/com/iformall/common/ErrorCode.java | 42 ++++++++++++++- .../iformall/service/WxBillDailyService.java | 6 ++- .../service/WxBillDepositService.java | 6 ++- .../service/WxBillPropertyDepositService.java | 2 + .../service/WxBillPropertyService.java | 2 + .../iformall/service/WxBillRentService.java | 6 ++- .../service/impl/WxBillAllServiceImpl.java | 53 ++++++++++++++++++- .../service/impl/WxBillDailyServiceImpl.java | 27 ++++++++-- .../impl/WxBillDepositServiceImpl.java | 23 ++++++-- .../WxBillPropertyDepositServiceImpl.java | 23 ++++++-- .../impl/WxBillPropertyServiceImpl.java | 23 ++++++-- .../service/impl/WxBillRentServiceImpl.java | 40 +++++++++----- .../impl/WxPropertyContractServiceImpl.java | 13 +++-- .../impl/WxRentContractServiceImpl.java | 14 +++++ 17 files changed, 288 insertions(+), 75 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java index 139488fc2..c529b3d71 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java @@ -19,21 +19,22 @@ import java.util.Map; */ @RestController @RequestMapping("wxBillDeposit") -public class WxBillDepositController extends BaseController -{ - @Autowired +public class WxBillDepositController extends BaseController { + @Autowired private WxBillDepositService wxBillDepositService; private Logger logger = LoggerFactory.getLogger(WxBillDepositController.class); @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxBillDeposit wxBillDeposit, Integer pageNum, Integer pageSize) { - if (null == wxBillDeposit) wxBillDeposit = new WxBillDeposit(); - wxBillDeposit.setTenantId(getTenantId()); - final PageInfo> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); + if (null == wxBillDeposit) { + wxBillDeposit = new WxBillDeposit(); + } + wxBillDeposit.setTenantId(getTenantId()); + final PageInfo> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); return new ResultData(page); } @@ -51,16 +52,16 @@ public class WxBillDepositController extends BaseController } @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxBillDepositService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBillDepositService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxBillDepositService.getById(id)); } @GetMapping("/updatePaid") @@ -68,6 +69,6 @@ public class WxBillDepositController extends BaseController public ResultData updatePaid(Long id) { return wxBillDepositService.updatePaid(id); } - - + + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java index beb0f335c..9013d04d1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java @@ -14,21 +14,25 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; +/** + * @author gongbiao + */ @RestController @RequestMapping("wxBillProperty") -public class WxBillPropertyController extends BaseController -{ - @Autowired +public class WxBillPropertyController extends BaseController { + @Autowired private WxBillPropertyService wxBillPropertyService; private Logger logger = LoggerFactory.getLogger(WxBillPropertyController.class); @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxBillProperty wxBillProperty, Integer pageNum, Integer pageSize) { - if (null == wxBillProperty) wxBillProperty = new WxBillProperty(); + if (null == wxBillProperty) { + wxBillProperty = new WxBillProperty(); + } wxBillProperty.setTenantId(getTenantId()); PageInfo> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); return new ResultData(result); @@ -48,18 +52,23 @@ public class WxBillPropertyController extends BaseController } @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(Long id) { wxBillPropertyService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBillPropertyService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxBillPropertyService.getById(id)); + } + + @GetMapping("/updatePaid") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData updatePaid(Long id) { + return wxBillPropertyService.updatePaid(id); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java index 947e7a755..13c8a7f38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java @@ -31,7 +31,9 @@ public class WxBillPropertyDepositController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxBillPropertyDeposit wxBillPropertyDeposit, Integer pageNum, Integer pageSize) { - if (null == wxBillPropertyDeposit) wxBillPropertyDeposit = new WxBillPropertyDeposit(); + if (null == wxBillPropertyDeposit) { + wxBillPropertyDeposit = new WxBillPropertyDeposit(); + } wxBillPropertyDeposit.setTenantId(getTenantId()); PageInfo> result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); return new ResultData(result); @@ -62,7 +64,12 @@ public class WxBillPropertyDepositController extends BaseController public ResultData findById(Long id) { return new ResultData(Result.SUCCESS,"查询成功",wxBillPropertyDepositService.getById(id)); } - + + @GetMapping("/updatePaid") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData updatePaid(Long id) { + return wxBillPropertyDepositService.updatePaid(id); + } } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 6a241be9e..7f0aae5b5 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -231,7 +231,47 @@ public enum ErrorCode{ /** * 标签 */ - TAGS_MATCHED_NULL(14000, "此标签没命中用户") + TAGS_MATCHED_NULL(14000, "此标签没命中用户"), + + + /** + * 租赁合同 + * */ + RENT_CONTRACT_IS_NOT_FOUND(15000,"租赁合同不存在"), + + /** + * 物业合同 + * */ + PROPERTY_CONTRACT_IS_NOT_FOUND(16000,"物业合同不存在"), + + /** + * 租赁账单 + * */ + BILL_RENT_IS_NOT_FOUND(17000,"租赁账单不存在"), + + /** + * 租赁押金账单 + * */ + + BILL_RENT_DEPOSIT_IS_NOT_FOUND(18000,"租赁押金账单不存在"), + + /** + * 物业账单 + * */ + + BILL_PROPERTY_IS_NOT_FOUND(19000,"物业账单不存在"), + + + /** + * 物业押金账单 + * */ + BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND(20000,"物业押金账单不存在"), + + /** + * 日常费用账单 + * */ + BILL_ROUTINE_IS_NOT_FOUND(20000,"账单不存在"), + ; diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java index b4e3a6cd5..797d43705 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java @@ -20,8 +20,10 @@ public interface WxBillDailyService { * @return */ PageInfo> listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize); - - /** + + void updateBillStatus(WxBillDaily record); + + /** * 根据Id获得实体 * * @param id diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java index 0e0c725f8..754955e10 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java @@ -17,8 +17,10 @@ public interface WxBillDepositService { * @return */ PageInfo> listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize); - - /** + + void updateBillStatus(WxBillDeposit record); + + /** * 根据Id获得实体 * * @param id diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java index 0be45d549..d5b234dc9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java @@ -22,6 +22,8 @@ public interface WxBillPropertyDepositService { */ PageInfo> listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize); + void updateBillStatus(WxBillPropertyDeposit record); + /** * 根据Id获得实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index fdf9ad31e..fd363fce9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -23,6 +23,8 @@ public interface WxBillPropertyService { */ PageInfo> listAsPage(WxBillProperty record, Integer pageIndex, Integer pageSize); + void updateBillStatus(WxBillProperty record); + /** * 根据Id获得实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index df8d80391..c640074db 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -19,8 +19,10 @@ public interface WxBillRentService { * @return */ PageInfo> listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize); - - /** + + void updateBillStatus(WxBillRent record); + + /** * 根据Id获得实体 * * @param id diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 636e76d4e..04431a3af 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -2,11 +2,11 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.*; import com.iformall.domain.vo.WxBillAll; import com.iformall.enums.EnumBillRentStatus; -import com.iformall.enums.EnumRentContractStatus; import com.iformall.mapper.WxBillAllMapper; -import com.iformall.service.WxBillAllService; +import com.iformall.service.*; import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,20 +27,69 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Autowired WxBillAllMapper wxBillAllMapper; + @Autowired + WxBillDailyService wxBillDailyService; + + @Autowired + WxBillDepositService wxBillDepositService; + + @Autowired + WxBillPropertyDepositService wxBillPropertyDepositService; + + @Autowired + WxBillPropertyService wxBillPropertyService; + + @Autowired + WxBillRentService wxBillRentService; + + @Override public Map listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { + //更新各账单状态 + updateBillStatus(record); + //得到当前月 String month=DateUtils.getSystemTime("yyyy-MM"); + //获取账单信息-欠缴笔数、欠缴金额、结清笔数、结清金额 Object billInfo = getBillInfo(record.getTenantId(),month); + //设置查询参数-当前月 record.setMonth(month); + //分页-页数、条数 PageHelper.startPage(pageIndex, pageSize); + //查询 List> rentContractData = wxBillAllMapper.list(record); PageInfo> pageInfo = new PageInfo<>(rentContractData); + //返回值 Map result = new HashMap<>(); result.put("billInfo", billInfo); result.put("pageInfo", pageInfo); return result; } + private void updateBillStatus(WxBillAll record) { + logger.info("更新各账单状态开始"); + //更新日常账单状态 + WxBillDaily wxBillDaily = new WxBillDaily(); + wxBillDaily.setTenantId(record.getTenantId()); + wxBillDailyService.updateBillStatus(wxBillDaily); + //更新租赁押金账单状态 + WxBillDeposit wxBillDeposit = new WxBillDeposit(); + wxBillDeposit.setTenantId(record.getTenantId()); + wxBillDepositService.updateBillStatus(wxBillDeposit); + //更新物业押金账单状态 + WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); + wxBillPropertyDeposit.setTenantId(record.getTenantId()); + wxBillPropertyDepositService.updateBillStatus(wxBillPropertyDeposit); + //更新物业账单状态 + WxBillProperty wxBillProperty = new WxBillProperty(); + wxBillProperty.setTenantId(record.getTenantId()); + wxBillPropertyService.updateBillStatus(wxBillProperty); + //更新租赁账单状态 + WxBillRent wxBillRent = new WxBillRent(); + wxBillRent.setTenantId(record.getTenantId()); + wxBillRentService.updateBillStatus(wxBillRent); + logger.info("更新各账单状态结束"); + } + private Object getBillInfo(String tenantId,String month) { WxBillAll record = new WxBillAll(); record.setTenantId(tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 87df8b6cd..03beee6fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBillDaily; +import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxShop; import com.iformall.enums.EnumBillDailyStatus; import com.iformall.enums.EnumBillRentStatus; @@ -37,18 +38,28 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public PageInfo> listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize) { - - //更新逾期天数及状态 - updateNotPaidStatus(record); - //更新待缴的状态 - updateWaidPayStatus(record); + //更新账单状态 + updateBillStatus(record); + //分页对象设置页数和条数 PageHelper.startPage(pageIndex, pageSize); + //查询 List> billDepositList = wxBillDailyMapper.queryBillDailyList(record); + //结果放入分页对象 PageInfo> pageInfo = new PageInfo<>(billDepositList); return pageInfo; } + @Override + public void updateBillStatus(WxBillDaily record) { + logger.info("更新日常账单状态开始..."); + //更新逾期天数及状态 + updateNotPaidStatus(record); + //更新待缴的状态 + updateWaidPayStatus(record); + logger.info("更新日常账单状态结束..."); + } + @Transactional(rollbackFor = {Exception.class}) public void updateWaidPayStatus(WxBillDaily record) { Map params = new HashMap<>(); @@ -117,6 +128,9 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { } else { logger.info("更新日常押金账单"); WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(record.getId()); + if(wxBillDaily==null){ + return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); + } wxBillDaily.setPayDate(record.getPayDate()); wxBillDaily.setPay(record.getPay() * 100); wxBillDaily.setReceivePay(record.getReceivePay() * 100); @@ -143,6 +157,9 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public ResultData updatePaid(Long id) { WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(id); + if(wxBillDaily==null){ + return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); + } wxBillDaily.setStatus(EnumBillDailyStatus.PAID.getCode()); Date d =new Date(); wxBillDaily.setPayDate(d); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index baa30f46c..05617af43 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBillDeposit; +import com.iformall.domain.po.WxPropertyContract; import com.iformall.enums.EnumBillRentStatus; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillDepositMapper; @@ -32,17 +33,23 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public PageInfo> listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize) { - - //更新逾期天数及状态 - updateNotPaidStatus(record); - //更新待缴的状态 - updateWaidPayStatus(record); + //更新账单状态 + updateBillStatus(record); PageHelper.startPage(pageIndex, pageSize); List> billDepositList = wxBillDepositMapper.queryBillDepositList(record); PageInfo> pageInfo = new PageInfo<>(billDepositList); return pageInfo; } + @Override + public void updateBillStatus(WxBillDeposit record) { + logger.info("更新租赁押金账单状态开始..."); + //更新逾期天数及状态 + updateNotPaidStatus(record); + //更新待缴的状态 + updateWaidPayStatus(record); + logger.info("更新租赁押金账单状态结束..."); + } @Transactional(rollbackFor = {Exception.class}) public void updateWaidPayStatus(WxBillDeposit record) { @@ -101,6 +108,9 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { } else { logger.info("更新租赁押金账单"); WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(record.getId()); + if(wxBillDeposit==null){ + return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); + } wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setPay(record.getPay()*100); wxBillDeposit.setReceivePay(record.getReceivePay()*100); @@ -126,6 +136,9 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public ResultData updatePaid(Long id) { WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(id); + if(wxBillDeposit==null){ + return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); + } wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); Date d =new Date(); wxBillDeposit.setPayDate(d); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index 50d5fe12e..e3ecb5042 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxBillPropertyDeposit; import com.iformall.enums.EnumBillRentStatus; import com.iformall.exception.MallinkException; @@ -32,16 +33,24 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe @Override public PageInfo> listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize) { - //更新逾期天数及状态 - updateNotPaidStatus(record); - //更新待缴的状态 - updateWaidPayStatus(record); + //更新账单状态 + updateBillStatus(record); PageHelper.startPage(pageIndex, pageSize); List> billDepositList = wxBillPropertyDepositMapper.queryBillDepositList(record); PageInfo> pageInfo = new PageInfo<>(billDepositList); return pageInfo; } + @Override + public void updateBillStatus(WxBillPropertyDeposit record) { + logger.info("更新物业押金账单状态开始..."); + //更新逾期天数及状态 + updateNotPaidStatus(record); + //更新待缴的状态 + updateWaidPayStatus(record); + logger.info("更新物业押金账单状态结束..."); + } + @Transactional(rollbackFor = {Exception.class}) public void updateWaidPayStatus(WxBillPropertyDeposit record) { @@ -100,6 +109,9 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe } else { logger.info("更新押金账单"); WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(record.getId()); + if(record==null){ + return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); + } wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setPay(record.getPay()*100); wxBillDeposit.setReceivePay(record.getReceivePay()*100); @@ -125,6 +137,9 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe @Override public ResultData updatePaid(Long id) { WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(id); + if(wxBillDeposit==null){ + return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); + } wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); Date d =new Date(); wxBillDeposit.setPayDate(d); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 218c5c4d6..f3f6e6c7e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.WxBillPropertyDeposit; import com.iformall.enums.EnumBillRentStatus; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillPropertyMapper; @@ -31,16 +32,24 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Override public PageInfo> listAsPage(WxBillProperty record, Integer pageIndex, Integer pageSize) { - //更新逾期天数及状态 - updateNotPaidStatus(record); - //更新待缴的状态 - updateWaidPayStatus(record); + //更新账单状态 + updateBillStatus(record); PageHelper.startPage(pageIndex, pageSize); List> billRentList = wxBillPropertyMapper.queryBillPropertyList(record); PageInfo> pageInfo = new PageInfo<>(billRentList); return pageInfo; } + @Override + public void updateBillStatus(WxBillProperty record) { + logger.info("更新物业账单状态开始..."); + //更新逾期天数及状态 + updateNotPaidStatus(record); + //更新待缴的状态 + updateWaidPayStatus(record); + logger.info("更新物业账单状态结束..."); + } + @Transactional(rollbackFor = {Exception.class}) public void updateWaidPayStatus(WxBillProperty record) { Map params = new HashMap<>(); @@ -97,6 +106,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { } else { logger.info("更新物业账单"); WxBillProperty property = wxBillPropertyMapper.selectByPrimaryKey(record.getId()); + if(record==null){ + return new ResultData(ErrorCode.BILL_PROPERTY_IS_NOT_FOUND); + } property.setPayDate(record.getPayDate()); property.setPay(record.getPay()*100); property.setReceivePay(record.getReceivePay()*100); @@ -129,6 +141,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Override public ResultData updatePaid(Long id) { WxBillProperty record = wxBillPropertyMapper.selectByPrimaryKey(id); + if(record==null){ + return new ResultData(ErrorCode.BILL_PROPERTY_IS_NOT_FOUND); + } record.setStatus(EnumBillRentStatus.PAID.getCode()); Date d =new Date(); record.setPayDate(d); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 8ca725966..5e600421e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -6,6 +6,8 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillDaily; +import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxBillRent; import com.iformall.enums.EnumBillRentStatus; import com.iformall.exception.MallinkException; @@ -35,16 +37,24 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public PageInfo> listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize) { - //更新逾期天数及状态 - updateNotPaidStatus(record); - //更新待缴的状态 - updateWaidPayStatus(record); + //更新账单状态 + updateBillStatus(record); PageHelper.startPage(pageIndex, pageSize); List> billRentList = wxBillRentMapper.queryBillRentList(record); PageInfo> pageInfo = new PageInfo<>(billRentList); return pageInfo; } + @Override + public void updateBillStatus(WxBillRent record) { + logger.info("更新租赁账单状态开始..."); + //更新逾期天数及状态 + updateNotPaidStatus(record); + //更新待缴的状态 + updateWaidPayStatus(record); + logger.info("更新租赁账单状态结束..."); + } + @Transactional(rollbackFor = {Exception.class}) public void updateWaidPayStatus(WxBillRent record) { Map params = new HashMap<>(); @@ -85,7 +95,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public ResultData saveOrUpdate(WxBillRent record) { if (record.getId() == null) { - logger.info("新增物业账单"); + logger.info("新增租赁账单"); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); Date date = new Date(); @@ -94,13 +104,16 @@ public class WxBillRentServiceImpl implements WxBillRentService { try { wxBillRentMapper.insertSelective(record); } catch (Exception e) { - logger.error("保存物业账单失败,e:" + e.getMessage()); + logger.error("保存租赁账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } - return new ResultData(Result.SUCCESS, "保存物业账单成功"); + return new ResultData(Result.SUCCESS, "保存租赁账单成功"); } else { - logger.info("更新物业账单"); + logger.info("更新租赁账单"); WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(record.getId()); + if(wxBillRent==null){ + return new ResultData(ErrorCode.BILL_RENT_IS_NOT_FOUND); + } wxBillRent.setPayDate(record.getPayDate()); wxBillRent.setPay(record.getPay()*100); wxBillRent.setReceivePay(record.getReceivePay()*100); @@ -110,10 +123,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { try { wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); } catch (Exception e) { - logger.error("更新物业账单失败,e:" + e.getMessage()); + logger.error("更新租赁账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } - return new ResultData(Result.SUCCESS, "更新物业账单成功"); + return new ResultData(Result.SUCCESS, "更新租赁账单成功"); } } @@ -133,6 +146,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public ResultData updatePaid(Long id) { WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(id); + if(wxBillRent==null){ + return new ResultData(ErrorCode.BILL_RENT_IS_NOT_FOUND); + } wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); Date d =new Date(); wxBillRent.setPayDate(d); @@ -140,10 +156,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { try { wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); } catch (Exception e) { - logger.error("物业账单结单失败,e:" + e.getMessage()); + logger.error("租赁账单结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } - return new ResultData(Result.SUCCESS, "物业账单结单成功"); + return new ResultData(Result.SUCCESS, "租赁账单结单成功"); } } 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 c731e6fad..7578b14b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -68,6 +68,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService Map result = new HashMap<>(); WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(id); + if(wxPropertyContract==null){ + return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); + } wxPropertyContract.setPrice(wxPropertyContract.getPrice() != null ? wxPropertyContract.getPrice() / 100 : 0); wxPropertyContract.setDeposit(wxPropertyContract.getDeposit() != null ? wxPropertyContract.getDeposit() / 100 : 0); @@ -114,7 +117,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } return new ResultData(Result.SUCCESS, "保存物业合同信息成功", record); } else {//更新物业合同信息 - + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(record.getId()); + if(wxPropertyContract==null){ + return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); + } Calendar instance = Calendar.getInstance(); instance.setTime(record.getRentalStartDate()); instance.add(Calendar.MONTH, record.getLease()); @@ -340,11 +346,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService public ResultData endRentContract(Long id) { WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(id); + if(wxPropertyContract==null){ + return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); + } wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); try { wxPropertyContractMapper.updateByPrimaryKeySelective(wxPropertyContract); - //停用商户 -// wxMerchantService.disable(wxRentContract.getMerchantId()); } catch (MallinkException e) { logger.info("终止合同失败:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); 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 9b4f80845..d44566a04 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -70,6 +70,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { public ResultData getById(Long id) { Map result = new HashMap<>(); WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); + if(wxRentContract==null){ + return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); + } + wxRentContract.setPrice(wxRentContract.getPrice() != null ? wxRentContract.getPrice() / 100 : 0); wxRentContract.setDeposit(wxRentContract.getDeposit() != null ? wxRentContract.getDeposit() / 100 : 0); @@ -116,6 +120,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { } return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", record); } else {//更新租赁合同信息 + WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getId()); + if(wxRentContract==null){ + return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); + } Calendar instance = Calendar.getInstance(); instance.setTime(record.getRentalStartDate()); instance.add(Calendar.MONTH, record.getLease()); @@ -341,6 +349,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { public ResultData endRentContract(Long id) { WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); + if(wxRentContract==null){ + return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); + } wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); try { wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract); @@ -357,6 +368,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public ResultData updateMerchant(WxRentContract wxRentContract) { WxRentContract record = wxRentContractMapper.selectByPrimaryKey(wxRentContract); + if(wxRentContract==null){ + return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); + } record.setMerchantId(wxRentContract.getMerchantId()); try { wxRentContractMapper.updateByPrimaryKeySelective(record);