code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

Browse Source
This commit is contained in:
paulGao
2022-06-20 15:29:10 +08:00
parent e17e3474ca ea1b91af2a
commit 00964e6bbf
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/file/plugin/impl/MinioFilePlugin.java
View File

@@ -99,7 +99,7 @@ public class MinioFilePlugin implements FilePlugin {
}
MinioClient ossClient = getOssClient();
List<DeleteObject> objectList = key.stream().map(DeleteObject::new).collect(Collectors.toList());
ossClient.removeObjects(RemoveObjectsArgs.builder().objects(objectList).build());
ossClient.removeObjects(RemoveObjectsArgs.builder().objects(objectList).bucket(ossSetting.getM_bucketName()).build());
}

5
framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java
View File

@@ -28,9 +28,12 @@ public class PaymentServiceImpl implements PaymentService {
@Override
public void success(PaymentSuccessParams paymentSuccessParams) {
//支付状态
boolean paymentResult = cashierSupport.paymentResult(paymentSuccessParams.getPayParam());
//已支付则返回
if (paymentResult) {
log.warn("订单支付状态后，调用支付成功接口，流水号：{}", paymentSuccessParams.getReceivableNo());
log.warn("收银台重复收款，流水号：{}", paymentSuccessParams.getReceivableNo());
return;
}