chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
墨大叔 2024-09-18 09:00:37 +08:00
parent 9e154620cd
commit 7ef89d0521
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java
View File

@ -213,7 +213,7 @@ public class BonusServiceImpl implements BonusService
// TODO 预计分成时间 // TODO 预计分成时间
if (BonusArrivalType.userList().contains(bonus.getArrivalType())) { if (BonusArrivalType.userList().contains(bonus.getArrivalType())) {
SmUserVo user = userList.stream().filter(item -> item.getUserId().equals(bonus.getArrivalId())).findFirst().orElse(null); SmUserVo user = userList.stream().filter(item -> item.getUserId().equals(bonus.getArrivalId())).findFirst().orElse(null);
bonus.setPrePayTime(); // bonus.setPrePayTime();
} else { } else {
bonus.setPrePayTime(now); bonus.setPrePayTime(now);
} }

3
smart-switch-web/src/main/resources/application-dev.yml
View File

@ -26,7 +26,8 @@ wx:
# 转账回调地址 # 转账回调地址
transferNotifyUrl: https://kg-dev.chuangtewl.com/dev-api/app/pay/notify/wx/transfer 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 merchantSerialNumber: 6AD69237C0F22A9AE51A64F1927E3A0962AC1FB0