From e6b0e5f458108da224f9639ea287473d7a470756 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 30 Jul 2019 15:57:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BB=9E=E7=BA=B3=E9=87=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/WxBillPropertyController.java | 10 +++++++ .../controller/rent/WxBillRentController.java | 9 ++++++ .../iformall/domain/po/WxBillProperty.java | 6 ++++ .../com/iformall/domain/po/WxBillRent.java | 5 ++++ .../service/WxBillPropertyService.java | 8 ++++++ .../iformall/service/WxBillRentService.java | 8 ++++++ .../impl/WxBillPropertyServiceImpl.java | 27 ++++++++++++++++-- .../service/impl/WxBillRentServiceImpl.java | 28 ++++++++++++++++--- 8 files changed, 94 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index 3541772a2..500950a71 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -7,9 +7,11 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.WxBillRent; import com.iformall.service.WxBillPropertyService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -61,6 +63,14 @@ public class WxBillPropertyController extends BaseController { return wxBillPropertyService.saveOrUpdate(wxBillProperty, getUser()); } + @ApiOperation("修改滞纳金") + @PostMapping("updateLatePayMoney") + @SystemControllerLog(description = "修改滞纳金") + public ResultData updateLatePayMoney(@RequestBody WxBillProperty wxBillProperty) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::updateLatePayMoney"); + return wxBillPropertyService.updateLatePayMoney(wxBillProperty, getUser()); + } + @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) @SystemControllerLog(description = "物业账单-删除") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index e9ea04df8..ab19df1ac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.service.WxBillRentService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -60,6 +61,14 @@ public class WxBillRentController extends BaseController { return wxBillRentService.saveOrUpdate(wxBillRent, getUser()); } + @ApiOperation("修改滞纳金") + @PostMapping("updateLatePayMoney") + @SystemControllerLog(description = "修改滞纳金") + public ResultData updateLatePayMoney(@RequestBody WxBillRent wxBillRent) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::updateLatePayMoney"); + return wxBillRentService.updateLatePayMoney(wxBillRent, getUser()); + } + @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @SystemControllerLog(description = "租赁押金账单-删除") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index a9f743a32..2f6d28522 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -176,4 +176,10 @@ public class WxBillProperty extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") @Transient private Integer latePayDay; + + + @Transient + private String latePayMoneyBefore; + @Transient + private String latePayMoneyUpdate; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 03826a52b..1f0120113 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -189,5 +189,10 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") @Transient private Integer latePayDay; + + @Transient + private String latePayMoneyBefore; + @Transient + private String latePayMoneyUpdate; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index af40a7896..7b48b298f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -45,6 +45,14 @@ public interface WxBillPropertyService { */ ResultData saveOrUpdate(WxBillProperty record, MallUserInfo user); + /** + * 修改滞纳金 + * + * @param record + * @param user + */ + ResultData updateLatePayMoney(WxBillProperty record, MallUserInfo user); + /** * 根据Id删除实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 420352473..d12061a59 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -42,6 +42,14 @@ public interface WxBillRentService { */ ResultData saveOrUpdate(WxBillRent record, MallUserInfo user); + /** + * 修改滞纳金 + * @param record + * @param user + * @return + */ + ResultData updateLatePayMoney(WxBillRent record, MallUserInfo user); + /** * 根据Id删除实体 * 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 ee7b44c41..77bbf3793 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.exception.MallinkException; +import com.iformall.mapper.WxBillActionMapper; import com.iformall.mapper.WxBillPropertyDepositMapper; import com.iformall.mapper.WxBillPropertyMapper; import com.iformall.service.ExcelService; @@ -48,6 +49,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Autowired ExcelService excelService; + @Autowired + WxBillActionMapper wxBillActionMapper; + @Override public PageInfo listAsPage(WxBillProperty record, Integer pageIndex, Integer pageSize) { PageHelper.startPage(pageIndex, pageSize); @@ -166,9 +170,6 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { property.setPayDate(record.getPayDate()); property.setUpdatetime(date); property.setPayWay(record.getPayWay()); - if(record.getLatePayPriceStr() != null) { - property.setLatePayPrice(Long.parseLong(record.getLatePayPriceStr()) * 100); - } try { wxBillPropertyMapper.updateByPrimaryKeySelective(property); } catch (Exception e) { @@ -298,4 +299,24 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { public List findLatePayBill() { return wxBillPropertyMapper.findLatePayBill(); } + + @Override + public ResultData updateLatePayMoney(WxBillProperty record, MallUserInfo user) { + if(record.getLatePayMoneyUpdate() != null) { + record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); + } + wxBillPropertyMapper.updateByPrimaryKeySelective(record); + final IdWorker idWorker = IdWorker.get(); + + WxBillAction billAction = new WxBillAction(); + billAction.setId(idWorker.nextId()); + billAction.setCreatetime(new Date()); + billAction.setUserName("系统端"); + billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); + billAction.setBillId(record.getId()); + billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); + billAction.setUpdatetime(new Date()); + wxBillActionMapper.insertSelective(billAction); + return new ResultData(); + } } 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 c706798d1..c1040fa4c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.exception.MallinkException; +import com.iformall.mapper.WxBillActionMapper; import com.iformall.mapper.WxBillDepositMapper; import com.iformall.mapper.WxBillRentMapper; import com.iformall.service.ExcelService; @@ -48,6 +49,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Autowired ExcelService excelService; + @Autowired + WxBillActionMapper wxBillActionMapper; + @Override public PageInfo listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize) { PageHelper.startPage(pageIndex, pageSize); @@ -165,10 +169,6 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setPayDate(record.getPayDate()); wxBillRent.setUpdatetime(date); wxBillRent.setPayWay(record.getPayWay()); - - if(record.getLatePayPriceStr() != null) { - wxBillRent.setLatePayPrice(Long.parseLong(record.getLatePayPriceStr()) * 100); - } try { wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); } catch (Exception e) { @@ -335,4 +335,24 @@ public class WxBillRentServiceImpl implements WxBillRentService { public List findLatePayBill() { return wxBillRentMapper.findLatePayBill(); } + + @Override + public ResultData updateLatePayMoney(WxBillRent record, MallUserInfo user) { + if(record.getLatePayMoneyUpdate() != null) { + record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); + } + wxBillRentMapper.updateByPrimaryKeySelective(record); + final IdWorker idWorker = IdWorker.get(); + + WxBillAction billAction = new WxBillAction(); + billAction.setId(idWorker.nextId()); + billAction.setCreatetime(new Date()); + billAction.setUserName("系统端"); + billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); + billAction.setBillId(record.getId()); + billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); + billAction.setUpdatetime(new Date()); + wxBillActionMapper.insertSelective(billAction); + return new ResultData(); + } }