server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -82,7 +82,7 @@ * 30 秒刷新一次 * @throws Exception */ @Scheduled(cron = "0/30 * * * * ? ") @Scheduled(cron = "0/15 * * * * ? ") public void autoRefreshLockStatus() throws Exception { log.info("=====================开始定时刷新骑行中的数充值未开锁失败======================="); memberRidesService.autoRefreshLockStatus(); server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -3031,6 +3031,16 @@ return (int)diff; } public static Integer betweenSeconds(Date begin, Date end) { if(begin ==null ){ return 0; } long createTime =begin.getTime();//获取创建时间的时间戳 long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//获取当前时间的时间戳 long diff=(currentTime-createTime)/1000;//获取两个时间相差的分钟 return (int)diff; } /** * 计算耗时 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -657,6 +657,10 @@ @Override public void autoRefreshLockStatus() { // memberRidesMapper.update(null,new UpdateWrapper<MemberRides>().lambda() // .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING.getKey()) // .apply("" ) // .set(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())) QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(); wrapper.lambda() @@ -665,9 +669,9 @@ List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper); if (!CollectionUtils.isEmpty(memberRides)){ memberRides.forEach(s->{ Integer between = DateUtil.between(s.getCreateDate(), new Date()); Integer between = DateUtil.betweenSeconds(s.getCreateDate(), new Date()); // 大于阈值 if (between >= 2){ if (between >= 20){ s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey()); s.setEditDate(new Date()); memberRidesMapper.updateById(s); server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
@@ -132,7 +132,7 @@ QueryWrapper<WxBillDetail> queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().ge(param.getStartDate() !=null,WxBillDetail::getPid,DateUtil.getShortDateStr(param.getStartDate())); queryWrapper.lambda().le(param.getEndDate() !=null,WxBillDetail::getPid,DateUtil.getShortDateStr(param.getEndDate())); queryWrapper.lambda().ne(WxBillDetail::getAppid, WxMiniConfig.wxPayV2Service.getConfig().getAppId());//非自行车收入统计 queryWrapper.lambda().ne(WxBillDetail::getAppid, WxMiniConfig.wxPayV2Service.getConfig().getSubAppId());//非自行车收入统计 queryWrapper.lambda().groupBy(WxBillDetail::getBillStatus); queryWrapper.select( "count(id) as sum_bill" ,"sum(settlement_total_fee) as settlement_total_fee" @@ -279,6 +279,8 @@ // Date ydate = DateUtil.addDaysToDate(new Date(), -1); request.setBillDate(billDate); request.setBillType("SUCCESS"); request.setSubMchId(WxMiniConfig.wxProperties.getSubMchId()); WxPayBillResult response = null; try { response = WxMiniConfig.wxPayV2Service.downloadBill(request); server/services/src/main/resources/application-pro.yml
@@ -47,6 +47,7 @@ mchId: 1661770902 apiV3Key: iF3kC8pL8dZ9iU3hN5fX9zI6eF4xQ6fT serialNumer: 368B835A194384FD583B83B77977B84127D2F655 mchKey: W97N53Q71326D6JZ2E9HY5M4VT4BAC8S notifyUrl: https://bikes.yxbhlt.cn/bike_h5_api/api/wxPayNotify refundNotifyUrl: https://bikes.yxbhlt.cn/bike_h5_api/api/wxRefundNotify # notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
