Skip to content

Commit

Permalink
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop i…
Browse files Browse the repository at this point in the history
…nto feature/pg
  • Loading branch information
LeiGaoRobot committed Jun 20, 2022
2 parents e17e347 + ea1b91a commit 00964e6
Showing 3 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -57,7 +57,6 @@ public void orderChange(OrderMessage orderMessage) {
.orderSn(order.getSn())
.paymentReceivableNo(order.getReceivableNo())
.outOrderNo("AF" + SnowFlake.getIdStr())
.outOrderNo("AF" + SnowFlake.getIdStr())
.refundReason("订单取消")
.build();
payment.refund(refundLog);
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ public void deleteFile(List<String> key) {
}
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());
}


Original file line number Diff line number Diff line change
@@ -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;
}

0 comments on commit 00964e6

Please sign in to comment.