From 7ef89d05214928408b551551ae2982746198ef44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Wed, 18 Sep 2024 09:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java | 2 +- smart-switch-web/src/main/resources/application-dev.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java index d7a0b476..af2f4369 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java @@ -213,7 +213,7 @@ public class BonusServiceImpl implements BonusService // TODO 预计分成时间 if (BonusArrivalType.userList().contains(bonus.getArrivalType())) { SmUserVo user = userList.stream().filter(item -> item.getUserId().equals(bonus.getArrivalId())).findFirst().orElse(null); - bonus.setPrePayTime(); +// bonus.setPrePayTime(); } else { bonus.setPrePayTime(now); } diff --git a/smart-switch-web/src/main/resources/application-dev.yml b/smart-switch-web/src/main/resources/application-dev.yml index 919d78c6..e374f437 100644 --- a/smart-switch-web/src/main/resources/application-dev.yml +++ b/smart-switch-web/src/main/resources/application-dev.yml @@ -26,7 +26,8 @@ wx: # 转账回调地址 transferNotifyUrl: https://kg-dev.chuangtewl.com/dev-api/app/pay/notify/wx/transfer # 密钥所在位置 - privateKeyPath: H:/project/创特/证书/wxpay-kg/apiclient_key.pem +# privateKeyPath: H:/project/创特/证书/wxpay-kg/apiclient_key.pem + privateKeyPath: D:/project/证书/wxpay-kg/apiclient_key.pem # 证书序列号 merchantSerialNumber: 6AD69237C0F22A9AE51A64F1927E3A0962AC1FB0