Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
4bf0e7eaca
4 changed files with 15 additions and 8 deletions
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContractRevenueSales.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractRevenueSalesMapper.java
  3. +7
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +4
    -3
      mallinkService/src/main/resources/mapper/WxRentContractRevenueSalesMapper.xml

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContractRevenueSales.java View File

@@ -41,6 +41,9 @@ public class WxRentContractRevenueSales extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="销售金额",name="maxMoney") @io.swagger.annotations.ApiModelProperty(value="销售金额",name="maxMoney")
private String saleMoney; private String saleMoney;
@io.swagger.annotations.ApiModelProperty(value="有效销售金额(免租期扣除掉的)",name="saleMoneyValid")
private String saleMoneyValid;
@io.swagger.annotations.ApiModelProperty(value="计算金额",name="rentMoney") @io.swagger.annotations.ApiModelProperty(value="计算金额",name="rentMoney")
private String calcuteMoney; private String calcuteMoney;


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxRentContractRevenueSalesMapper.java View File

@@ -16,7 +16,7 @@ public interface WxRentContractRevenueSalesMapper extends CommonMapper<WxRentCon


WxRentContractRevenueSales selectById(@Param("id")Long id,@Param("tenantId")String tenantId); WxRentContractRevenueSales selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
BigDecimal findSumSalesMoney(WxRentContractRevenueSales wxBillRent);
BigDecimal findSumSalesMoneyValid(WxRentContractRevenueSales wxBillRent);
List<Long> findBillId(WxRentContractRevenueSales wxBillRent); List<Long> findBillId(WxRentContractRevenueSales wxBillRent);


+ 7
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -2605,7 +2605,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//根据免租期来计算 //根据免租期来计算
List<Date> validDates = WxRentContractHelper.getValidDays(startDate, endDate, freePeriods); List<Date> validDates = WxRentContractHelper.getValidDays(startDate, endDate, freePeriods);
if (null == validDates || validDates.size() <= 0 ) { if (null == validDates || validDates.size() <= 0 ) {
BigDecimal[] bs = new BigDecimal[] {revenueDecimal,rentDecimal};
BigDecimal[] bs = new BigDecimal[] {revenueDecimal,rentDecimal,new BigDecimal(0)};
return bs; return bs;
} }
int allDays = DateUtils.daysBetween(startDate,endDate)+1; int allDays = DateUtils.daysBetween(startDate,endDate)+1;
@@ -2672,7 +2672,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
endDate,0,0,false,rentcontract.getReceivePeriodUnit(),rentcontract.getReceivePeriod()); endDate,0,0,false,rentcontract.getReceivePeriodUnit(),rentcontract.getReceivePeriod());
} }
rentDecimal = new BigDecimal(rentNeedpay); rentDecimal = new BigDecimal(rentNeedpay);
BigDecimal[] bs = new BigDecimal[] {revenueDecimal,rentDecimal};
BigDecimal[] bs = new BigDecimal[] {revenueDecimal,rentDecimal,sales};
return bs; return bs;
} }
@@ -2789,13 +2789,14 @@ public class WxRentContractServiceImpl implements WxRentContractService {
BigDecimal[] jumppays = calcuteReveneuJump(salesDeciaml, rentcontract,rentBill.getStarttime(), rentBill.getEndtime(),freePeriods); BigDecimal[] jumppays = calcuteReveneuJump(salesDeciaml, rentcontract,rentBill.getStarttime(), rentBill.getEndtime(),freePeriods);
BigDecimal jumpRevenuePay = jumppays[0]; BigDecimal jumpRevenuePay = jumppays[0];
BigDecimal jumpRentPay = jumppays[1]; BigDecimal jumpRentPay = jumppays[1];
BigDecimal saleDecimalValid = jumppays[2];
BigDecimal jumppay = new BigDecimal(0); BigDecimal jumppay = new BigDecimal(0);
if (jumpRevenuePay.compareTo(jumpRentPay) > 0 ) { if (jumpRevenuePay.compareTo(jumpRentPay) > 0 ) {
jumppay = jumppay.add(jumpRevenuePay); jumppay = jumppay.add(jumpRevenuePay);
}else { }else {
jumppay = jumppay.add(jumpRentPay); jumppay = jumppay.add(jumpRentPay);
} }
StringBuffer sb = new StringBuffer();
StringBuffer sb = new StringBuffer("有效销售额:"+saleDecimalValid.toPlainString()+",");
if (jumppay.compareTo(new BigDecimal(needpay)) > 0 ) { if (jumppay.compareTo(new BigDecimal(needpay)) > 0 ) {
sb.append("跳点规则计算金额:"+jumppay.toPlainString()+",合同租金扣点规则计算金额:"+needpay+"."); sb.append("跳点规则计算金额:"+jumppay.toPlainString()+",合同租金扣点规则计算金额:"+needpay+".");
needpay = jumppay.toPlainString(); needpay = jumppay.toPlainString();
@@ -2811,6 +2812,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
List<WxRentContractRevenueSales> saleList = wxRentContractRevenueSalesMapper.findList(rs); List<WxRentContractRevenueSales> saleList = wxRentContractRevenueSalesMapper.findList(rs);
if (null != saleList && saleList.size() > 0 ) { WxRentContractRevenueSales sale = saleList.get(0); if (null != saleList && saleList.size() > 0 ) { WxRentContractRevenueSales sale = saleList.get(0);
sale.setSaleMoney(sales); sale.setSaleMoney(sales);
sale.setSaleMoneyValid(saleDecimalValid.toPlainString());
sale.setUpdateTime(new Date()); sale.setUpdateTime(new Date());
wxRentContractRevenueSalesMapper.updateById(sale); wxRentContractRevenueSalesMapper.updateById(sale);
}else { }else {
@@ -2822,6 +2824,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
sale.setRentContractId(rentcontract.getId()); sale.setRentContractId(rentcontract.getId());
sale.setBillMoney(rentBill.getReceivePay()); sale.setBillMoney(rentBill.getReceivePay());
sale.setSaleMoney(sales); sale.setSaleMoney(sales);
sale.setSaleMoneyValid(saleDecimalValid.toPlainString());
sale.setCalcuteMoney(needpay); sale.setCalcuteMoney(needpay);
sale.setPropertyContractId(propertyContractId); sale.setPropertyContractId(propertyContractId);
sale.setCreateTime(new Date()); sale.setCreateTime(new Date());
@@ -3050,7 +3053,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
WxRentContractRevenueSales rsq = new WxRentContractRevenueSales(); WxRentContractRevenueSales rsq = new WxRentContractRevenueSales();
rsq.updateTenantInfo(rentcontract); rsq.updateTenantInfo(rentcontract);
rsq.setRentContractId(rentcontract.getId()); rsq.setRentContractId(rentcontract.getId());
BigDecimal sum = wxRentContractRevenueSalesMapper.findSumSalesMoney(rsq);
BigDecimal sum = wxRentContractRevenueSalesMapper.findSumSalesMoneyValid(rsq);
if (null == sum || sum.compareTo(new BigDecimal(0)) <= 0 ) { if (null == sum || sum.compareTo(new BigDecimal(0)) <= 0 ) {
WxRentContractYearsSumVo vo = new WxRentContractYearsSumVo(); WxRentContractYearsSumVo vo = new WxRentContractYearsSumVo();
vo.setTotalSales("0"); vo.setTotalSales("0");


+ 4
- 3
mallinkService/src/main/resources/mapper/WxRentContractRevenueSalesMapper.xml View File

@@ -12,13 +12,14 @@
<result column="bill_id" jdbcType="BIGINT" property="billId"/> <result column="bill_id" jdbcType="BIGINT" property="billId"/>
<result column="bill_money" jdbcType="VARCHAR" property="billMoney"/> <result column="bill_money" jdbcType="VARCHAR" property="billMoney"/>
<result column="sale_money" jdbcType="VARCHAR" property="saleMoney"/> <result column="sale_money" jdbcType="VARCHAR" property="saleMoney"/>
<result column="sale_money_valid" jdbcType="VARCHAR" property="saleMoneyValid"/>
<result column="calcute_money" jdbcType="VARCHAR" property="calcuteMoney"/> <result column="calcute_money" jdbcType="VARCHAR" property="calcuteMoney"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/> <result column="remark" jdbcType="VARCHAR" property="remark"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`rent_contract_id`,`property_contract_id`,`bill_id`,`bill_money`, `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`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -55,8 +56,8 @@
from wx_rent_contract_revenue_sales where id = #{id} and `tenant_id` = #{tenantId} from wx_rent_contract_revenue_sales where id = #{id} and `tenant_id` = #{tenantId}
</select> </select>
<select id="findSumSalesMoney" parameterType="com.iformall.domain.po.WxRentContractRevenueSales" resultType="BigDecimal">
select sum(CAST(sale_money AS DECIMAL(20,2))) receive_pay
<select id="findSumSalesMoneyValid" parameterType="com.iformall.domain.po.WxRentContractRevenueSales" resultType="BigDecimal">
select sum(CAST(ifnull(sale_money_valid,'0') AS DECIMAL(20,2))) receive_pay
from wx_rent_contract_revenue_sales from wx_rent_contract_revenue_sales
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
</select> </select>


Loading…
Cancel
Save