autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 03:55:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化订单退款逻辑

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-11 11:44:55 +08:00
parent 7e1117f873
commit cd1d2f6747
3 changed files with 96 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2329,40 +2329,15 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
}
// 创建汇付退款对象 在完成初始化设置情况下，调用方法，获取 Refund对象
String id = record.getPaymentId(); //
String snowflakeId = SnowflakeIdWorker.getSnowflakeId();
String amount = AdapayUtil.formatAmount(dto.getRefundAmount());
// TODO 拿orderCode查询清分状态
String payMode = "delay";
if (StringUtils.equals("", payMode)) {
// 延迟分账确认的调退款接口
adapayMemberService.createRefundRequest(id, amount);
// Map<String, Object> refundParams = Maps.newHashMap();
// refundParams.put("refund_amt", amount);
// refundParams.put("refund_order_no", snowflakeId);
// refundParams.put("notify_url", ADAPAY_CALLBACK_URL);
// try {
// Map<String, Object> response = Refund.create(id, refundParams);
// logger.info("汇付支付创建退款对象:{}", JSON.toJSONString(response));
// } catch (BaseAdaPayException e) {
// logger.error("汇付支付创建退款对象error", e);
// }
adapayMemberService.createRefundRequest(record.getPaymentId(), dto.getRefundAmount());
} else {
// 延迟分账未确认调撤销调撤销接口退款
adapayMemberService.createPaymentReverseRequest(id, amount);
// Map<String, Object> reverseParams = Maps.newHashMap();
// reverseParams.put("app_id", ADAPAY_APP_ID);
// reverseParams.put("payment_id", id);
// reverseParams.put("reverse_amt", amount);
// reverseParams.put("order_no", snowflakeId);
// reverseParams.put("notify_url", ADAPAY_CALLBACK_URL);
// try {
// Map<String, Object> paymentReverse = PaymentReverse.create(reverseParams);
// logger.info("汇付支付创建交易撤销对象:{}", JSON.toJSONString(paymentReverse));
// } catch (BaseAdaPayException e) {
// logger.error("汇付支付创建交易撤销对象error", e);
// }
adapayMemberService.createPaymentReverseRequest(record.getPaymentId(), dto.getRefundAmount());
}
}
@@ -2388,15 +2363,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
BigDecimal deductionAmount = vo.getDeductionAmount();
// 调汇付的交易撤销接口
// adapayMemberService.
// 调汇付的分账接口 确认交易
// PaymentConfirmResponse paymentConfirmResponse = adapayMemberService.createPaymentConfirmRequest(paymentId, adapayMemberAccount, deductionAmount, orderCode);
// if (paymentConfirmResponse != null) {
// confirmAmt = confirmAmt.add(new BigDecimal(paymentConfirmResponse.getConfirmed_amt()));
// feeAmt = feeAmt.add(new BigDecimal(paymentConfirmResponse.getFee_amt()));
// status = paymentConfirmResponse.getStatus();
// description = paymentConfirmResponse.getDescription();
// }
adapayMemberService.createPaymentReverseRequest(paymentId, deductionAmount);
// 更新这笔交易的剩余金额
MemberAdapayRecord record = memberAdapayRecordService.selectByPaymentId(paymentId);