diff --git a/_config/sql/datas.sql b/_config/sql/datas.sql index 5a7e8efe7..8c58477af 100644 --- a/_config/sql/datas.sql +++ b/_config/sql/datas.sql @@ -1469,11 +1469,6 @@ INSERT INTO pay_channel_const VALUES (160000, 'lakala_pay', '拉卡拉', true, t INSERT INTO pay_platform_basic_config VALUES (1, 1811365615815487488, '2025-11-11 16:36:33.620947', 1811365615815487488, '2025-11-11 16:36:33.620947', 0, false, NULL, NULL, NULL, NULL, NULL); --- --- Data for Name: pay_platform_cashouts_config; Type: TABLE DATA; Schema: public; Owner: bootx --- - - -- -- Data for Name: pay_platform_integration_config; Type: TABLE DATA; Schema: public; Owner: bootx diff --git a/_config/sql/tables.sql b/_config/sql/tables.sql index 96b74e704..e6ab7b8cf 100644 --- a/_config/sql/tables.sql +++ b/_config/sql/tables.sql @@ -2428,42 +2428,7 @@ COMMENT ON COLUMN pay_platform_basic_config.order_timeout IS '订单超时时间 COMMENT ON COLUMN pay_platform_basic_config.default_isv_no IS '默认服务商'; COMMENT ON TABLE pay_platform_basic_config IS '管理平台基础配置'; --- ---------------------------- --- Table structure for pay_platform_cashouts_config --- ---------------------------- -DROP TABLE IF EXISTS pay_platform_cashouts_config; -CREATE TABLE pay_platform_cashouts_config ( - id int8 NOT NULL, - creator int8, - create_time timestamp(0), - last_modifier int8, - last_modified_time timestamp(0), - version int4 NOT NULL, - deleted bool NOT NULL, - start_amount numeric(16,4), - fee_formula varchar(32) COLLATE pg_catalog.default, - fixed_fee numeric(16,4), - fixed_rate numeric(16,4), - fixed_fee_combined numeric(16,4), - fixed_rate_combined numeric(16,4), - freeze_amount numeric(16,4) -) -; -COMMENT ON COLUMN pay_platform_cashouts_config.id IS '主键'; -COMMENT ON COLUMN pay_platform_cashouts_config.creator IS '创建者ID'; -COMMENT ON COLUMN pay_platform_cashouts_config.create_time IS '创建时间'; -COMMENT ON COLUMN pay_platform_cashouts_config.last_modifier IS '最后修改ID'; -COMMENT ON COLUMN pay_platform_cashouts_config.last_modified_time IS '最后修改时间'; -COMMENT ON COLUMN pay_platform_cashouts_config.version IS '版本号'; -COMMENT ON COLUMN pay_platform_cashouts_config.deleted IS '删除标志'; -COMMENT ON COLUMN pay_platform_cashouts_config.start_amount IS '起始提现额度'; -COMMENT ON COLUMN pay_platform_cashouts_config.fee_formula IS '手续费计算公式'; -COMMENT ON COLUMN pay_platform_cashouts_config.fixed_fee IS '单笔固定'; -COMMENT ON COLUMN pay_platform_cashouts_config.fixed_rate IS '单笔费率'; -COMMENT ON COLUMN pay_platform_cashouts_config.fixed_fee_combined IS '组合 固定手续费'; -COMMENT ON COLUMN pay_platform_cashouts_config.fixed_rate_combined IS '组合 费率'; -COMMENT ON COLUMN pay_platform_cashouts_config.freeze_amount IS '冻结金额'; -COMMENT ON TABLE pay_platform_cashouts_config IS '平台代理商默认提现配置'; + -- ---------------------------- -- Table structure for pay_platform_integration_config @@ -4029,10 +3994,6 @@ ALTER TABLE pay_order_expand ADD CONSTRAINT pay_order_expand_pkey PRIMARY KEY (i -- ---------------------------- ALTER TABLE pay_platform_basic_config ADD CONSTRAINT pay_platform_basic_config_pkey PRIMARY KEY (id); --- ---------------------------- --- Primary Key structure for table pay_platform_cashouts_config --- ---------------------------- -ALTER TABLE pay_platform_cashouts_config ADD CONSTRAINT pay_platform_cashouts_config_pkey PRIMARY KEY (id); -- ---------------------------- -- Primary Key structure for table pay_platform_integration_config diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/context/PaymentContext.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/context/PaymentContext.java index 92fdc336b..c94202fd5 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/context/PaymentContext.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/context/PaymentContext.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; /// # 统一支付上下文 /// -/// 合并原 PaymentContextLocal/MchContextLocal/AgentContextLocal 三个ThreadLocal的信息 +/// 合并原 PaymentContextLocal/MchContextLocal 两个ThreadLocal的信息 /// 使用自定义作用域 "payment", 底层基于ThreadLocal, 兼容HTTP/定时任务/MQ场景 @Component @Scope(value = PaymentScope.SCOPE_NAME, proxyMode = ScopedProxyMode.TARGET_CLASS) diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/entity/merchant/MchAppEditEntity.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/entity/merchant/MchAppEditEntity.java index 9f44a1fd2..1e57ac32d 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/entity/merchant/MchAppEditEntity.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/entity/merchant/MchAppEditEntity.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import lombok.experimental.FieldNameConstants; -/// # 商户基础实体类 应用/商户/代理商/服务商号可以更新 +/// # 商户基础实体类 应用/商户/服务商号可以更新 /// @EqualsAndHashCode(callSuper = true) @Data diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/handler/MchTenantInterceptorConfiguration.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/handler/MchTenantInterceptorConfiguration.java index 9232a9202..8960785ea 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/handler/MchTenantInterceptorConfiguration.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/common/handler/MchTenantInterceptorConfiguration.java @@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -/// # 商户和代理商数据隔离插件 +/// # 商户数据隔离插件 /// @Configuration @RequiredArgsConstructor diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/assist/PaymentAssistService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/assist/PaymentAssistService.java index 4c6723876..7cb4b7a33 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/assist/PaymentAssistService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/assist/PaymentAssistService.java @@ -119,7 +119,7 @@ public class PaymentAssistService { /// 1.商户信息 /// 2.应用信息 /// 3.服务商信息 - /// 4.代理商信息 + private void initData(org.dromara.daxpay.payment.common.service.dto.MerchantAccessInfo merchant, org.dromara.daxpay.payment.common.service.dto.MchAppInfoAccessInfo mchApp){ // 判断是否匹配 diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/notice/callback/MerchantCallbackQueryService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/notice/callback/MerchantCallbackQueryService.java index 8e224977b..4ca6aad1c 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/notice/callback/MerchantCallbackQueryService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/notice/callback/MerchantCallbackQueryService.java @@ -53,6 +53,6 @@ public class MerchantCallbackQueryService { .orElseThrow(() -> new DataNotExistException("error.payment.order.subscribeRecordNotExist")); } - /// 检查代理商权限 + } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/pay/PayOrderQueryService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/pay/PayOrderQueryService.java index c9c5ae5c3..774e300f8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/pay/PayOrderQueryService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/pay/PayOrderQueryService.java @@ -122,7 +122,7 @@ public class PayOrderQueryService { return payOrderManager.getTotalAmount(param); } - /// 检查代理商权限 + } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/pay/PayOrderService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/pay/PayOrderService.java index d954656ed..a9aa0ba08 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/pay/PayOrderService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/pay/PayOrderService.java @@ -49,6 +49,6 @@ public class PayOrderService { payCloseService.closeOrder(payOrder,true); } - /// 检查代理商权限 + } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/refund/RefundOrderQueryService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/refund/RefundOrderQueryService.java index 9f3d1bcc1..821ed3e36 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/refund/RefundOrderQueryService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/refund/RefundOrderQueryService.java @@ -86,7 +86,7 @@ public class RefundOrderQueryService { return refundOrderManager.getTotalAmount(param); } - /// 检查代理商权限 + } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/transfer/TransferOrderQueryService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/transfer/TransferOrderQueryService.java index f7fa90aae..b12ff86b9 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/transfer/TransferOrderQueryService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/transfer/TransferOrderQueryService.java @@ -86,7 +86,7 @@ public class TransferOrderQueryService { return transferOrderManager.getTotalAmount(param); } - /// 检查代理商权限 + } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/transfer/TransferOrderService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/transfer/TransferOrderService.java index 9b3e0efc4..35539c88f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/transfer/TransferOrderService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/order/transfer/TransferOrderService.java @@ -87,6 +87,6 @@ public class TransferOrderService { transferAssistService.close(transferOrder,LocalDateTime.now()); } - /// 检查代理商权限 + } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/callback/TradeCallbackRecordService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/callback/TradeCallbackRecordService.java index 689a29fc0..bb6462755 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/callback/TradeCallbackRecordService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/callback/TradeCallbackRecordService.java @@ -57,6 +57,6 @@ public class TradeCallbackRecordService { callbackRecordManager.save(payNotifyRecord); } - /// 检查代理商权限 + } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/flow/TradeFlowRecordService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/flow/TradeFlowRecordService.java index ff0e44434..20607e2cf 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/flow/TradeFlowRecordService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/flow/TradeFlowRecordService.java @@ -78,7 +78,7 @@ public class TradeFlowRecordService { tradeFlowRecordManager.save(tradeFlowRecord); } - /// 检查代理商权限 + } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/sync/TradeSyncRecordService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/sync/TradeSyncRecordService.java index d6d86295f..1a8f14ab8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/sync/TradeSyncRecordService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/record/sync/TradeSyncRecordService.java @@ -44,7 +44,7 @@ public class TradeSyncRecordService { orderManager.save(tradeSyncRecord); } - /// 检查代理商权限 + } diff --git a/daxpay-payment/daxpay-payment-merchant/pom.xml b/daxpay-payment/daxpay-payment-merchant/pom.xml index a25fac82a..073e6e28c 100644 --- a/daxpay-payment/daxpay-payment-merchant/pom.xml +++ b/daxpay-payment/daxpay-payment-merchant/pom.xml @@ -64,9 +64,6 @@ ${project.version} - - - org.junit.jupiter junit-jupiter diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/enum/onb_apply_source.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/enum/onb_apply_source.json index 5061555cd..b433fd4f4 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/enum/onb_apply_source.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/enum/onb_apply_source.json @@ -1,5 +1,5 @@ { "merchant": "Merchant Created", - "admin": "Agent Created", + "admin": "Admin Created", "system": "API Created" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/validation.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/validation.json index 2a24b2339..722eb9afb 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/validation.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/validation.json @@ -92,9 +92,6 @@ "password": { "notBlank": "Password cannot be blank" }, - "merchantType": { - "notBlank": "Agent type cannot be blank" - }, "subjectType": { "notBlank": "Subject type cannot be blank" }, diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/enum/onb_apply_source.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/enum/onb_apply_source.json index 4357b0a83..7b8e29455 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/enum/onb_apply_source.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/enum/onb_apply_source.json @@ -1,5 +1,5 @@ { "merchant": "商户创建", - "admin": "代理商创建", + "admin": "运营创建", "system": "接口创建" } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/validation.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/validation.json index e54950527..6e1d89356 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/validation.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/validation.json @@ -92,9 +92,6 @@ "password": { "notBlank": "密码不可为空" }, - "merchantType": { - "notBlank": "代理商类型不可为空" - }, "subjectType": { "notBlank": "主体类型不可为空" }, diff --git a/daxpay-platform/daxpay-platform-core/src/main/java/org/dromara/daxpay/platform/core/enums/channel/OnbApplySourceEnum.java b/daxpay-platform/daxpay-platform-core/src/main/java/org/dromara/daxpay/platform/core/enums/channel/OnbApplySourceEnum.java index 87a78eea1..3a1febf6e 100644 --- a/daxpay-platform/daxpay-platform-core/src/main/java/org/dromara/daxpay/platform/core/enums/channel/OnbApplySourceEnum.java +++ b/daxpay-platform/daxpay-platform-core/src/main/java/org/dromara/daxpay/platform/core/enums/channel/OnbApplySourceEnum.java @@ -12,7 +12,7 @@ public enum OnbApplySourceEnum implements I18nSupport { /// 商户创建 MERCHANT("merchant"), - /// 代理商/运营创建 + /// 运营创建 ADMIN("admin"), /// 接口创建 GATEWAY("system"); diff --git a/daxpay-platform/daxpay-platform-core/src/main/java/org/dromara/daxpay/platform/core/enums/subject/SubjectTypeEnum.java b/daxpay-platform/daxpay-platform-core/src/main/java/org/dromara/daxpay/platform/core/enums/subject/SubjectTypeEnum.java index 32c888091..d1e677900 100644 --- a/daxpay-platform/daxpay-platform-core/src/main/java/org/dromara/daxpay/platform/core/enums/subject/SubjectTypeEnum.java +++ b/daxpay-platform/daxpay-platform-core/src/main/java/org/dromara/daxpay/platform/core/enums/subject/SubjectTypeEnum.java @@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor; /// # 主体类型枚举 /// /// -/// 适用于商户、代理商、服务商等经营主体 +/// 适用于商户、服务商等经营主体 @Getter @RequiredArgsConstructor public enum SubjectTypeEnum implements I18nSupport { diff --git a/daxpay-platform/daxpay-platform-service/service-iam/src/main/resources/db/migration/V2026.04.09.03__insert_builtin_roles.sql b/daxpay-platform/daxpay-platform-service/service-iam/src/main/resources/db/migration/V2026.04.09.03__insert_builtin_roles.sql index 1c5f829f1..7b053b580 100644 --- a/daxpay-platform/daxpay-platform-service/service-iam/src/main/resources/db/migration/V2026.04.09.03__insert_builtin_roles.sql +++ b/daxpay-platform/daxpay-platform-service/service-iam/src/main/resources/db/migration/V2026.04.09.03__insert_builtin_roles.sql @@ -1,6 +1,5 @@ -- 插入系统内置角色 INSERT INTO iam_role (id, code, name_cn, name_en, client_code, internal, remark, creator, create_time, last_modifier, last_modified_time, version, deleted) VALUES - (1928374650192837465, 'agent_admin', '代理商管理员', 'Agent Admin', 'agent', true, '系统内置代理商管理员角色', 1, NOW(), 1, NOW(), 0, false), (1928374650192837466, 'merchant_admin', '商户管理员', 'Merchant Admin', 'merchant', true, '系统内置商户管理员角色', 1, NOW(), 1, NOW(), 0, false), (1928374650192837467, 'isv_admin', '服务商管理员', 'ISV Admin', 'isv', true, '系统内置服务商管理员角色', 1, NOW(), 1, NOW(), 0, false);