From 3d593c6808fee1968f06df62690e60a5965b5725 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Apr 2023 00:04:21 +0800 Subject: [PATCH] fix rent --- .../src/main/java/com/iformall/schedule/ContractSchedule.java | 4 ++-- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index cf176d022..8f928e1de 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -224,8 +224,8 @@ public class ContractSchedule { * 凌晨5分,联营扣点和面积联营取高的需要根据接单数据来更新账单,取高的那一个 */ @Async - @Scheduled(cron = "0 5 0 * * ?") - //@Scheduled(cron = "0 */5 * * * *?") + //@Scheduled(cron = "0 5 0 * * ?") + @Scheduled(cron = "0 */2 * * * *?") public void updateRentBill() { //查询记租中的联营扣点或者取高的合同,每天更新账单截止时间为前一天的账单。 List wxMalls = wxMallMapper.findList(null); 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 8a3430024..35a94a337 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3282,7 +3282,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //同一个月 //合同账单结束的时间是00:00:00,取日期要取前一天 needPay = sumTradeDailyBySameMonthDay(bq, wxRentContract.getMerchantId(), - br.getStarttime(), DateUtils.getDayEnd(DateUtils.getTimeAfterDays(-1, br.getEndtime()))); + br.getStarttime(), DateUtils.getDayEnd(br.getEndtime())); } needPay = new BigDecimal(needPay).multiply(new BigDecimal(wxRentContract.getPayRatio())) .divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).intValue();