Browse Source

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

release_toaliyun_real
luozukai 6 years ago
parent
commit
68d431c559
2 changed files with 13 additions and 2 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  2. +12
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java View File

@@ -1607,7 +1607,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
oweMerchantVo.setBalance(map.get("balance")==null?"0":map.get("balance").toString()); oweMerchantVo.setBalance(map.get("balance")==null?"0":map.get("balance").toString());
list.add(oweMerchantVo); list.add(oweMerchantVo);
} }
String name = "商户列表";
String name = "商户账单列表";
excelService.exportExcel(list, null, name, ReceivedAndPayVo.class, name + ".xlsx", response, false); excelService.exportExcel(list, null, name, ReceivedAndPayVo.class, name + ".xlsx", response, false);
} }




+ 12
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -1250,11 +1250,22 @@ public class WxRentContractServiceImpl implements WxRentContractService {
double needpayD = WxRentContractServiceImpl.getNeedPay(0,priceD,startDate,endDate); double needpayD = WxRentContractServiceImpl.getNeedPay(0,priceD,startDate,endDate);
needpay = new Double(needpayD).longValue(); needpay = new Double(needpayD).longValue();
}else{ }else{
//年 需要除12
Double priceD = new Double(price); Double priceD = new Double(price);

//年或者设置跳点率为年周期 除12
if(EnumPriceUnit.Y.getCode().equals(wxRentContract.getPriceUnit())){ if(EnumPriceUnit.Y.getCode().equals(wxRentContract.getPriceUnit())){
priceD = new Double(price)/12; priceD = new Double(price)/12;
} }
if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
//设置跳点率为年周期 price不变
if(EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())){
return priceD.longValue();
}
//年或者设置跳点率为年周期 除12
if(EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){
priceD = new Double(price)/12;
}
}


//生成金额直接计算 //生成金额直接计算
if(!saveDb){ if(!saveDb){


Loading…
Cancel
Save