From ed5d4e501b97348912b98796606dc6b249c2a88d Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Wed, 22 Jul 2026 14:27:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor(callback):=20=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20channel=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20pr?= =?UTF-8?q?oduct=20=E5=B9=B6=E7=BF=BB=E8=AF=91=E9=80=9A=E9=81=93=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 落库与查询改为支付产品；写入时按 channelMchNo 解析产品；列表侧可展示通道商户名称。 Co-authored-by: Cursor --- _config/sql/update-tables.sql | 19 ++++++++++++++--- .../callback/AdapayPayCallbackService.java | 9 ++++---- .../callback/AdapayRefundCallbackService.java | 11 +++++----- .../callback/AlipayCallbackService.java | 21 +++++++++---------- .../callback/DougongPayCallbackService.java | 9 ++++---- .../DougongRefundCallbackService.java | 9 ++++---- .../callback/DouyinPayCallbackService.java | 7 +++---- .../callback/DouyinRefundCallbackService.java | 9 ++++---- .../callback/FuyouPayCallbackService.java | 13 ++++++------ .../callback/FuyouRefundCallbackService.java | 11 +++++----- .../callback/HkrtPayCallbackService.java | 9 ++++---- .../callback/HkrtRefundCallbackService.java | 9 ++++---- .../callback/HmpayPayCallbackService.java | 9 ++++---- .../callback/HmpayRefundCallbackService.java | 9 ++++---- .../callback/LakalaPayCallbackService.java | 9 ++++---- .../callback/LakalaRefundCallbackService.java | 9 ++++---- .../callback/LeshuaPayCallbackService.java | 9 ++++---- .../callback/LeshuaRefundCallbackService.java | 9 ++++---- .../callback/UmsPayCallbackService.java | 7 +++---- .../callback/UmsRefundCallbackService.java | 7 +++---- .../callback/VbillPayCallbackService.java | 11 +++++----- .../callback/VbillRefundCallbackService.java | 11 +++++----- .../callback/WechatPayCallbackService.java | 7 +++---- .../callback/WechatRefundCallbackService.java | 7 +++---- .../callback/YeepayPayCallbackService.java | 7 +++---- .../callback/YeepayRefundCallbackService.java | 7 +++---- .../entity/channel/ChannelMerchant.java | 2 ++ .../record/entity/PayCallbackRecord.java | 8 +++---- .../record/param/PayCallbackRecordQuery.java | 8 +++---- .../result/PayCallbackRecordResult.java | 20 ++++++++++++++---- .../service/PayCallbackRecordService.java | 12 +++++------ 31 files changed, 153 insertions(+), 151 deletions(-) diff --git a/_config/sql/update-tables.sql b/_config/sql/update-tables.sql index 5498b5778..ff817e9e5 100644 --- a/_config/sql/update-tables.sql +++ b/_config/sql/update-tables.sql @@ -259,7 +259,7 @@ CREATE TABLE "public"."pay_callback_record" ( "channel_mch_no" varchar(64), "trade_no" varchar(100), "out_trade_no" varchar(150), - "channel" varchar(32) NOT NULL, + "product" varchar(32), "callback_type" varchar(20) NOT NULL, "notify_info" text NOT NULL, "status" varchar(20) NOT NULL, @@ -278,7 +278,7 @@ COMMENT ON COLUMN "public"."pay_callback_record"."app_id" IS '应用号'; COMMENT ON COLUMN "public"."pay_callback_record"."channel_mch_no" IS '通道商户号'; COMMENT ON COLUMN "public"."pay_callback_record"."trade_no" IS '平台交易号(支付回调为 trade_no, 退款回调为 refund_no)'; COMMENT ON COLUMN "public"."pay_callback_record"."out_trade_no" IS '通道交易号'; -COMMENT ON COLUMN "public"."pay_callback_record"."channel" IS '支付通道'; +COMMENT ON COLUMN "public"."pay_callback_record"."product" IS '支付产品'; COMMENT ON COLUMN "public"."pay_callback_record"."callback_type" IS '回调类型: pay / refund'; COMMENT ON COLUMN "public"."pay_callback_record"."notify_info" IS '通知消息内容(JSON)'; COMMENT ON COLUMN "public"."pay_callback_record"."status" IS '回调处理状态'; @@ -288,7 +288,7 @@ COMMENT ON TABLE "public"."pay_callback_record" IS '通道入站回调记录'; ALTER TABLE "public"."pay_callback_record" ADD CONSTRAINT "pay_callback_record_pkey" PRIMARY KEY ("id"); CREATE INDEX "idx_pay_callback_record_trade_no" ON "public"."pay_callback_record" USING btree ("trade_no"); CREATE INDEX "idx_pay_callback_record_out_trade_no" ON "public"."pay_callback_record" USING btree ("out_trade_no"); -CREATE INDEX "idx_pay_callback_record_channel" ON "public"."pay_callback_record" USING btree ("channel"); +CREATE INDEX "idx_pay_callback_record_product" ON "public"."pay_callback_record" USING btree ("product"); CREATE INDEX "idx_pay_callback_record_mch_no" ON "public"."pay_callback_record" USING btree ("mch_no"); CREATE INDEX "idx_pay_callback_record_channel_mch_no" ON "public"."pay_callback_record" USING btree ("channel_mch_no"); CREATE INDEX "idx_pay_callback_record_create_time" ON "public"."pay_callback_record" USING btree ("create_time" DESC); @@ -299,4 +299,17 @@ COMMENT ON COLUMN "public"."pay_callback_record"."channel_mch_no" IS '通道商 CREATE INDEX IF NOT EXISTS "idx_pay_callback_record_channel_mch_no" ON "public"."pay_callback_record" USING btree ("channel_mch_no"); -- 已建表环境增量: 去掉未使用的错误码列 ALTER TABLE "public"."pay_callback_record" DROP COLUMN IF EXISTS "error_code"; +-- 已建表环境增量: channel → product(支付产品) +ALTER TABLE "public"."pay_callback_record" ADD COLUMN IF NOT EXISTS "product" varchar(32); +COMMENT ON COLUMN "public"."pay_callback_record"."product" IS '支付产品'; +UPDATE "public"."pay_callback_record" r +SET "product" = m."product" +FROM "public"."mch_channel_merchant" m +WHERE r."product" IS NULL + AND r."channel_mch_no" IS NOT NULL + AND r."channel_mch_no" = m."channel_mch_no" + AND m."deleted" = false; +DROP INDEX IF EXISTS "idx_pay_callback_record_channel"; +ALTER TABLE "public"."pay_callback_record" DROP COLUMN IF EXISTS "channel"; +CREATE INDEX IF NOT EXISTS "idx_pay_callback_record_product" ON "public"."pay_callback_record" USING btree ("product"); diff --git a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/callback/AdapayPayCallbackService.java b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/callback/AdapayPayCallbackService.java index 759a7fa02..d3d4962e3 100644 --- a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/callback/AdapayPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/callback/AdapayPayCallbackService.java @@ -8,7 +8,6 @@ import cn.daxpay.open.channel.adapay.code.AdapayCode; import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -49,7 +48,7 @@ public class AdapayPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("Adapay 支付回调: body 为空"); - payCallbackRecordService.savePay(ChannelEnum.HUIFU.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return AdapayCode.NOTIFY_FAIL; } @@ -61,7 +60,7 @@ public class AdapayPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("Adapay 支付回调验签失败"); - payCallbackRecordService.savePay(ChannelEnum.HUIFU.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return AdapayCode.NOTIFY_FAIL; } @@ -86,10 +85,10 @@ public class AdapayPayCallbackService { } catch (Exception e) { log.error("Adapay 支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.HUIFU.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return AdapayCode.NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.HUIFU.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return AdapayCode.NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/callback/AdapayRefundCallbackService.java b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/callback/AdapayRefundCallbackService.java index 61ae9d7c9..2ca7ca7ed 100644 --- a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/callback/AdapayRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/callback/AdapayRefundCallbackService.java @@ -8,7 +8,6 @@ import cn.daxpay.open.channel.adapay.code.AdapayCode; import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -47,7 +46,7 @@ public class AdapayRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("Adapay 退款回调: body 为空"); - payCallbackRecordService.saveRefund(ChannelEnum.HUIFU.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return AdapayCode.NOTIFY_FAIL; } @@ -63,7 +62,7 @@ public class AdapayRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("Adapay 退款回调: 子应用解析失败"); - payCallbackRecordService.saveRefund(ChannelEnum.HUIFU.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return AdapayCode.NOTIFY_FAIL; } AdapayCallbackParseResp resp = result.getData(); @@ -73,7 +72,7 @@ public class AdapayRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("Adapay 退款回调验签失败"); - payCallbackRecordService.saveRefund(ChannelEnum.HUIFU.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return AdapayCode.NOTIFY_FAIL; } @@ -97,10 +96,10 @@ public class AdapayRefundCallbackService { } catch (Exception e) { log.error("Adapay 退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.HUIFU.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return AdapayCode.NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.HUIFU.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return AdapayCode.NOTIFY_SUCCESS; } } diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/callback/AlipayCallbackService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/callback/AlipayCallbackService.java index 92df98d77..16ae10d6b 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/callback/AlipayCallbackService.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/callback/AlipayCallbackService.java @@ -16,7 +16,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.trade.runtime.service.PayTradeContainerFields; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -69,7 +68,7 @@ public class AlipayCallbackService { failData.setCallbackData(params); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("支付宝回调: 表单参数为空"); - payCallbackRecordService.savePay(ChannelEnum.ALIPAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } @@ -88,14 +87,14 @@ public class AlipayCallbackService { failData.setRefundNo(params.get("out_request_no")); failData.setCallbackStatus(CallbackStatusEnum.EXCEPTION); failData.setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.ALIPAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); } else { CallbackData failData = new CallbackData(); failData.setCallbackData(params); failData.setTradeNo(params.get("out_trade_no")); failData.setCallbackStatus(CallbackStatusEnum.EXCEPTION); failData.setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.ALIPAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); } return NOTIFY_FAIL; } @@ -113,7 +112,7 @@ public class AlipayCallbackService { failData.setTradeNo(tradeNo); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("支付宝支付回调: 无法解析通道凭证"); - payCallbackRecordService.savePay(ChannelEnum.ALIPAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } AlipayCallbackParseResp resp = parse(params, credential, false); @@ -124,7 +123,7 @@ public class AlipayCallbackService { failData.setTradeNo(tradeNo); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("支付宝支付回调验签失败"); - payCallbackRecordService.savePay(ChannelEnum.ALIPAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } CallbackData callbackData = new CallbackData(); @@ -138,7 +137,7 @@ public class AlipayCallbackService { } callbackData.setFinishTime(resp.getFinishTime()); payCallbackService.payCallback(callbackData); - payCallbackRecordService.savePay(ChannelEnum.ALIPAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return NOTIFY_SUCCESS; } @@ -154,7 +153,7 @@ public class AlipayCallbackService { failData.setRefundNo(refundNo); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("支付宝退款回调: 退款单不存在"); - payCallbackRecordService.saveRefund(ChannelEnum.ALIPAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } AlipaySdkCredential credential = resolveCredentialByTradeNo(refundOrder.getTradeNo(), channelMchNo); @@ -165,7 +164,7 @@ public class AlipayCallbackService { failData.setRefundNo(refundNo); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("支付宝退款回调: 无法解析通道凭证"); - payCallbackRecordService.saveRefund(ChannelEnum.ALIPAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } AlipayCallbackParseResp resp = parse(params, credential, true); @@ -176,7 +175,7 @@ public class AlipayCallbackService { failData.setRefundNo(refundNo); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("支付宝退款回调验签失败"); - payCallbackRecordService.saveRefund(ChannelEnum.ALIPAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } RefundCallbackData callbackData = new RefundCallbackData(); @@ -190,7 +189,7 @@ public class AlipayCallbackService { } callbackData.setFinishTime(resp.getFinishTime()); refundCallbackService.refundCallback(callbackData); - payCallbackRecordService.saveRefund(ChannelEnum.ALIPAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/callback/DougongPayCallbackService.java b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/callback/DougongPayCallbackService.java index b1e0bdcf0..e754c7519 100644 --- a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/callback/DougongPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/callback/DougongPayCallbackService.java @@ -10,7 +10,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -59,7 +58,7 @@ public class DougongPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("斗拱支付回调: 服务商公钥未配置"); - payCallbackRecordService.savePay(ChannelEnum.HUIFU.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } @@ -78,7 +77,7 @@ public class DougongPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("斗拱支付回调验签/解析失败"); - payCallbackRecordService.savePay(ChannelEnum.HUIFU.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } DougongCallbackParseResp resp = result.getData(); @@ -106,10 +105,10 @@ public class DougongPayCallbackService { } catch (Exception e) { log.error("斗拱支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.HUIFU.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.HUIFU.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); // 5. 汇付要求返回 RECV_ORD_ID_{hfSeqId} 表示接收成功 return "RECV_ORD_ID_" + resp.getTradeNo(); } diff --git a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/callback/DougongRefundCallbackService.java b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/callback/DougongRefundCallbackService.java index 5e6ec9a04..0db015c26 100644 --- a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/callback/DougongRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/callback/DougongRefundCallbackService.java @@ -10,7 +10,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -59,7 +58,7 @@ public class DougongRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("斗拱退款回调: 服务商公钥未配置"); - payCallbackRecordService.saveRefund(ChannelEnum.HUIFU.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } @@ -78,7 +77,7 @@ public class DougongRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("斗拱退款回调验签/解析失败"); - payCallbackRecordService.saveRefund(ChannelEnum.HUIFU.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } DougongCallbackParseResp resp = result.getData(); @@ -103,10 +102,10 @@ public class DougongRefundCallbackService { } catch (Exception e) { log.error("斗拱退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.HUIFU.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.HUIFU.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); // 汇付要求返回 RECV_ORD_ID_{hfSeqId} 表示接收成功 return "RECV_ORD_ID_" + resp.getTradeNo(); } diff --git a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/callback/DouyinPayCallbackService.java b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/callback/DouyinPayCallbackService.java index e5dc30e73..1e5dbbadc 100644 --- a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/callback/DouyinPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/callback/DouyinPayCallbackService.java @@ -13,7 +13,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.extra.servlet.JakartaServletUtil; import jakarta.servlet.http.HttpServletRequest; @@ -64,7 +63,7 @@ public class DouyinPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("抖音支付回调验签失败"); - payCallbackRecordService.savePay(ChannelEnum.DOUYIN.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return DouyinPayCode.NOTIFY_FAIL; } @@ -81,10 +80,10 @@ public class DouyinPayCallbackService { } catch (Exception e) { log.error("抖音支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.DOUYIN.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return DouyinPayCode.NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.DOUYIN.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return DouyinPayCode.NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/callback/DouyinRefundCallbackService.java b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/callback/DouyinRefundCallbackService.java index 1c61f1d58..96630a4ad 100644 --- a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/callback/DouyinRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/callback/DouyinRefundCallbackService.java @@ -13,7 +13,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.extra.servlet.JakartaServletUtil; import jakarta.servlet.http.HttpServletRequest; @@ -71,7 +70,7 @@ public class DouyinRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("抖音退款回调验签通道调用失败"); - payCallbackRecordService.saveRefund(ChannelEnum.DOUYIN.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return DouyinPayCode.NOTIFY_FAIL; } @@ -82,7 +81,7 @@ public class DouyinRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("抖音退款回调验签失败"); - payCallbackRecordService.saveRefund(ChannelEnum.DOUYIN.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return DouyinPayCode.NOTIFY_FAIL; } @@ -104,10 +103,10 @@ public class DouyinRefundCallbackService { } catch (Exception e) { log.error("抖音退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.DOUYIN.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return DouyinPayCode.NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.DOUYIN.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return DouyinPayCode.NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/callback/FuyouPayCallbackService.java b/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/callback/FuyouPayCallbackService.java index 1daab353e..3e76ce8d5 100644 --- a/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/callback/FuyouPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/callback/FuyouPayCallbackService.java @@ -11,7 +11,6 @@ import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -57,7 +56,7 @@ public class FuyouPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("富友支付回调: req 参数为空"); - payCallbackRecordService.savePay(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return RESP_FAIL; } @@ -70,7 +69,7 @@ public class FuyouPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("富友支付回调: 服务商密钥未配置"); - payCallbackRecordService.savePay(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return RESP_FAIL; } @@ -82,7 +81,7 @@ public class FuyouPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("富友支付回调验签失败"); - payCallbackRecordService.savePay(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return RESP_FAIL; } @@ -98,7 +97,7 @@ public class FuyouPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("富友支付回调: 未找到关联订单"); - payCallbackRecordService.savePay(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return RESP_FAIL; } @@ -118,12 +117,12 @@ public class FuyouPayCallbackService { callbackData.setCallbackData(notify); try { payCallbackService.payCallback(callbackData); - payCallbackRecordService.savePay(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return RESP_SUCCESS; } catch (Exception e) { log.error("富友支付回调业务处理失败: tradeNo={}", trade.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return RESP_FAIL; } } diff --git a/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/callback/FuyouRefundCallbackService.java b/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/callback/FuyouRefundCallbackService.java index 8cdf750ee..bb83867ce 100644 --- a/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/callback/FuyouRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/callback/FuyouRefundCallbackService.java @@ -6,7 +6,6 @@ import cn.daxpay.open.channel.fuyou.entity.isv.FuyouIsvKeyConfig; import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -44,7 +43,7 @@ public class FuyouRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("富友退款回调: req 参数为空"); - payCallbackRecordService.saveRefund(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return FuyouPayCallbackService.RESP_FAIL; } FuyouIsvKeyConfig keyConfig = fuyouIsvKeyConfigManager.findByProduct(ProductEnum.FUYOU_PAY.getCode()) @@ -55,7 +54,7 @@ public class FuyouRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("富友退款回调: 服务商密钥未配置"); - payCallbackRecordService.saveRefund(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return FuyouPayCallbackService.RESP_FAIL; } @@ -66,7 +65,7 @@ public class FuyouRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("富友退款回调验签失败"); - payCallbackRecordService.saveRefund(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return FuyouPayCallbackService.RESP_FAIL; } @@ -89,10 +88,10 @@ public class FuyouRefundCallbackService { } catch (Exception e) { log.error("富友退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return FuyouPayCallbackService.RESP_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.FUYOU_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return FuyouPayCallbackService.RESP_SUCCESS; } } diff --git a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/callback/HkrtPayCallbackService.java b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/callback/HkrtPayCallbackService.java index 371979ea0..5d236bdf2 100644 --- a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/callback/HkrtPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/callback/HkrtPayCallbackService.java @@ -9,7 +9,6 @@ import cn.daxpay.open.channel.hkrt.entity.isv.HkrtIsvKeyConfig; import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -59,7 +58,7 @@ public class HkrtPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("海科融通支付回调: 服务商密钥未配置"); - payCallbackRecordService.savePay(ChannelEnum.HKRT_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } @@ -70,7 +69,7 @@ public class HkrtPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("海科融通支付回调验签/解析失败"); - payCallbackRecordService.savePay(ChannelEnum.HKRT_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } CallbackData callbackData = toCallbackData(resp); @@ -84,10 +83,10 @@ public class HkrtPayCallbackService { } catch (Exception e) { log.error("海科融通支付回调业务处理失败: tradeNo={}", resp.getOutTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.HKRT_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.HKRT_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/callback/HkrtRefundCallbackService.java b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/callback/HkrtRefundCallbackService.java index f64d547b0..d3309223f 100644 --- a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/callback/HkrtRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/callback/HkrtRefundCallbackService.java @@ -9,7 +9,6 @@ import cn.daxpay.open.channel.hkrt.entity.isv.HkrtIsvKeyConfig; import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -63,7 +62,7 @@ public class HkrtRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("海科融通退款回调: 服务商密钥未配置"); - payCallbackRecordService.saveRefund(ChannelEnum.HKRT_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } @@ -74,7 +73,7 @@ public class HkrtRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("海科融通退款回调验签/解析失败"); - payCallbackRecordService.saveRefund(ChannelEnum.HKRT_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } @@ -98,10 +97,10 @@ public class HkrtRefundCallbackService { } catch (Exception e) { log.error("海科融通退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.HKRT_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.HKRT_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/callback/HmpayPayCallbackService.java b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/callback/HmpayPayCallbackService.java index 22e36a57a..8c5c022e0 100644 --- a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/callback/HmpayPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/callback/HmpayPayCallbackService.java @@ -10,7 +10,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -60,7 +59,7 @@ public class HmpayPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("河马付支付回调: 服务商公钥未配置"); - payCallbackRecordService.savePay(ChannelEnum.SAND_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } @@ -79,7 +78,7 @@ public class HmpayPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("河马付支付回调验签/解析失败"); - payCallbackRecordService.savePay(ChannelEnum.SAND_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } HmpayCallbackParseResp resp = result.getData(); @@ -102,10 +101,10 @@ public class HmpayPayCallbackService { } catch (Exception e) { log.error("河马付支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.SAND_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.SAND_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); // 5. 杉德要求返回 success 表示接收成功 return NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/callback/HmpayRefundCallbackService.java b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/callback/HmpayRefundCallbackService.java index 3cc00c2b2..792c2eb0c 100644 --- a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/callback/HmpayRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/callback/HmpayRefundCallbackService.java @@ -10,7 +10,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.hutool.core.util.StrUtil; @@ -60,7 +59,7 @@ public class HmpayRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("河马付退款回调: 服务商公钥未配置"); - payCallbackRecordService.saveRefund(ChannelEnum.SAND_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } @@ -79,7 +78,7 @@ public class HmpayRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("河马付退款回调验签/解析失败"); - payCallbackRecordService.saveRefund(ChannelEnum.SAND_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } HmpayCallbackParseResp resp = result.getData(); @@ -103,10 +102,10 @@ public class HmpayRefundCallbackService { } catch (Exception e) { log.error("河马付退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.SAND_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.SAND_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); // 杉德要求返回 success 表示接收成功 return NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/callback/LakalaPayCallbackService.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/callback/LakalaPayCallbackService.java index acd5b099b..8349df292 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/callback/LakalaPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/callback/LakalaPayCallbackService.java @@ -9,7 +9,6 @@ import cn.daxpay.open.channel.lakala.entity.isv.LakalaIsvKeyConfig; import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -62,7 +61,7 @@ public class LakalaPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("拉卡拉支付回调: 服务商密钥未配置"); - payCallbackRecordService.savePay(ChannelEnum.LAKALA_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } @@ -74,7 +73,7 @@ public class LakalaPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("拉卡拉支付回调验签失败"); - payCallbackRecordService.savePay(ChannelEnum.LAKALA_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } @@ -97,10 +96,10 @@ public class LakalaPayCallbackService { } catch (Exception e) { log.error("拉卡拉支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.LAKALA_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.LAKALA_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/callback/LakalaRefundCallbackService.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/callback/LakalaRefundCallbackService.java index 5a863f27a..823884a19 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/callback/LakalaRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/callback/LakalaRefundCallbackService.java @@ -6,7 +6,6 @@ import cn.daxpay.open.channel.lakala.entity.isv.LakalaIsvKeyConfig; import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -52,7 +51,7 @@ public class LakalaRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("拉卡拉退款回调: 服务商密钥未配置"); - payCallbackRecordService.saveRefund(ChannelEnum.LAKALA_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } @@ -63,7 +62,7 @@ public class LakalaRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("拉卡拉退款回调验签失败"); - payCallbackRecordService.saveRefund(ChannelEnum.LAKALA_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } @@ -86,10 +85,10 @@ public class LakalaRefundCallbackService { } catch (Exception e) { log.error("拉卡拉退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.LAKALA_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.LAKALA_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return NOTIFY_SUCCESS; } } diff --git a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/callback/LeshuaPayCallbackService.java b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/callback/LeshuaPayCallbackService.java index bc015b20e..c0b27a2c9 100644 --- a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/callback/LeshuaPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/callback/LeshuaPayCallbackService.java @@ -11,7 +11,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -62,7 +61,7 @@ public class LeshuaPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("乐刷支付回调: 服务商密钥未配置"); - payCallbackRecordService.savePay(ChannelEnum.LESHUA_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } @@ -83,7 +82,7 @@ public class LeshuaPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("乐刷支付回调验签/解析失败"); - payCallbackRecordService.savePay(ChannelEnum.LESHUA_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return NOTIFY_FAIL; } LeshuaCallbackParseResp resp = result.getData(); @@ -111,10 +110,10 @@ public class LeshuaPayCallbackService { } catch (Exception e) { log.error("乐刷支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.LESHUA_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.LESHUA_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); // 5. 返回乐刷约定的成功回执 return NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/callback/LeshuaRefundCallbackService.java b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/callback/LeshuaRefundCallbackService.java index 3ca6c3456..464ffb22b 100644 --- a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/callback/LeshuaRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/callback/LeshuaRefundCallbackService.java @@ -11,7 +11,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.hutool.core.util.StrUtil; @@ -60,7 +59,7 @@ public class LeshuaRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("乐刷退款回调: 服务商密钥未配置"); - payCallbackRecordService.saveRefund(ChannelEnum.LESHUA_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } @@ -81,7 +80,7 @@ public class LeshuaRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("乐刷退款回调验签/解析失败"); - payCallbackRecordService.saveRefund(ChannelEnum.LESHUA_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return NOTIFY_FAIL; } LeshuaCallbackParseResp resp = result.getData(); @@ -105,10 +104,10 @@ public class LeshuaRefundCallbackService { } catch (Exception e) { log.error("乐刷退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.LESHUA_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.LESHUA_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return NOTIFY_SUCCESS; } } diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/callback/UmsPayCallbackService.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/callback/UmsPayCallbackService.java index dff18ed5e..8059d0b9b 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/callback/UmsPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/callback/UmsPayCallbackService.java @@ -11,7 +11,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -62,7 +61,7 @@ public class UmsPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("银联商务支付回调验签失败"); - payCallbackRecordService.savePay(ChannelEnum.UMS_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return UmsCode.NOTIFY_FAIL; } @@ -78,10 +77,10 @@ public class UmsPayCallbackService { } catch (Exception e) { log.error("银联商务支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.UMS_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return UmsCode.NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.UMS_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return UmsCode.NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/callback/UmsRefundCallbackService.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/callback/UmsRefundCallbackService.java index b349fa8b8..0c5e85c44 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/callback/UmsRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/callback/UmsRefundCallbackService.java @@ -10,7 +10,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -61,7 +60,7 @@ public class UmsRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("银联商务退款回调验签失败"); - payCallbackRecordService.saveRefund(ChannelEnum.UMS_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return UmsCode.NOTIFY_FAIL; } @@ -82,10 +81,10 @@ public class UmsRefundCallbackService { } catch (Exception e) { log.error("银联商务退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.UMS_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return UmsCode.NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.UMS_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return UmsCode.NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/callback/VbillPayCallbackService.java b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/callback/VbillPayCallbackService.java index 630af9977..10f6f7159 100644 --- a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/callback/VbillPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/callback/VbillPayCallbackService.java @@ -9,7 +9,6 @@ import cn.daxpay.open.channel.vbill.entity.isv.VbillIsvKeyConfig; import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -58,7 +57,7 @@ public class VbillPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("随行付支付回调: body 为空"); - payCallbackRecordService.savePay(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); resp.put("code", RESP_CODE_FAIL); resp.put("msg", "body 为空"); return resp; @@ -73,7 +72,7 @@ public class VbillPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("随行付支付回调: 服务商密钥未配置"); - payCallbackRecordService.savePay(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); resp.put("code", RESP_CODE_FAIL); resp.put("msg", "密钥未配置"); return resp; @@ -87,7 +86,7 @@ public class VbillPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("随行付支付回调验签失败"); - payCallbackRecordService.savePay(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); resp.put("code", RESP_CODE_FAIL); resp.put("msg", "验签失败"); return resp; @@ -110,13 +109,13 @@ public class VbillPayCallbackService { callbackData.setCallbackData(notify); try { payCallbackService.payCallback(callbackData); - payCallbackRecordService.savePay(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); resp.put("code", RESP_CODE_SUCCESS); resp.put("msg", "成功"); } catch (Exception e) { log.error("随行付支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); resp.put("code", RESP_CODE_FAIL); resp.put("msg", "业务处理失败"); } diff --git a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/callback/VbillRefundCallbackService.java b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/callback/VbillRefundCallbackService.java index 80a9fa062..a7da85252 100644 --- a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/callback/VbillRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/callback/VbillRefundCallbackService.java @@ -6,7 +6,6 @@ import cn.daxpay.open.channel.vbill.entity.isv.VbillIsvKeyConfig; import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; @@ -45,7 +44,7 @@ public class VbillRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("随行付退款回调: body 为空"); - payCallbackRecordService.saveRefund(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); resp.put("code", VbillPayCallbackService.RESP_CODE_FAIL); resp.put("msg", "body 为空"); return resp; @@ -58,7 +57,7 @@ public class VbillRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("随行付退款回调: 服务商密钥未配置"); - payCallbackRecordService.saveRefund(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); resp.put("code", VbillPayCallbackService.RESP_CODE_FAIL); resp.put("msg", "密钥未配置"); return resp; @@ -71,7 +70,7 @@ public class VbillRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("随行付退款回调验签失败"); - payCallbackRecordService.saveRefund(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); resp.put("code", VbillPayCallbackService.RESP_CODE_FAIL); resp.put("msg", "验签失败"); return resp; @@ -93,13 +92,13 @@ public class VbillRefundCallbackService { callbackData.setCallbackData(notify); try { refundCallbackService.refundCallback(callbackData); - payCallbackRecordService.saveRefund(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); resp.put("code", VbillPayCallbackService.RESP_CODE_SUCCESS); resp.put("msg", "成功"); } catch (Exception e) { log.error("随行付退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.VBILL_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); resp.put("code", VbillPayCallbackService.RESP_CODE_FAIL); resp.put("msg", "业务处理失败"); } diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/callback/WechatPayCallbackService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/callback/WechatPayCallbackService.java index a50a6513c..45c2a92df 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/callback/WechatPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/callback/WechatPayCallbackService.java @@ -11,7 +11,6 @@ import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -80,7 +79,7 @@ public class WechatPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("微信支付回调验签失败"); - payCallbackRecordService.savePay(ChannelEnum.WECHAT.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return WechatCode.NOTIFY_FAIL; } @@ -99,10 +98,10 @@ public class WechatPayCallbackService { } catch (Exception e) { log.error("微信支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.WECHAT.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return WechatCode.NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.WECHAT.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return WechatCode.NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/callback/WechatRefundCallbackService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/callback/WechatRefundCallbackService.java index ae31d6a3d..0efd41598 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/callback/WechatRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/callback/WechatRefundCallbackService.java @@ -11,7 +11,6 @@ import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.hutool.extra.servlet.JakartaServletUtil; import jakarta.servlet.http.HttpServletRequest; @@ -76,7 +75,7 @@ public class WechatRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("微信退款回调验签失败"); - payCallbackRecordService.saveRefund(ChannelEnum.WECHAT.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return WechatCode.NOTIFY_FAIL; } @@ -101,10 +100,10 @@ public class WechatRefundCallbackService { } catch (Exception e) { log.error("微信退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.WECHAT.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return WechatCode.NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.WECHAT.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return WechatCode.NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/callback/YeepayPayCallbackService.java b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/callback/YeepayPayCallbackService.java index 1a2cd2d31..3ab441093 100644 --- a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/callback/YeepayPayCallbackService.java +++ b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/callback/YeepayPayCallbackService.java @@ -10,7 +10,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.CallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.PayCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; @@ -61,7 +60,7 @@ public class YeepayPayCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("易宝支付回调验签失败"); - payCallbackRecordService.savePay(ChannelEnum.YEE_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.savePay(channelMchNo, failData); return YeepayCode.NOTIFY_FAIL; } @@ -77,10 +76,10 @@ public class YeepayPayCallbackService { } catch (Exception e) { log.error("易宝支付回调业务处理失败: tradeNo={}", callbackData.getTradeNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.savePay(ChannelEnum.YEE_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return YeepayCode.NOTIFY_FAIL; } - payCallbackRecordService.savePay(ChannelEnum.YEE_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.savePay(channelMchNo, callbackData); return YeepayCode.NOTIFY_SUCCESS; } diff --git a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/callback/YeepayRefundCallbackService.java b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/callback/YeepayRefundCallbackService.java index 85fc9c680..30e81f5cd 100644 --- a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/callback/YeepayRefundCallbackService.java +++ b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/callback/YeepayRefundCallbackService.java @@ -10,7 +10,6 @@ import cn.daxpay.open.payment.trade.runtime.bo.RefundCallbackData; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.trade.record.service.PayCallbackRecordService; import cn.daxpay.open.payment.trade.runtime.service.callback.RefundCallbackService; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; @@ -61,7 +60,7 @@ public class YeepayRefundCallbackService { failData.setCallbackData(notify); failData.setCallbackStatus(CallbackStatusEnum.FAIL); failData.setCallbackErrorMsg("易宝退款回调验签失败"); - payCallbackRecordService.saveRefund(ChannelEnum.YEE_PAY.getCode(), channelMchNo, failData); + payCallbackRecordService.saveRefund(channelMchNo, failData); return YeepayCode.NOTIFY_FAIL; } @@ -82,10 +81,10 @@ public class YeepayRefundCallbackService { } catch (Exception e) { log.error("易宝退款回调业务处理失败: refundNo={}", callbackData.getRefundNo(), e); callbackData.setCallbackStatus(CallbackStatusEnum.EXCEPTION).setCallbackErrorMsg(e.getMessage()); - payCallbackRecordService.saveRefund(ChannelEnum.YEE_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return YeepayCode.NOTIFY_FAIL; } - payCallbackRecordService.saveRefund(ChannelEnum.YEE_PAY.getCode(), channelMchNo, callbackData); + payCallbackRecordService.saveRefund(channelMchNo, callbackData); return YeepayCode.NOTIFY_SUCCESS; } } diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/entity/channel/ChannelMerchant.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/entity/channel/ChannelMerchant.java index 4c64c9642..22b8b2383 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/entity/channel/ChannelMerchant.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/entity/channel/ChannelMerchant.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import lombok.experimental.FieldNameConstants; import java.util.Objects; @@ -19,6 +20,7 @@ import java.util.Objects; @EqualsAndHashCode(callSuper = true) @Data @Accessors(chain = true) +@FieldNameConstants @TableName("mch_channel_merchant") public class ChannelMerchant extends MchBaseEntity implements ToResult { diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/trade/record/entity/PayCallbackRecord.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/trade/record/entity/PayCallbackRecord.java index 41b2df4c7..a13d8767d 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/trade/record/entity/PayCallbackRecord.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/trade/record/entity/PayCallbackRecord.java @@ -4,7 +4,7 @@ import cn.daxpay.open.payment.common.entity.MchBaseEntity; import cn.daxpay.open.payment.trade.record.convert.PayCallbackRecordConvert; import cn.daxpay.open.payment.trade.record.result.PayCallbackRecordResult; import cn.daxpay.open.platform.common.mybatisplus.function.ToResult; -import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; +import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.daxpay.open.platform.core.enums.pay.trade.TradeFlowTypeEnum; import cn.hutool.core.util.StrUtil; @@ -38,9 +38,9 @@ public class PayCallbackRecord extends MchBaseEntity implements ToResult