mirror of
https://gitee.com/dromara/dax-pay
synced 2026-08-10 23:01:58 +08:00
refactor: 移除代理商模块占位代码和相关引用
- 清理 9 个 Service 中空注释 '/// 检查代理商权限' - 清理 pom.xml 中代理商模块空占位注释 - 清理 Java 枚举/实体注释中的代理商字样 - 删除 pay_platform_cashouts_config 表定义 - 删除 agent_admin 内置角色 - 清理国际化中代理商相关条目
This commit is contained in:
bootx
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import lombok.experimental.FieldNameConstants;
|
||||
|
||||
/// # 商户基础实体类 应用/商户/代理商/服务商号可以更新
|
||||
/// # 商户基础实体类 应用/商户/服务商号可以更新
|
||||
///
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
|
||||
@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/// # 商户和代理商数据隔离插件
|
||||
/// # 商户数据隔离插件
|
||||
///
|
||||
@Configuration
|
||||
@RequiredArgsConstructor
|
||||
|
||||
@@ -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){
|
||||
// 判断是否匹配
|
||||
|
||||
@@ -53,6 +53,6 @@ public class MerchantCallbackQueryService {
|
||||
.orElseThrow(() -> new DataNotExistException("error.payment.order.subscribeRecordNotExist"));
|
||||
}
|
||||
|
||||
/// 检查代理商权限
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ public class PayOrderQueryService {
|
||||
return payOrderManager.getTotalAmount(param);
|
||||
}
|
||||
|
||||
/// 检查代理商权限
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -49,6 +49,6 @@ public class PayOrderService {
|
||||
payCloseService.closeOrder(payOrder,true);
|
||||
}
|
||||
|
||||
/// 检查代理商权限
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ public class RefundOrderQueryService {
|
||||
return refundOrderManager.getTotalAmount(param);
|
||||
}
|
||||
|
||||
/// 检查代理商权限
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ public class TransferOrderQueryService {
|
||||
return transferOrderManager.getTotalAmount(param);
|
||||
}
|
||||
|
||||
/// 检查代理商权限
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -87,6 +87,6 @@ public class TransferOrderService {
|
||||
transferAssistService.close(transferOrder,LocalDateTime.now());
|
||||
}
|
||||
|
||||
/// 检查代理商权限
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -57,6 +57,6 @@ public class TradeCallbackRecordService {
|
||||
callbackRecordManager.save(payNotifyRecord);
|
||||
}
|
||||
|
||||
/// 检查代理商权限
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ public class TradeFlowRecordService {
|
||||
tradeFlowRecordManager.save(tradeFlowRecord);
|
||||
}
|
||||
|
||||
/// 检查代理商权限
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ public class TradeSyncRecordService {
|
||||
orderManager.save(tradeSyncRecord);
|
||||
}
|
||||
|
||||
/// 检查代理商权限
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -64,9 +64,6 @@
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 代理商模块 -->
|
||||
|
||||
<!-- 代理功能 -->
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter</artifactId>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"merchant": "Merchant Created",
|
||||
"admin": "Agent Created",
|
||||
"admin": "Admin Created",
|
||||
"system": "API Created"
|
||||
}
|
||||
|
||||
@@ -92,9 +92,6 @@
|
||||
"password": {
|
||||
"notBlank": "Password cannot be blank"
|
||||
},
|
||||
"merchantType": {
|
||||
"notBlank": "Agent type cannot be blank"
|
||||
},
|
||||
"subjectType": {
|
||||
"notBlank": "Subject type cannot be blank"
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"merchant": "商户创建",
|
||||
"admin": "代理商创建",
|
||||
"admin": "运营创建",
|
||||
"system": "接口创建"
|
||||
}
|
||||
|
||||
@@ -92,9 +92,6 @@
|
||||
"password": {
|
||||
"notBlank": "密码不可为空"
|
||||
},
|
||||
"merchantType": {
|
||||
"notBlank": "代理商类型不可为空"
|
||||
},
|
||||
"subjectType": {
|
||||
"notBlank": "主体类型不可为空"
|
||||
},
|
||||
|
||||
@@ -12,7 +12,7 @@ public enum OnbApplySourceEnum implements I18nSupport {
|
||||
|
||||
/// 商户创建
|
||||
MERCHANT("merchant"),
|
||||
/// 代理商/运营创建
|
||||
/// 运营创建
|
||||
ADMIN("admin"),
|
||||
/// 接口创建
|
||||
GATEWAY("system");
|
||||
|
||||
@@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor;
|
||||
/// # 主体类型枚举
|
||||
///
|
||||
///
|
||||
/// 适用于商户、代理商、服务商等经营主体
|
||||
/// 适用于商户、服务商等经营主体
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
public enum SubjectTypeEnum implements I18nSupport {
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user