From 54cbbec9c6b90c28711623398fb0dc4d018fa9ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 26 十二月 2023 15:27:09 +0800
Subject: [PATCH] 微信码改版
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 10 ++++++++++
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 8 ++++++--
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 2 +-
server/services/src/main/resources/application-pro.yml | 1 +
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 4 +++-
5 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 92ffb41..625342b 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/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();
diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index 4beed80..bd40424 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/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;
+ }
+
/**
* 璁＄畻鑰楁椂
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index b6147fa..a466654 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/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);
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
index 85883e9..6c372d7 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
+++ b/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);
diff --git a/server/services/src/main/resources/application-pro.yml b/server/services/src/main/resources/application-pro.yml
index 557bfd1..ac7e77f 100644
--- a/server/services/src/main/resources/application-pro.yml
+++ b/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
--
Gitblit v1.9.3