From fa0e48a169f8459ca4727543dee47d635e45be13 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 12 Aug 2024 12:15:54 +0800 Subject: [PATCH] fix --- .../controller/contract/WxRentContractController.java | 10 ++++++++++ .../com/iformall/service/WxRentContractService.java | 3 +++ .../service/impl/WxRentContractServiceImpl.java | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index f93bb22a5..4e5488280 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -26,6 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -933,6 +935,14 @@ public class WxRentContractController extends WxContractBaseController { if (null == rentContract) { return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); } + + WxRentContractRevenueJump jq = new WxRentContractRevenueJump(); + jq.updateTenantInfo(rentContract); + jq.setRentContractId(rentContract.getId()); + List jumpList = wxRentContractService.findJumpList(jq); + if (null == jumpList || jumpList.size() <= 0 ) { + return new ResultData(Result.ERROR, "合同未设置跳点,不用做汇算"); + } return new ResultData(wxRentContractService.calcuteYearsRevenueRentUp(rentContract)); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index b7aa14f1d..22c80a3ca 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxRentContractFreePeriod; +import com.iformall.domain.po.WxRentContractRevenueJump; import com.iformall.domain.po.WxRentContractRevenueSales; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.RentContractFreePeriodVo; @@ -164,4 +165,6 @@ public interface WxRentContractService { WxRentContractYearsSumVo calcuteYearsRevenueRentUp(WxRentContract rentcontract); + List findJumpList(WxRentContractRevenueJump jump); + } 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 293b08c0a..6667ba010 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2728,4 +2728,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { return vo; } + + @Override + public List findJumpList(WxRentContractRevenueJump jump) { + return wxRentContractRevenueJumpMapper.findList(jump); + } }