From 4bf0e7eacac8ff689bafaa0d884ac11682a113a0 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 29 Aug 2024 21:15:21 +0800 Subject: [PATCH] fix --- .../domain/po/WxRentContractRevenueSales.java | 3 +++ .../mapper/WxRentContractRevenueSalesMapper.java | 2 +- .../service/impl/WxRentContractServiceImpl.java | 11 +++++++---- .../mapper/WxRentContractRevenueSalesMapper.xml | 7 ++++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractRevenueSales.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractRevenueSales.java index 1a7fbb1ca..419009b80 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractRevenueSales.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractRevenueSales.java @@ -41,6 +41,9 @@ public class WxRentContractRevenueSales extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="销售金额",name="maxMoney") private String saleMoney; + @io.swagger.annotations.ApiModelProperty(value="有效销售金额(免租期扣除掉的)",name="saleMoneyValid") + private String saleMoneyValid; + @io.swagger.annotations.ApiModelProperty(value="计算金额",name="rentMoney") private String calcuteMoney; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractRevenueSalesMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractRevenueSalesMapper.java index 1abe5ae2e..0a942eeb6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractRevenueSalesMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractRevenueSalesMapper.java @@ -16,7 +16,7 @@ public interface WxRentContractRevenueSalesMapper extends CommonMapper findBillId(WxRentContractRevenueSales wxBillRent); 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 f4f9813a3..2809f30e9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2605,7 +2605,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //根据免租期来计算 List validDates = WxRentContractHelper.getValidDays(startDate, endDate, freePeriods); if (null == validDates || validDates.size() <= 0 ) { - BigDecimal[] bs = new BigDecimal[] {revenueDecimal,rentDecimal}; + BigDecimal[] bs = new BigDecimal[] {revenueDecimal,rentDecimal,new BigDecimal(0)}; return bs; } int allDays = DateUtils.daysBetween(startDate,endDate)+1; @@ -2672,7 +2672,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { endDate,0,0,false,rentcontract.getReceivePeriodUnit(),rentcontract.getReceivePeriod()); } rentDecimal = new BigDecimal(rentNeedpay); - BigDecimal[] bs = new BigDecimal[] {revenueDecimal,rentDecimal}; + BigDecimal[] bs = new BigDecimal[] {revenueDecimal,rentDecimal,sales}; return bs; } @@ -2789,13 +2789,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { BigDecimal[] jumppays = calcuteReveneuJump(salesDeciaml, rentcontract,rentBill.getStarttime(), rentBill.getEndtime(),freePeriods); BigDecimal jumpRevenuePay = jumppays[0]; BigDecimal jumpRentPay = jumppays[1]; + BigDecimal saleDecimalValid = jumppays[2]; BigDecimal jumppay = new BigDecimal(0); if (jumpRevenuePay.compareTo(jumpRentPay) > 0 ) { jumppay = jumppay.add(jumpRevenuePay); }else { jumppay = jumppay.add(jumpRentPay); } - StringBuffer sb = new StringBuffer(); + StringBuffer sb = new StringBuffer("有效销售额:"+saleDecimalValid.toPlainString()+","); if (jumppay.compareTo(new BigDecimal(needpay)) > 0 ) { sb.append("跳点规则计算金额:"+jumppay.toPlainString()+",合同租金扣点规则计算金额:"+needpay+"."); needpay = jumppay.toPlainString(); @@ -2811,6 +2812,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { List saleList = wxRentContractRevenueSalesMapper.findList(rs); if (null != saleList && saleList.size() > 0 ) { WxRentContractRevenueSales sale = saleList.get(0); sale.setSaleMoney(sales); + sale.setSaleMoneyValid(saleDecimalValid.toPlainString()); sale.setUpdateTime(new Date()); wxRentContractRevenueSalesMapper.updateById(sale); }else { @@ -2822,6 +2824,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { sale.setRentContractId(rentcontract.getId()); sale.setBillMoney(rentBill.getReceivePay()); sale.setSaleMoney(sales); + sale.setSaleMoneyValid(saleDecimalValid.toPlainString()); sale.setCalcuteMoney(needpay); sale.setPropertyContractId(propertyContractId); sale.setCreateTime(new Date()); @@ -3050,7 +3053,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxRentContractRevenueSales rsq = new WxRentContractRevenueSales(); rsq.updateTenantInfo(rentcontract); rsq.setRentContractId(rentcontract.getId()); - BigDecimal sum = wxRentContractRevenueSalesMapper.findSumSalesMoney(rsq); + BigDecimal sum = wxRentContractRevenueSalesMapper.findSumSalesMoneyValid(rsq); if (null == sum || sum.compareTo(new BigDecimal(0)) <= 0 ) { WxRentContractYearsSumVo vo = new WxRentContractYearsSumVo(); vo.setTotalSales("0"); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractRevenueSalesMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractRevenueSalesMapper.xml index 8962970e4..55a042c7a 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractRevenueSalesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractRevenueSalesMapper.xml @@ -12,13 +12,14 @@ + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`rent_contract_id`,`property_contract_id`,`bill_id`,`bill_money`, - `sale_money`,`calcute_money`,`remark` + `sale_money`,`sale_money_valid`,`calcute_money`,`remark` @@ -55,8 +56,8 @@ from wx_rent_contract_revenue_sales where id = #{id} and `tenant_id` = #{tenantId} - + select sum(CAST(ifnull(sale_money_valid,'0') AS DECIMAL(20,2))) receive_pay from wx_rent_contract_revenue_sales