Преглед изворни кода

[合同][修改][开发账单结算]

release_toaliyun_real
luozukai пре 6 година
родитељ
комит
6170e19249
3 измењених фајлова са 7 додато и 2 уклоњено
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  3. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 0
mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java Прегледај датотеку

@@ -30,6 +30,8 @@ public enum EnumFlowKey {
NEW_RENT_END(18, "商铺租赁合同终止"), NEW_RENT_END(18, "商铺租赁合同终止"),
NEW_RENT_POINT_CONTRACT(19, "多经点位商铺租赁合同签约"), NEW_RENT_POINT_CONTRACT(19, "多经点位商铺租赁合同签约"),
NEW_RENT_POINT_CONTRACT_END(20, "多经点位商铺租赁合同终止"), NEW_RENT_POINT_CONTRACT_END(20, "多经点位商铺租赁合同终止"),

SETTLE(21,"结算单审批"),
; ;


public static EnumFlowKey getEnum(Integer code) { public static EnumFlowKey getEnum(Integer code) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Прегледај датотеку

@@ -295,7 +295,7 @@ public class WxBillRentServiceImpl implements WxBillRentService {
ratio = wxRentContract.getPayRatio(); ratio = wxRentContract.getPayRatio();
}else{ }else{
if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){
long dayCount = DateUtils.startToEnd(wxBillRent.getStarttime(),wxBillRent.getEndtime());
long dayCount = DateUtils.startToEnd(wxBillRent.getStarttime(),wxBillRent.getEndtime()) + 1;
if(EnumBusRatioTime.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){ if(EnumBusRatioTime.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){
if(startInt == endInt && months == 12){ if(startInt == endInt && months == 12){
//刚好1年 //刚好1年


+ 4
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Прегледај датотеку

@@ -346,8 +346,11 @@ public class WxRentContractServiceImpl implements WxRentContractService {


array = ratioList.get(i-1).split(":"); array = ratioList.get(i-1).split(":");
Integer frontatio = Integer.parseInt(array[1]); Integer frontatio = Integer.parseInt(array[1]);
revenueArray = array[0].split("-");

BigDecimal frontEnd = new BigDecimal(revenueArray[1]).divide(new BigDecimal(365), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount));
BigDecimal frontRatio = new BigDecimal(frontatio).divide(new BigDecimal(10000)); BigDecimal frontRatio = new BigDecimal(frontatio).divide(new BigDecimal(10000));
BigDecimal frontPrice = end.multiply(new BigDecimal(1000000).multiply(frontRatio).setScale(2, RoundingMode.HALF_EVEN));
BigDecimal frontPrice = frontEnd.multiply(new BigDecimal(1000000).multiply(frontRatio).setScale(2, RoundingMode.HALF_EVEN));


ratioVo.setPrice(price.add(frontPrice).longValue()); ratioVo.setPrice(price.add(frontPrice).longValue());
return ratioVo; return ratioVo;


Loading…
Откажи
Сачувај