From fd4fafc12a1edb3a2635a670b2808d4b67292c61 Mon Sep 17 00:00:00 2001 From: clunt Date: Sun, 25 Sep 2022 18:57:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BB=B7=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/pay/AlipayController.java | 2 +- .../ghy/payment/service/impl/PayCallbackService.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java index 76e4e41d..66f609d0 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java @@ -97,7 +97,7 @@ public class AlipayController extends BaseController { payMoney = payMoney.add(financialChangeRecord.getChangeMoney()); } // 付款 - PayParam payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" + System.currentTimeMillis(), payMoney.setScale(2, BigDecimal.ROUND_UNNECESSARY).toString(), "加价付款", "叮咚到家服务"); + PayParam payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" +financialChangeRecord.getId() + "_" + System.currentTimeMillis(), payMoney.setScale(2, BigDecimal.ROUND_UNNECESSARY).toString(), "加价付款", "叮咚到家服务"); try { map = adapayService.alipayQrPay(orderMaster.getDeptId(), payParam, null, null, null); } catch (BaseAdaPayException e) { diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java index 8096e201..1a799996 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java @@ -6,8 +6,11 @@ import com.ghy.common.adapay.model.AdapayStatusEnum; import com.ghy.common.adapay.model.Event; import com.ghy.common.adapay.model.PayCallback; import com.ghy.common.adapay.model.PaymentDTO; +import com.ghy.common.enums.PayStatus; +import com.ghy.payment.domain.FinancialChangeRecord; import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.service.CallBackService; +import com.ghy.payment.service.FinancialChangeRecordService; import com.ghy.payment.service.FinancialMasterService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,6 +32,9 @@ public class PayCallbackService implements CallBackService { @Resource FinancialMasterService financialMasterService; + @Resource + FinancialChangeRecordService financialChangeRecordService; + @Override public void onCallback(Event event) { logger.info("支付回调: {}", event); @@ -69,6 +75,12 @@ public class PayCallbackService implements CallBackService { update.setOrderMasterCode(payment.getOrderNo().split("_")[0]); update.setPaymentId(payment.getId()); financialMasterService.updateFinancialMaster(update); + if(payment.getOrderNo().split("_").length > 2){ + FinancialChangeRecord financialChangeRecord = new FinancialChangeRecord(); + financialChangeRecord.setId(payment.getOrderNo().split("_")[1]); + financialChangeRecord.setPayStatus(1L); + financialChangeRecordService.updateFinancialChangeRecord(financialChangeRecord); + } } else { logger.warn("发起支付失败 : {}", response.toJSONString()); }