From de701c472614c73f2bfce9789183941b1e6fb228 Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Wed, 21 May 2025 09:59:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/dto/ResProcessedRefundDto.java | 5 +++-- .../src/main/resources/application-dev.yml | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java index 06929b34..5c44aa7a 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java @@ -74,7 +74,7 @@ public class ResProcessedRefundDto { /** * 退款方式 */ - private LocalDateTime refundMethod; + private String refundMethod; /** * 支付方式 @@ -109,7 +109,8 @@ public class ResProcessedRefundDto { /** * 骑行设备编号 */ - private String ebikeCode;; + private String ebikeCode; + ; /** * 骑行开始时间 diff --git a/ebike-payment/src/main/resources/application-dev.yml b/ebike-payment/src/main/resources/application-dev.yml index 5531b6d4..beff77d8 100644 --- a/ebike-payment/src/main/resources/application-dev.yml +++ b/ebike-payment/src/main/resources/application-dev.yml @@ -48,4 +48,19 @@ task-scheduler-pool: poolSize: 100 threadNamePrefix: task-scheduled- waitForTasksToCompleteOnShutdown: true - awaitTerminationSeconds: 30 \ No newline at end of file + awaitTerminationSeconds: 30 +sa-token: + # token 名称（同时也是 cookie 名称） + token-name: Authorization + # token 有效期（单位：秒） 默认30天，-1 代表永久有效 + timeout: 2592000 + # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结 + active-timeout: -1 + # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录） + is-concurrent: true + # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token） + is-share: true + # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik） + token-style: random-32 + # 是否输出操作日志 + is-log: true \ No newline at end of file From 4a30209d2588b27528c80bcff211f655fe8b4ddb Mon Sep 17 00:00:00 2001 From: jkcdev Date: Wed, 21 May 2025 10:14:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E9=80=80=E6=AC=BE=E7=8E=AF=E8=8A=82?= =?UTF-8?q?=EF=BC=8C=E8=AE=B0=E5=BD=95=E6=93=8D=E4=BD=9C=E4=BA=BAID?= =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87=E8=AF=B7=E6=B1=82token=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7ID=EF=BC=88=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0sa-token=E9=85=8D=E7=BD=AE=EF=BC=89=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=EF=BC=8812=E5=B0=8F=E6=97=B6=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=EF=BC=89=E3=80=81=E9=80=80=E6=AC=BE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=A3=80=E6=9F=A5=E5=88=86=E5=BC=80=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=88=E5=8D=8A=E5=B0=8F=E6=97=B6=E6=89=A7=E8=A1=8C=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cdzy/payment/config/WxPayConfig.java | 13 +++++++------ .../com/cdzy/payment/task/ScheduledTaskManager.java | 8 +++++--- .../src/main/resources/application-dev.yml | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/config/WxPayConfig.java b/ebike-payment/src/main/java/com/cdzy/payment/config/WxPayConfig.java index a5f281ae..842f3435 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/config/WxPayConfig.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/config/WxPayConfig.java @@ -2,9 +2,7 @@ package com.cdzy.payment.config; import com.wechat.pay.java.core.Config; import com.wechat.pay.java.core.RSAPublicKeyConfig; -import com.wechat.pay.java.core.cipher.RSASigner; import com.wechat.pay.java.core.cipher.Signer; -import com.wechat.pay.java.core.util.PemUtil; import com.wechat.pay.java.service.payments.jsapi.JsapiService; import com.wechat.pay.java.service.refund.RefundService; import lombok.Data; @@ -12,8 +10,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.security.PrivateKey; - /** * 微信支付配置参数 * @@ -67,10 +63,15 @@ public class WxPayConfig { */ private Integer expireMinute = 1440; /** - * 定时任务执行表达式 + * 支付状态检查定时任务执行表达式 * 默认每12小时执行1次 */ - private String cronExpression = "0 0 0,12 * * ?"; + private String paySchedule = "0 0 0/12 * * ?"; + /** + * 退款状态检查定时任务执行表达式 + * 默认每30分钟执行1次 + */ + private String refundSchedule = "0 0/30 * * * ?"; @Bean public Config certificateConfig() { diff --git a/ebike-payment/src/main/java/com/cdzy/payment/task/ScheduledTaskManager.java b/ebike-payment/src/main/java/com/cdzy/payment/task/ScheduledTaskManager.java index b2bd8456..61d448de 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/task/ScheduledTaskManager.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/task/ScheduledTaskManager.java @@ -29,7 +29,9 @@ public class ScheduledTaskManager { @PostConstruct public void init() { - String CRON_EXPRESSION = wxPayConfig.getCronExpression(); + String CRON_EXPRESSION_PAY = wxPayConfig.getPaySchedule(); + String CRON_EXPRESSION_REFUND = wxPayConfig.getRefundSchedule(); + // 启动定时任务 // 1. 每隔30秒执行1次，查询创建未超过5分钟，并且未支付的订单 threadPoolTaskScheduler.schedule(new Runnable() { @@ -41,7 +43,7 @@ public class ScheduledTaskManager { log.error("checkOrderStatus 执行异常", e); } } - }, new CronTrigger(CRON_EXPRESSION)); + }, new CronTrigger(CRON_EXPRESSION_PAY)); //========支付系统自动关闭，不主动关闭，每次发起请求的时候检测是否关闭======== //// 2. 每隔30秒执行1次，查询创建超过5分钟，并且未支付的订单 @@ -66,7 +68,7 @@ public class ScheduledTaskManager { log.error("checkRefundStatus 执行异常", e); } } - }, new CronTrigger(CRON_EXPRESSION)); + }, new CronTrigger(CRON_EXPRESSION_REFUND)); } } diff --git a/ebike-payment/src/main/resources/application-dev.yml b/ebike-payment/src/main/resources/application-dev.yml index beff77d8..406c966e 100644 --- a/ebike-payment/src/main/resources/application-dev.yml +++ b/ebike-payment/src/main/resources/application-dev.yml @@ -43,7 +43,8 @@ payment: pay-notify_url: http://192.168.2.156:10017/wxPayment/pay-notify refund-notify_url: http://192.168.2.156:10017/wxPayment/refund-notify expire-minutes: 1440 - cron-expression: 0 0 0,12 * * ? + pay-schedule: 0 0 0/12 * * ? + refund-schedule: 0 0/30 * * * ? task-scheduler-pool: poolSize: 100 threadNamePrefix: task-scheduled- From 069fb90ce8ce17495ee41dbeb0c88fd7a38e1992 Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Wed, 21 May 2025 10:17:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?dto=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cdzy/payment/model/dto/OrderInfo.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/OrderInfo.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/OrderInfo.java index f93fc567..3ed5d422 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/OrderInfo.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/OrderInfo.java @@ -15,37 +15,88 @@ import java.time.LocalDateTime; @Data public class OrderInfo { + /** + * 订单编号 + */ private String orderId; + /** + * 车辆编号 + */ private String bikeCode; + /** + * 运营区域 + */ private String operate; + /** + * 订单来源 + */ private String orderSource; + /** + * 租借方式 + */ private String rentMethod; + /** + * 骑行状态 + */ private String cyclingState; + /** + * 还车类型 + */ private String returnCarType; + /** + * 开锁时间 + */ private LocalDateTime unLockTime; + /** + * 锁车时间 + */ private LocalDateTime lockTime; + /** + * 骑行时长 + */ private String cyclingDuration; + /** + * 轨迹里程 + */ private String trajectoryMileage; + /** + * 中控里程 + */ private String ecuMileage; + /** + * 创建时间 + */ private LocalDateTime createTime; + /** + * 结束时间 + */ private LocalDateTime endTime; + /** + * 订单备注 + */ private String orderRemark; + /** + * 起始行政区域 + */ private String startRegion; + /** + * 结束行政区域 + */ private String endRegion; } From a7ac2de3636a808375133162142a9a8b2c1d2930 Mon Sep 17 00:00:00 2001 From: jkcdev Date: Wed, 21 May 2025 10:50:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E9=80=80=E6=AC=BE=E7=8E=AF=E8=8A=82?= =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cdzy/orders/service/impl/UserOrdersServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java index e8bb54b2..22e7619e 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java @@ -318,7 +318,7 @@ public class UserOrdersServiceImpl extends ServiceImpl