diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 2d5e2cb2c..c701f728b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1607,7 +1607,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { oweMerchantVo.setBalance(map.get("balance")==null?"0":map.get("balance").toString()); list.add(oweMerchantVo); } - String name = "商户列表"; + String name = "商户账单列表"; excelService.exportExcel(list, null, name, ReceivedAndPayVo.class, name + ".xlsx", response, false); } 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 7ac99f7a4..4adb63d2c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1250,11 +1250,22 @@ public class WxRentContractServiceImpl implements WxRentContractService { double needpayD = WxRentContractServiceImpl.getNeedPay(0,priceD,startDate,endDate); needpay = new Double(needpayD).longValue(); }else{ - //年 需要除12 Double priceD = new Double(price); + + //年或者设置跳点率为年周期 除12 if(EnumPriceUnit.Y.getCode().equals(wxRentContract.getPriceUnit())){ 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){