diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java index 0eff012a8..cb1d1d322 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java @@ -103,4 +103,13 @@ public class WxBillPropertyController extends BaseController { final PageInfo> page = wxBillPropertyService.findByPropertyContractId(propertyContractId, getTenantId(), pageNum, pageSize); return new ResultData(page); } + + + @PostMapping("updateLatePayStatus") + @SystemControllerLog(description = "租赁账单-滞纳金结单") + public ResultData updateLatePayStatus(@RequestBody WxBillProperty wxBillProperty) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyController::updateLatePayStatus"); + return wxBillPropertyService.updateLatePayStatus(wxBillProperty); + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java index 09d9cb418..3b3f2bd34 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxBillRent; import com.iformall.service.WxBillRentService; import io.swagger.annotations.ApiImplicitParam; @@ -110,4 +111,12 @@ public class WxBillRentController extends BaseController { return wxBillRentService.updateRevenue(wxBillRent); } + + @PostMapping("updateLatePayStatus") + @SystemControllerLog(description = "租赁账单-滞纳金结单") + public ResultData updateLatePayStatus(@RequestBody WxBillProperty wxBillProperty) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::updateLatePayStatus"); + return wxBillRentService.updateLatePayStatus(wxBillProperty); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index 14155231d..bd2640c70 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.WxBillRent; import java.util.Map; @@ -55,4 +56,6 @@ public interface WxBillPropertyService { Object detail(Long id); + ResultData updateLatePayStatus(WxBillProperty wxBillProperty); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index d58a1a2f5..900a4ecc1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -4,6 +4,7 @@ import java.util.*; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxBillRent; /** @@ -56,4 +57,6 @@ public interface WxBillRentService { ResultData updateRevenue(WxBillRent wxBillRent); + ResultData updateLatePayStatus(WxBillRent wxBillRent); + } 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 37a0e6a01..6eefa9caa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -6,14 +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.MallUserInfo; -import com.iformall.domain.po.WxBillAction; -import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxBillPropertyDeposit; -import com.iformall.enums.EnumBillAction; -import com.iformall.enums.EnumBillPayWay; -import com.iformall.enums.EnumBillRentStatus; -import com.iformall.enums.EnumDelStatus; +import com.iformall.domain.po.*; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillPropertyDepositMapper; import com.iformall.mapper.WxBillPropertyMapper; @@ -227,5 +221,17 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { return result; } + @Override + public ResultData updateLatePayStatus(WxBillProperty record) { + record.setLatePayStatus(EnumBillDailyStatus.PAID.getCode()); + record.setUpdatetime(new Date()); + try { + wxBillPropertyMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("修改营业额失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "滞纳金结单失败"); + } + return new ResultData(Result.SUCCESS, "滞纳金结单成功"); + } } 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 d7f509250..97f96754f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -6,14 +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.MallUserInfo; -import com.iformall.domain.po.WxBillAction; -import com.iformall.domain.po.WxBillDeposit; -import com.iformall.domain.po.WxBillRent; -import com.iformall.enums.EnumBillAction; -import com.iformall.enums.EnumBillPayWay; -import com.iformall.enums.EnumBillRentStatus; -import com.iformall.enums.EnumDelStatus; +import com.iformall.domain.po.*; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillDepositMapper; import com.iformall.mapper.WxBillRentMapper; @@ -236,9 +230,22 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); } catch (Exception e) { logger.error("修改营业额失败,e:" + e.getMessage()); - throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "修改营业额失败"); } return new ResultData(Result.SUCCESS, "修改营业额成功"); } + @Override + public ResultData updateLatePayStatus(WxBillRent record) { + record.setLatePayStatus(EnumBillDailyStatus.PAID.getCode()); + record.setUpdatetime(new Date()); + try { + wxBillRentMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("修改营业额失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "滞纳金结单失败"); + } + return new ResultData(Result.SUCCESS, "滞纳金结单成功"); + } + }