会员与支付sql

# Conflicts:
#	tashow-feign/pom.xml
#	tashow-module/pom.xml
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/controller.vm
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/listReqVO.vm
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/pageReqVO.vm
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/respVO.vm
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/saveReqVO.vm
#	tashow-module/tashow-module-system/src/main/resources/application-local.yaml

.gitignore

@@ -31,8 +31,6 @@ target/*
 /.nb-gradle/
 /build/
 .idea
-.cursor
-.lingma
 
 
 

pom.xml

@@ -47,22 +47,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <profiles>
-        <profile>
-            <id>prod</id>
-            <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                        <excludes>
-                            <exclude>*.yaml</exclude>
-                        </excludes>
-                    </resource>
-                </resources>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
         <pluginManagement>
             <plugins>

sql/db2/README.md

@@ -0,0 +1,3 @@
+暂未适配 IBM DB2 数据库，如果你有需要，可以微信联系 wangwenbin-server 一起建设。
+
+你需要把表结构与数据导入到 DM 数据库，我a来测试与适配代码。

sql/mysql/ai-manage.sql

@@ -1,113 +0,0 @@
-DROP TABLE IF EXISTS `tz_ai_sample`;
-CREATE TABLE `tz_ai_sample`
-(
-    `id`               bigint       NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `sample_file_id`   bigint       NOT NULL COMMENT '样本文件id',
-    `sample_name`      varchar(64)  NULL     DEFAULT '' COMMENT '样本名称',
-    `sample_time`      varchar(16)  NULL     DEFAULT '' COMMENT '样本时长',
-    `sample_mine_type` varchar(16)  NULL     DEFAULT '' COMMENT '样本格式',
-    `sample_size`      varchar(16)  NULL     DEFAULT '' COMMENT '样本大小',
-    `remark`           varchar(255) NULL     DEFAULT '' COMMENT '样本注释',
-    `creator`          varchar(64)  NULL     DEFAULT '' COMMENT '创建者',
-    `create_time`      datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`          varchar(64)  NULL     DEFAULT '' COMMENT '更新者',
-    `update_time`      datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`          bit(1)       NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`        bigint       NOT NULL DEFAULT 0 COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE,
-    INDEX `idx_create_time` (`create_time` ASC) USING BTREE
-) ENGINE = InnoDB COMMENT = '样本库';
-
-
-DROP TABLE IF EXISTS `tz_ai_sample_tag_relate`;
-CREATE TABLE `tz_ai_sample_tag_relate`
-(
-    `id`            bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `sample_id`     bigint NOT NULL COMMENT '样本id',
-    `sample_tag_id` bigint NOT NULL COMMENT '样本标签id',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB COMMENT = '样本-标签关联表';
-
-
-
-DROP TABLE IF EXISTS `tz_ai_sample_tag`;
-CREATE TABLE `tz_ai_sample_tag`
-(
-    `id`          bigint      NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `tag_name`    varchar(64) NULL     DEFAULT '' COMMENT '标签名称',
-    `creator`     varchar(64) NULL     DEFAULT '' COMMENT '创建者',
-    `create_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`     varchar(64) NULL     DEFAULT '' COMMENT '更新者',
-    `update_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`     bit(1)      NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`   bigint      NOT NULL DEFAULT 0 COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE,
-    INDEX `idx_create_time` (`create_time` ASC) USING BTREE
-) ENGINE = InnoDB COMMENT = '样本标签库';
-
-DROP TABLE IF EXISTS `tz_ai_sample_tag_group`;
-CREATE TABLE `tz_ai_sample_tag_group`
-(
-    `id`          bigint      NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `group_name`  varchar(64) NULL     DEFAULT '' COMMENT '分组名称',
-    `creator`     varchar(64) NULL     DEFAULT '' COMMENT '创建者',
-    `create_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`     varchar(64) NULL     DEFAULT '' COMMENT '更新者',
-    `update_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`     bit(1)      NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`   bigint      NOT NULL DEFAULT 0 COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE,
-    INDEX `idx_create_time` (`create_time` ASC) USING BTREE
-) ENGINE = InnoDB COMMENT = '样本标签分组库';
-
-
-
-DROP TABLE IF EXISTS `tz_ai_sample_tag_group_relate`;
-CREATE TABLE `tz_ai_sample_tag_group_relate`
-(
-    `id`                  bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `sample_tag_id`       bigint NOT NULL COMMENT '样本标签id',
-    `sample_tag_group_id` bigint NOT NULL COMMENT '样本标签分组id',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB COMMENT = '样本标签-分组关联表';
-
-
-DROP TABLE IF EXISTS `tz_ai_dialog`;
-CREATE TABLE `tz_ai_dialog`
-(
-    `id`            bigint   NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `title`         varchar(128)      DEFAULT '' COMMENT '对话标题',
-    `user_id`       bigint   NOT NULL COMMENT '用户id',
-    `dialog_status` int               DEFAULT NULL COMMENT '对话状态（1active, 2archived, 3deleted）',
-    `creator`       varchar(64)       DEFAULT '' COMMENT '创建者',
-    `create_time`   datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`       varchar(64)       DEFAULT '' COMMENT '更新者',
-    `update_time`   datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`       bit(1)   NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`     bigint   NOT NULL DEFAULT '0' COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB COMMENT ='ai-对话表';
-
-DROP TABLE IF EXISTS `tz_ai_dialog_message`;
-CREATE TABLE `tz_ai_dialog_message`
-(
-    `id`               bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `dialog_id`        bigint NOT NULL COMMENT '对话id',
-    `content_text`     text COMMENT '内容',
-    `content_type`     int          DEFAULT NULL COMMENT '文本类型（1text，2file）',
-    `message_order`    int          DEFAULT NULL COMMENT '对话中的顺序',
-    `message_status`   int          DEFAULT NULL COMMENT '消息状态 1正常 0删除',
-    `pet_id`           bigint       DEFAULT NULL COMMENT '宠物id',
-    `pet_name`         varchar(255) DEFAULT NULL COMMENT '宠物名称',
-    `pet_avatar`       varchar(255) DEFAULT NULL COMMENT '宠物头像',
-    `pet_type`         varchar(64)  DEFAULT NULL COMMENT '宠物类型',
-    `create_time`      datetime     DEFAULT NULL COMMENT '创建时间',
-    `trans_result`     text COMMENT '回答结果',
-    `content_duration` bigint       DEFAULT NULL COMMENT '文件时长',
-    `trans_status`     int          DEFAULT NULL COMMENT '翻译状态（1成功 0失败）',
-    `source_result`    text COMMENT '原始结果',
-    `file_name`        varchar(255) DEFAULT NULL COMMENT '文件名称',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB COMMENT ='ai-对话消息表';
-
-

sql/mysql/member.sql

@@ -0,0 +1,51 @@
+-- 会员用户表 (tz_member_user)
+CREATE TABLE `tz_member_user` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+  `mobile` varchar(11) NOT NULL COMMENT '手机',
+  `password` varchar(128) NOT NULL COMMENT '加密后的密码',
+  `status` tinyint(4) NOT NULL COMMENT '帐号状态 (枚举 CommonStatusEnum)',
+  `register_ip` varchar(32) DEFAULT NULL COMMENT '注册 IP',
+  `register_terminal` tinyint(4) DEFAULT NULL COMMENT '注册终端 (枚举 TerminalEnum)',
+  `login_ip` varchar(32) DEFAULT NULL COMMENT '最后登录IP',
+  `login_date` datetime DEFAULT NULL COMMENT '最后登录时间',
+  `nickname` varchar(64) DEFAULT NULL COMMENT '用户昵称',
+  `avatar` varchar(512) DEFAULT NULL COMMENT '用户头像',
+  `name` varchar(64) DEFAULT NULL COMMENT '真实名字',
+  `sex` tinyint(4) DEFAULT NULL COMMENT '性别 (枚举 SexEnum)',
+  `birthday` datetime DEFAULT NULL COMMENT '出生日期',
+  `area_id` int(11) DEFAULT NULL COMMENT '所在地 (关联 Area.id 字段)',
+  `mark` varchar(512) DEFAULT NULL COMMENT '用户备注',
+  `point` int(11) DEFAULT NULL COMMENT '积分',
+  `tag_ids` varchar(512) DEFAULT NULL COMMENT '会员标签列表，以逗号分隔',
+  `level_id` bigint(20) DEFAULT NULL COMMENT '会员级别编号 (关联 MemberLevelDO.id 字段)',
+  `experience` int(11) DEFAULT NULL COMMENT '会员经验',
+  `group_id` bigint(20) DEFAULT NULL COMMENT '用户分组编号 (关联 MemberGroupDO.id 字段)',
+  `tenant_id` bigint(20) NOT NULL COMMENT '租户ID',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_mobile` (`mobile`),
+  KEY `idx_level_id` (`level_id`),
+  KEY `idx_group_id` (`group_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='会员用户表';
+
+-- 用户收件地址表 (tz_member_address)
+CREATE TABLE `tz_member_address` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `user_id` bigint(20) NOT NULL COMMENT '用户编号',
+  `name` varchar(64) NOT NULL COMMENT '收件人名称',
+  `mobile` varchar(11) NOT NULL COMMENT '手机号',
+  `area_id` bigint(20) NOT NULL COMMENT '地区编号',
+  `detail_address` varchar(512) NOT NULL COMMENT '收件详细地址',
+  `default_status` tinyint(1) DEFAULT NULL COMMENT '是否默认 (true - 默认收件地址)',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户收件地址表';

sql/mysql/order.sql

@@ -0,0 +1,266 @@
+-- 基础实体表结构 (BaseDO) 不单独建表，字段会被继承到其他表中
+
+-- 交易订单表 (trade_order)
+CREATE TABLE `tz_trade_order`
+(
+    `id`                      bigint(20) NOT NULL AUTO_INCREMENT COMMENT '订单编号，主键自增',
+    `order_num`               varchar(64)  NOT NULL COMMENT '订单流水号',
+    `order_type`              tinyint(4) NOT NULL COMMENT '订单类型 (枚举 TradeOrderTypeEnum)',
+    `order_terminal`          tinyint(4) NOT NULL COMMENT '订单来源 (枚举 TerminalEnum)',
+    `order_status`            tinyint(4) NOT NULL COMMENT '订单状态 (枚举 TradeOrderStatusEnum)',
+    `user_id`                 bigint(20) NOT NULL COMMENT '用户编号',
+    `user_ip`                 varchar(64)  DEFAULT NULL COMMENT '用户IP',
+    `user_remark`             varchar(512) DEFAULT NULL COMMENT '用户备注',
+    `finish_time`             datetime     DEFAULT NULL COMMENT '订单完成时间',
+    `cancel_time`             datetime     DEFAULT NULL COMMENT '订单取消时间',
+    `cancel_type`             tinyint(4) DEFAULT NULL COMMENT '取消类型 (枚举 TradeOrderCancelTypeEnum)',
+    `merchant_remark`         varchar(512) DEFAULT NULL COMMENT '商家备注',
+    `comment_status`          tinyint(1) DEFAULT NULL COMMENT '是否评价 (true-已评价, false-未评价)',
+    `total_price`             int(11) NOT NULL COMMENT '商品原价，单位：分',
+    `discount_price`          int(11) NOT NULL COMMENT '优惠金额，单位：分',
+    `delivery_price`          int(11) NOT NULL COMMENT '运费金额，单位：分',
+    `adjust_price`            int(11) NOT NULL COMMENT '订单调价，单位：分',
+    `pay_price`               int(11) NOT NULL COMMENT '应付金额（总），单位：分',
+    `pay_order_id`            bigint(20) DEFAULT NULL COMMENT '支付订单编号',
+    `pay_status`              tinyint(1) NOT NULL COMMENT '是否已支付 (true-已支付, false-未支付)',
+    `pay_time`                datetime     DEFAULT NULL COMMENT '付款时间',
+    `pay_channel_code`        varchar(64)  DEFAULT NULL COMMENT '支付渠道',
+    `delivery_type`           tinyint(4) NOT NULL COMMENT '配送方式 (枚举 DeliveryTypeEnum)',
+    `logistics_id`            bigint(20) NOT NULL DEFAULT 0 COMMENT '发货物流公司编号',
+    `logistics_no`            varchar(64)  DEFAULT '' COMMENT '发货物流单号',
+    `delivery_time`           datetime     DEFAULT NULL COMMENT '发货时间',
+    `receive_time`            datetime     DEFAULT NULL COMMENT '收货时间',
+    `receiver_name`           varchar(64)  NOT NULL COMMENT '收件人名称',
+    `receiver_mobile`         varchar(20)  NOT NULL COMMENT '收件人手机',
+    `receiver_area_id`        int(11) NOT NULL COMMENT '收件人地区编号',
+    `receiver_detail_address` varchar(512) NOT NULL COMMENT '收件人详细地址',
+    `pick_up_store_id`        bigint(20) DEFAULT NULL COMMENT '自提门店编号',
+    `pick_up_verify_code`     varchar(64)  DEFAULT NULL COMMENT '自提核销码',
+    `refund_status`           tinyint(4) NOT NULL COMMENT '退款状态 (枚举 TradeOrderRefundStatusEnum)',
+    `refund_price`            int(11) NOT NULL COMMENT '退款金额，单位：分',
+    `after_sale_id`           bigint(20) DEFAULT NULL COMMENT '售后单编号',
+    `after_sale_status`       tinyint(4) NOT NULL COMMENT '售后状态 (枚举 TradeOrderItemAfterSaleStatusEnum)',
+    `create_time`             datetime     NOT NULL COMMENT '创建时间',
+    `update_time`             datetime     NOT NULL COMMENT '最后更新时间',
+    `creator`                 varchar(64)  NOT NULL COMMENT '创建者',
+    `updater`                 varchar(64)  NOT NULL COMMENT '更新者',
+    `deleted`                 tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_order_num` (`order_num`),
+    KEY                       `idx_user_id` (`user_id`),
+    KEY                       `idx_status` (`order_status`),
+    KEY                       `idx_pay_status` (`pay_status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='交易订单表';
+
+-- 交易订单项表 (trade_order_item)
+CREATE TABLE `tz_trade_order_item`
+(
+    `id`             bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+    `user_id`        bigint(20) NOT NULL COMMENT '用户编号',
+    `order_id`       bigint(20) NOT NULL COMMENT '订单编号',
+    `cart_id`        bigint(20) DEFAULT NULL COMMENT '购物车项编号',
+    `prod_id`        bigint(20) NOT NULL COMMENT '商品 SPU 编号',
+    `prod_name`      varchar(256) NOT NULL COMMENT '商品 SPU 名称',
+    `sku_id`         bigint(20) NOT NULL COMMENT '商品 SKU 编号',
+    `properties`     json DEFAULT NULL COMMENT '属性数组',
+    `pic_url`        varchar(512) NOT NULL COMMENT '商品图片',
+    `count`          int(11) NOT NULL COMMENT '购买数量',
+    `price`          int(11) NOT NULL COMMENT '商品原价（单），单位：分',
+    `discount_price` int(11) NOT NULL COMMENT '优惠金额（总），单位：分',
+    `delivery_price` int(11) NOT NULL COMMENT '运费金额（总），单位：分',
+    `adjust_price`   int(11) NOT NULL COMMENT '订单调价（总），单位：分',
+    `pay_price`      int(11) NOT NULL COMMENT '应付金额（总），单位：分',
+    `serve_ext_info` json DEFAULT NULL COMMENT '扩展服务信息，存储额外的服务相关数据',
+    `price_ext_info` json DEFAULT NULL COMMENT '附加费信息',
+    `create_time`    datetime     NOT NULL COMMENT '创建时间',
+    `update_time`    datetime     NOT NULL COMMENT '最后更新时间',
+    `creator`        varchar(64)  NOT NULL COMMENT '创建者',
+    `updater`        varchar(64)  NOT NULL COMMENT '更新者',
+    `deleted`        tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    PRIMARY KEY (`id`),
+    KEY              `idx_order_id` (`order_id`),
+    KEY              `idx_sku_id` (`sku_id`),
+    KEY              `idx_user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='交易订单项表';
+
+-- 订单日志表 (trade_order_log)
+CREATE TABLE `tz_trade_order_log`
+(
+    `id`            bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+    `user_id`       bigint(20) NOT NULL COMMENT '用户编号',
+    `user_type`     tinyint(4) NOT NULL COMMENT '用户类型 (枚举 UserTypeEnum)',
+    `order_id`      bigint(20) NOT NULL COMMENT '订单号',
+    `before_status` int(11) DEFAULT NULL COMMENT '操作前状态',
+    `after_status`  int(11) DEFAULT NULL COMMENT '操作后状态',
+    `operate_type`  tinyint(4) NOT NULL COMMENT '操作类型 (枚举 TradeOrderOperateTypeEnum)',
+    `content`       varchar(1024) NOT NULL COMMENT '订单日志信息',
+    `create_time`   datetime      NOT NULL COMMENT '创建时间',
+    `update_time`   datetime      NOT NULL COMMENT '最后更新时间',
+    `creator`       varchar(64)   NOT NULL COMMENT '创建者',
+    `updater`       varchar(64)   NOT NULL COMMENT '更新者',
+    `deleted`       tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    PRIMARY KEY (`id`),
+    KEY             `idx_order_id` (`order_id`),
+    KEY             `idx_user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='订单日志表';
+
+-- 售后订单表 (tz_trade_after_sale)
+CREATE TABLE `tz_trade_after_sale` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '售后编号，主键自增',
+  `no` varchar(64) NOT NULL COMMENT '售后单号',
+  `status` tinyint(4) NOT NULL COMMENT '退款状态 (枚举 AfterSaleStatusEnum)',
+  `way` tinyint(4) NOT NULL COMMENT '售后方式 (枚举 AfterSaleWayEnum)',
+  `type` tinyint(4) NOT NULL COMMENT '售后类型 (枚举 AfterSaleTypeEnum)',
+  `user_id` bigint(20) NOT NULL COMMENT '用户编号',
+  `apply_reason` varchar(256) NOT NULL COMMENT '申请原因',
+  `apply_description` varchar(512) DEFAULT NULL COMMENT '补充描述',
+  `apply_pic_urls` json DEFAULT NULL COMMENT '补充凭证图片',
+  `order_id` bigint(20) NOT NULL COMMENT '交易订单编号',
+  `order_no` varchar(64) NOT NULL COMMENT '订单流水号',
+  `order_item_id` bigint(20) NOT NULL COMMENT '交易订单项编号',
+  `prod_id` bigint(20) NOT NULL COMMENT '商品 SPU 编号',
+  `prod_name` varchar(256) NOT NULL COMMENT '商品 SPU 名称',
+  `sku_id` bigint(20) NOT NULL COMMENT '商品 SKU 编号',
+  `properties` json DEFAULT NULL COMMENT '属性数组',
+  `pic_url` varchar(512) DEFAULT NULL COMMENT '商品图片',
+  `count` int(11) NOT NULL COMMENT '退货商品数量',
+  `audit_time` datetime DEFAULT NULL COMMENT '审批时间',
+  `audit_user_id` bigint(20) DEFAULT NULL COMMENT '审批人',
+  `audit_reason` varchar(512) DEFAULT NULL COMMENT '审批备注',
+  `refund_price` int(11) NOT NULL COMMENT '退款金额，单位：分',
+  `pay_refund_id` bigint(20) DEFAULT NULL COMMENT '支付退款编号',
+  `refund_time` datetime DEFAULT NULL COMMENT '退款时间',
+  `logistics_id` bigint(20) DEFAULT NULL COMMENT '退货物流公司编号',
+  `logistics_no` varchar(64) DEFAULT NULL COMMENT '退货物流单号',
+  `delivery_time` datetime DEFAULT NULL COMMENT '退货时间',
+  `receive_time` datetime DEFAULT NULL COMMENT '收货时间',
+  `receive_reason` varchar(512) DEFAULT NULL COMMENT '收货备注',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_no` (`no`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_order_item_id` (`order_item_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='售后订单表';
+
+-- 交易售后日志表 (tz_trade_after_sale_log)
+CREATE TABLE `tz_trade_after_sale_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `user_id` bigint(20) NOT NULL COMMENT '用户编号',
+  `user_type` tinyint(4) NOT NULL COMMENT '用户类型 (枚举 UserTypeEnum)',
+  `after_sale_id` bigint(20) NOT NULL COMMENT '售后编号',
+  `before_status` tinyint(4) DEFAULT NULL COMMENT '操作前状态',
+  `after_status` tinyint(4) DEFAULT NULL COMMENT '操作后状态',
+  `operate_type` tinyint(4) NOT NULL COMMENT '操作类型 (枚举 AfterSaleOperateTypeEnum)',
+  `content` varchar(512) NOT NULL COMMENT '操作明细',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  KEY `idx_after_sale_id` (`after_sale_id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_operate_type` (`operate_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='交易售后日志表';
+
+
+-- 快递公司表 (trade_delivery_express)
+CREATE TABLE `tz_trade_delivery_express` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
+  `code` varchar(64) NOT NULL COMMENT '快递公司 code',
+  `name` varchar(128) NOT NULL COMMENT '快递公司名称',
+  `logo` varchar(512) DEFAULT NULL COMMENT '快递公司 logo',
+  `sort` int(11) DEFAULT NULL COMMENT '排序',
+  `status` tinyint(4) NOT NULL COMMENT '状态 (枚举 CommonStatusEnum)',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_code` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='快递公司表';
+
+-- 快递运费模板表 (trade_delivery_express_template)
+CREATE TABLE `tz_trade_delivery_express_template` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
+  `name` varchar(128) NOT NULL COMMENT '模板名称',
+  `charge_mode` tinyint(4) NOT NULL COMMENT '配送计费方式 (枚举 DeliveryExpressChargeModeEnum)',
+  `sort` int(11) DEFAULT NULL COMMENT '排序',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='快递运费模板表';
+
+-- 快递运费模板计费配置表 (trade_delivery_express_template_charge)
+CREATE TABLE `tz_trade_delivery_express_template_charge` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
+  `template_id` bigint(20) NOT NULL COMMENT '配送模板编号',
+  `area_ids` varchar(512) NOT NULL COMMENT '配送区域编号列表',
+  `charge_mode` tinyint(4) NOT NULL COMMENT '配送计费方式',
+  `start_count` double NOT NULL COMMENT '首件数量(件数,重量，或体积)',
+  `start_price` int(11) NOT NULL COMMENT '起步价，单位：分',
+  `extra_count` double NOT NULL COMMENT '续件数量(件, 重量，或体积)',
+  `extra_price` int(11) NOT NULL COMMENT '额外价，单位：分',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  KEY `idx_template_id` (`template_id`),
+  CONSTRAINT `fk_express_template_charge_template_id` FOREIGN KEY (`template_id`) REFERENCES `tz_trade_delivery_express_template` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='快递运费模板计费配置表';
+
+-- 快递运费模板包邮配置表 (trade_delivery_express_template_free)
+CREATE TABLE `tz_trade_delivery_express_template_free` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `template_id` bigint(20) NOT NULL COMMENT '配送模板编号',
+  `area_ids` varchar(512) NOT NULL COMMENT '配送区域编号列表',
+  `free_price` int(11) DEFAULT NULL COMMENT '包邮金额，单位：分',
+  `free_count` int(11) DEFAULT NULL COMMENT '包邮件数',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  KEY `idx_template_id` (`template_id`),
+  CONSTRAINT `fk_express_template_free_template_id` FOREIGN KEY (`template_id`) REFERENCES `tz_trade_delivery_express_template` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='快递运费模板包邮配置表';
+
+-- 自提门店表 (trade_delivery_pick_up_store)
+CREATE TABLE `tz_trade_delivery_pick_up_store` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `name` varchar(128) NOT NULL COMMENT '门店名称',
+  `introduction` varchar(512) DEFAULT NULL COMMENT '门店简介',
+  `phone` varchar(20) NOT NULL COMMENT '门店手机',
+  `area_id` int(11) NOT NULL COMMENT '区域编号',
+  `detail_address` varchar(512) NOT NULL COMMENT '门店详细地址',
+  `logo` varchar(512) DEFAULT NULL COMMENT '门店 logo',
+  `opening_time` time NOT NULL COMMENT '营业开始时间',
+  `closing_time` time NOT NULL COMMENT '营业结束时间',
+  `latitude` double DEFAULT NULL COMMENT '纬度',
+  `longitude` double DEFAULT NULL COMMENT '经度',
+  `verify_user_ids` varchar(512) DEFAULT NULL COMMENT '核销员工用户编号数组',
+  `status` tinyint(4) NOT NULL COMMENT '门店状态 (枚举 CommonStatusEnum)',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  KEY `idx_area_id` (`area_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='自提门店表';
+
+

sql/mysql/pay.sql

@@ -0,0 +1,211 @@
+-- 支付应用表 (tz_pay_app)
+CREATE TABLE `tz_pay_app` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '应用编号，数据库自增',
+  `app_key` varchar(64) NOT NULL COMMENT '应用标识',
+  `name` varchar(128) NOT NULL COMMENT '应用名',
+  `status` tinyint(4) NOT NULL COMMENT '状态 (枚举 CommonStatusEnum)',
+  `remark` varchar(512) DEFAULT NULL COMMENT '备注',
+  `order_notify_url` varchar(512) DEFAULT NULL COMMENT '支付结果的回调地址',
+  `refund_notify_url` varchar(512) DEFAULT NULL COMMENT '退款结果的回调地址',
+  `transfer_notify_url` varchar(512) DEFAULT NULL COMMENT '转账结果的回调地址',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_app_key` (`app_key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付应用表';
+
+-- 支付渠道表 (tz_pay_channel)
+CREATE TABLE `tz_pay_channel` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '渠道编号，数据库自增',
+  `code` varchar(32) NOT NULL COMMENT '渠道编码 (枚举 PayChannelEnum)',
+  `status` tinyint(4) NOT NULL COMMENT '状态 (枚举 CommonStatusEnum)',
+  `fee_rate` double DEFAULT NULL COMMENT '渠道费率，单位：百分比',
+  `remark` varchar(512) DEFAULT NULL COMMENT '备注',
+  `app_id` bigint(20) NOT NULL COMMENT '应用编号 (关联 tz_pay_app.id)',
+  `config` json DEFAULT NULL COMMENT '支付渠道配置',
+  `tenant_id` bigint(20) NOT NULL COMMENT '租户ID',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_code_app_id` (`code`,`app_id`),
+  KEY `idx_app_id` (`app_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付渠道表';
+
+-- 支付通知日志表 (tz_pay_notify_log)
+CREATE TABLE `tz_pay_notify_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '日志编号，自增',
+  `task_id` bigint(20) NOT NULL COMMENT '通知任务编号 (关联 tz_pay_notify_task.id)',
+  `notify_times` int(11) NOT NULL COMMENT '第几次被通知',
+  `response` varchar(1024) DEFAULT NULL COMMENT 'HTTP 响应结果',
+  `status` tinyint(4) NOT NULL COMMENT '支付通知状态 (枚举 PayNotifyStatusEnum)',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  KEY `idx_task_id` (`task_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付通知日志表';
+
+-- 支付通知任务表 (tz_pay_notify_task)
+CREATE TABLE `tz_pay_notify_task` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
+  `app_id` bigint(20) NOT NULL COMMENT '应用编号 (关联 tz_pay_app.id)',
+  `type` tinyint(4) NOT NULL COMMENT '通知类型 (枚举 PayNotifyTypeEnum)',
+  `data_id` bigint(20) NOT NULL COMMENT '数据编号',
+  `merchant_order_id` varchar(64) DEFAULT NULL COMMENT '商户订单编号',
+  `merchant_transfer_id` varchar(64) DEFAULT NULL COMMENT '商户转账单编号',
+  `status` tinyint(4) NOT NULL COMMENT '通知状态 (枚举 PayNotifyStatusEnum)',
+  `next_notify_time` datetime DEFAULT NULL COMMENT '下一次通知时间',
+  `last_execute_time` datetime DEFAULT NULL COMMENT '最后一次执行时间',
+  `notify_times` int(11) DEFAULT NULL COMMENT '当前通知次数',
+  `max_notify_times` int(11) DEFAULT NULL COMMENT '最大可通知次数',
+  `notify_url` varchar(512) NOT NULL COMMENT '通知地址',
+  `tenant_id` bigint(20) NOT NULL COMMENT '租户ID',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  KEY `idx_app_id` (`app_id`),
+  KEY `idx_type_data_id` (`type`,`data_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付通知任务表';
+
+-- 支付订单表 (tz_pay_order)
+CREATE TABLE `tz_pay_order` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '订单编号，数据库自增',
+  `app_id` bigint(20) NOT NULL COMMENT '应用编号 (关联 tz_pay_app.id)',
+  `channel_id` bigint(20) NOT NULL COMMENT '渠道编号 (关联 tz_pay_channel.id)',
+  `channel_code` varchar(32) NOT NULL COMMENT '渠道编码 (枚举 PayChannelEnum)',
+  `merchant_order_id` varchar(64) NOT NULL COMMENT '商户订单编号',
+  `subject` varchar(256) NOT NULL COMMENT '商品标题',
+  `body` varchar(512) DEFAULT NULL COMMENT '商品描述信息',
+  `notify_url` varchar(512) DEFAULT NULL COMMENT '异步通知地址',
+  `price` int(11) NOT NULL COMMENT '支付金额，单位：分',
+  `channel_fee_rate` double DEFAULT NULL COMMENT '渠道手续费，单位：百分比',
+  `channel_fee_price` int(11) DEFAULT NULL COMMENT '渠道手续金额，单位：分',
+  `status` tinyint(4) NOT NULL COMMENT '支付状态 (枚举 PayOrderStatusEnum)',
+  `user_ip` varchar(32) DEFAULT NULL COMMENT '用户 IP',
+  `expire_time` datetime DEFAULT NULL COMMENT '订单失效时间',
+  `success_time` datetime DEFAULT NULL COMMENT '订单支付成功时间',
+  `extension_id` bigint(20) DEFAULT NULL COMMENT '支付成功的订单拓展单编号 (关联 tz_pay_order_extension.id)',
+  `no` varchar(64) DEFAULT NULL COMMENT '支付成功的外部订单号 (关联 tz_pay_order_extension.no)',
+  `refund_price` int(11) DEFAULT NULL COMMENT '退款总金额，单位：分',
+  `channel_user_id` varchar(128) DEFAULT NULL COMMENT '渠道用户编号',
+  `channel_order_no` varchar(128) DEFAULT NULL COMMENT '渠道订单号',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_merchant_order_id_app_id` (`merchant_order_id`,`app_id`),
+  KEY `idx_app_id` (`app_id`),
+  KEY `idx_channel_id` (`channel_id`),
+  KEY `idx_status` (`status`),
+  KEY `idx_extension_id` (`extension_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付订单表';
+
+-- 支付订单扩展表 (tz_pay_order_extension)
+CREATE TABLE `tz_pay_order_extension` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '订单拓展编号，数据库自增',
+  `no` varchar(64) NOT NULL COMMENT '外部订单号',
+  `order_id` bigint(20) NOT NULL COMMENT '订单号 (关联 tz_pay_order.id)',
+  `channel_id` bigint(20) NOT NULL COMMENT '渠道编号 (关联 tz_pay_channel.id)',
+  `channel_code` varchar(32) NOT NULL COMMENT '渠道编码',
+  `user_ip` varchar(32) DEFAULT NULL COMMENT '用户 IP',
+  `status` tinyint(4) NOT NULL COMMENT '支付状态 (枚举 PayOrderStatusEnum)',
+  `channel_extras` json DEFAULT NULL COMMENT '支付渠道的额外参数',
+  `channel_error_code` varchar(64) DEFAULT NULL COMMENT '调用渠道的错误码',
+  `channel_error_msg` varchar(512) DEFAULT NULL COMMENT '调用渠道报错时，错误信息',
+  `channel_notify_data` text DEFAULT NULL COMMENT '支付渠道的同步/异步通知的内容',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_no` (`no`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_channel_id` (`channel_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付订单扩展表';
+
+-- 支付退款单表 (tz_pay_refund)
+CREATE TABLE `tz_pay_refund` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '退款单编号，数据库自增',
+  `no` varchar(64) NOT NULL COMMENT '外部退款号',
+  `app_id` bigint(20) NOT NULL COMMENT '应用编号 (关联 tz_pay_app.id)',
+  `channel_id` bigint(20) NOT NULL COMMENT '渠道编号 (关联 tz_pay_channel.id)',
+  `channel_code` varchar(32) NOT NULL COMMENT '渠道编码 (枚举 PayChannelEnum)',
+  `order_id` bigint(20) NOT NULL COMMENT '订单编号 (关联 tz_pay_order.id)',
+  `order_no` varchar(64) NOT NULL COMMENT '支付订单编号',
+  `merchant_order_id` varchar(64) NOT NULL COMMENT '商户订单编号',
+  `merchant_refund_id` varchar(64) NOT NULL COMMENT '商户退款订单号',
+  `notify_url` varchar(512) DEFAULT NULL COMMENT '异步通知地址',
+  `status` tinyint(4) NOT NULL COMMENT '退款状态 (枚举 PayRefundStatusEnum)',
+  `pay_price` int(11) NOT NULL COMMENT '支付金额，单位：分',
+  `refund_price` int(11) NOT NULL COMMENT '退款金额，单位：分',
+  `reason` varchar(512) DEFAULT NULL COMMENT '退款原因',
+  `user_ip` varchar(32) DEFAULT NULL COMMENT '用户 IP',
+  `channel_order_no` varchar(128) DEFAULT NULL COMMENT '渠道订单号',
+  `channel_refund_no` varchar(128) DEFAULT NULL COMMENT '渠道退款单号',
+  `success_time` datetime DEFAULT NULL COMMENT '退款成功时间',
+  `channel_error_code` varchar(64) DEFAULT NULL COMMENT '调用渠道的错误码',
+  `channel_error_msg` varchar(512) DEFAULT NULL COMMENT '调用渠道的错误提示',
+  `channel_notify_data` text DEFAULT NULL COMMENT '支付渠道的同步/异步通知的内容',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_no` (`no`),
+  UNIQUE KEY `uk_merchant_refund_id_app_id` (`merchant_refund_id`,`app_id`),
+  KEY `idx_app_id` (`app_id`),
+  KEY `idx_channel_id` (`channel_id`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='支付退款单表';
+
+-- 转账单表 (tz_pay_transfer)
+CREATE TABLE `tz_pay_transfer` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `no` varchar(64) NOT NULL COMMENT '转账单号',
+  `app_id` bigint(20) NOT NULL COMMENT '应用编号 (关联 tz_pay_app.id)',
+  `channel_id` bigint(20) NOT NULL COMMENT '转账渠道编号 (关联 tz_pay_channel.id)',
+  `channel_code` varchar(32) NOT NULL COMMENT '转账渠道编码 (枚举 PayChannelEnum)',
+  `merchant_transfer_id` varchar(64) NOT NULL COMMENT '商户转账单编号',
+  `type` tinyint(4) NOT NULL COMMENT '类型 (枚举 PayTransferTypeEnum)',
+  `subject` varchar(256) NOT NULL COMMENT '转账标题',
+  `price` int(11) NOT NULL COMMENT '转账金额，单位：分',
+  `user_name` varchar(64) DEFAULT NULL COMMENT '收款人姓名',
+  `status` tinyint(4) NOT NULL COMMENT '转账状态 (枚举 PayTransferStatusRespEnum)',
+  `success_time` datetime DEFAULT NULL COMMENT '订单转账成功时间',
+  `alipay_logon_id` varchar(128) DEFAULT NULL COMMENT '支付宝登录号',
+  `openid` varchar(128) DEFAULT NULL COMMENT '微信 openId',
+  `notify_url` varchar(512) DEFAULT NULL COMMENT '异步通知地址',
+  `user_ip` varchar(32) DEFAULT NULL COMMENT '用户 IP',
+  `channel_extras` json DEFAULT NULL COMMENT '渠道的额外参数',
+  `channel_transfer_no` varchar(128) DEFAULT NULL COMMENT '渠道转账单号',
+  `channel_error_code` varchar(64) DEFAULT NULL COMMENT '调用渠道的错误码',
+  `channel_error_msg` varchar(512) DEFAULT NULL COMMENT '调用渠道的错误提示',
+  `channel_notify_data` text DEFAULT NULL COMMENT '渠道的同步/异步通知的内容',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+  `creator` varchar(64) NOT NULL COMMENT '创建者',
+  `updater` varchar(64) NOT NULL COMMENT '更新者',
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_no` (`no`),
+  UNIQUE KEY `uk_merchant_transfer_id_app_id` (`merchant_transfer_id`,`app_id`),
+  KEY `idx_app_id` (`app_id`),
+  KEY `idx_channel_id` (`channel_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='转账单表';

sql/tools/.gitignore

@@ -0,0 +1,8 @@
+# 忽略python虚拟环境
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/

sql/tools/README.md

@@ -0,0 +1,130 @@
+## 0. 友情提示
+
+在 `sql/tools` 目录下，我们提供一些数据库相关的工具，包括测试数据库的快速启动、MySQL 转换其它数据库等等。
+
+注意！所有的操作，必须在 `sql/tools` 目录下执行。
+
+## 1. 测试数据库的快速启动
+
+基于 Docker Compose，快速启动 MySQL、Oracle、PostgreSQL、SQL Server 等数据库。
+
+注意！使用 Docker Compose 启动完测试数据后，因为会自动导入项目的 SQL 脚本，所以可能需要等待 1-2 分钟。
+
+### 1.1 MySQL
+
+```Bash
+docker compose up -d mysql
+```
+
+#### 1.2 Oracle
+
+```Bash
+## x86 版本
+docker compose up -d oracle
+
+## MacBook Apple Silicon
+docker compose up -d oracle_m1
+```
+
+> 注意：如果使用 MacBook Apple Silicon 版本，它的 ORACLE_SID 不是 XE，而是 FREE！！！
+
+### 1.3 PostgreSQL
+
+```Bash
+docker compose up -d postgres
+```
+
+### 1.4 SQL Server
+
+```Bash
+docker compose up -d sqlserver
+# 注意：启动完 sqlserver 后，需要手动再执行如下命令，因为 SQL Server 不支持初始化脚本
+docker compose exec sqlserver bash /tmp/create_schema.sh
+```
+
+### 1.5 DM 达梦
+
+① 下载达梦 Docker 镜像：<https://eco.dameng.com/download/> 地址，点击“Docker 镜像”选项，进行下载。
+
+② 加载镜像文件，在镜像 tar 文件所在目录运行：
+
+```Bash
+docker load -i dm8_20240715_x86_rh6_rq_single.tar
+```
+
+③ 在项目 `sql/tools` 目录下运行：
+
+```Bash
+docker compose up -d dm8
+# 注意：启动完 dm 后，需要手动再执行如下命令，因为 dm 不支持初始化脚本
+docker compose exec dm8 bash -c '/opt/dmdbms/bin/disql SYSDBA/SYSDBA001 \`/tmp/schema.sql'
+exit
+```
+
+### 1.6 KingbaseES 人大金仓
+
+① 下载人大金仓 Docker 镜像：
+
+* [x86_64 版本](https://kingbase.oss-cn-beijing.aliyuncs.com/KESV8R3/V009R001C001B0025-安装包-docker/x86_64/kdb_x86_64_V009R001C001B0025.tar) 【Windows 选择这个】
+* [aarch64 版本](https://kingbase.oss-cn-beijing.aliyuncs.com/KESV8R3/V009R001C001B0025-安装包-docker/aarch64/kdb_aarch64_V009R001C001B0025.tar) 【MacBook Apple Silicon 选择这个】
+
+② 加载镜像文件，在镜像 tar 文件所在目录运行：
+
+```Bash
+docker load -i kdb_x86_64_V009R001C001B0025.tar
+```
+
+③ 在项目 `sql/tools` 目录下运行：
+
+```Bash
+docker compose up -d kingbase
+# 注意：启动完 kingbase 后，需要手动再执行如下命令
+docker compose exec kingbase bash -c 'ksql -U $DB_USER -d test -f /tmp/schema.sql'
+```
+
+### 1.7 华为 OpenGauss
+
+```Bash
+docker compose up -d opengauss
+# 注意：启动完 opengauss 后，需要手动再执行如下命令
+docker compose exec opengauss bash -c '/usr/local/opengauss/bin/gsql -U $GS_USERNAME -W $GS_PASSWORD -d postgres -f /tmp/schema.sql'
+```
+
+## 1.X 容器的销毁重建
+
+开发测试过程中，有时候需要创建全新干净的数据库。由于测试数据 Docker 容器采用数据卷 Volume 挂载数据库实例的数据目录，因此销毁数据需要停止容器后，删除数据卷，然后再重新创建容器。
+
+以 postgres 为例，操作如下：
+
+```Bash
+docker compose down postgres
+docker volume rm ruoyi-vue-pro_postgres
+```
+
+## 2. MySQL 转换其它数据库
+
+项目提供了 `sql/tools/convertor.py` 脚本，支持将 MySQL 转换为 Oracle、PostgreSQL、SQL Server、达梦、人大金仓、OpenGauss 等数据库的脚本。
+
+### 2.1 实现原理
+
+通过读取 MySQL 的 `sql/mysql/ruoyi-vue-pro.sql` 数据库文件，转换成对应的数据库脚本。
+
+### 2.2 使用方法
+
+① 安装依赖库 `simple-ddl-parser`
+
+```bash
+pip install simple-ddl-parser
+# pip3 install simple-ddl-parser
+```
+
+② 在 `sql/tools/` 目录下，执行如下命令打印生成 postgres 的脚本内容，其他可选参数有：`oracle`、`sqlserver`、`dm8`、`kingbase`、`opengauss`：
+
+```Bash
+python3 convertor.py postgres
+# python3 convertor.py postgres > tmp.sql
+```
+
+程序将 SQL 脚本打印到终端，可以重定向到临时文件 `tmp.sql`。
+
+确认无误后，可以利用 IDEA 进行格式化。当然，也可以直接导入到数据库中。

sql/tools/convertor.py

@@ -0,0 +1,844 @@
+# encoding=utf8
+"""芋道系统数据库迁移工具
+
+Author: dhb52 (https://gitee.com/dhb52)
+
+pip install simple-ddl-parser
+"""
+
+import argparse
+import pathlib
+import re
+import time
+from abc import ABC, abstractmethod
+from typing import Dict, Generator, Optional, Tuple, Union
+
+from simple_ddl_parser import DDLParser
+
+PREAMBLE = """/*
+ Yudao Database Transfer Tool
+
+ Source Server Type    : MySQL
+
+ Target Server Type    : {db_type}
+
+ Date: {date}
+*/
+
+"""
+
+
+def load_and_clean(sql_file: str) -> str:
+    """加载源 SQL 文件，并清理内容方便下一步 ddl 解析
+
+    Args:
+        sql_file (str): sql文件路径
+
+    Returns:
+        str: 清理后的sql文件内容
+    """
+    REPLACE_PAIR_LIST = (
+        (" CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ", " "),
+        (" KEY `", " INDEX `"),
+        ("UNIQUE INDEX", "UNIQUE KEY"),
+        ("b'0'", "'0'"),
+        ("b'1'", "'1'"),
+    )
+
+    content = open(sql_file).read()
+    for replace_pair in REPLACE_PAIR_LIST:
+        content = content.replace(*replace_pair)
+    content = re.sub(r"ENGINE.*COMMENT", "COMMENT", content)
+    content = re.sub(r"ENGINE.*;", ";", content)
+    return content
+
+
+class Convertor(ABC):
+    def __init__(self, src: str, db_type) -> None:
+        self.src = src
+        self.db_type = db_type
+        self.content = load_and_clean(self.src)
+        self.table_script_list = re.findall(r"CREATE TABLE [^;]*;", self.content)
+
+    @abstractmethod
+    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]) -> str:
+        """字段类型转换
+
+        Args:
+            type (str): 字段类型
+            size (Optional[Union[int, Tuple[int]]]): 字段长度描述, 如varchar(255), decimal(10,2)
+
+        Returns:
+            str: 类型定义
+        """
+        pass
+
+    @abstractmethod
+    def gen_create(self, table_ddl: Dict) -> str:
+        """生成 create 脚本
+
+        Args:
+            table_ddl (Dict): 表DDL
+
+        Returns:
+            str:  生成脚本
+        """
+        pass
+
+    @abstractmethod
+    def gen_pk(self, table_name: str) -> str:
+        """生成主键定义
+
+        Args:
+            table_name (str): 表名
+
+        Returns:
+            str: 生成脚本
+        """
+        pass
+
+    @abstractmethod
+    def gen_index(self, ddl: Dict) -> str:
+        """生成索引定义
+
+        Args:
+            table_ddl (Dict): 表DDL
+
+        Returns:
+            str: 生成脚本
+        """
+        pass
+
+    @abstractmethod
+    def gen_comment(self, table_sql: str, table_name: str) -> str:
+        """生成字段/表注释
+
+        Args:
+            table_sql (str): 原始表SQL
+            table_name (str): 表名
+
+        Returns:
+            str: 生成脚本
+        """
+        pass
+
+    @abstractmethod
+    def gen_insert(self, table_name: str) -> str:
+        """生成 insert 语句块
+
+        Args:
+            table_name (str): 表名
+
+        Returns:
+            str: 生成脚本
+        """
+        pass
+
+    def gen_dual(self) -> str:
+        """生成虚拟 dual 表
+
+        Returns:
+            str: 生成脚本, 默认返回空脚本, 表示当前数据库无需手工创建
+        """
+        return ""
+
+    @staticmethod
+    def inserts(table_name: str, script_content: str) -> Generator:
+        PREFIX = f"INSERT INTO `{table_name}`"
+
+        # 收集 `table_name` 对应的 insert 语句
+        for line in script_content.split("\n"):
+            if line.startswith(PREFIX):
+                head, tail = line.replace(PREFIX, "").split(" VALUES ", maxsplit=1)
+                head = head.strip().replace("`", "").lower()
+                tail = tail.strip().replace(r"\"", '"')
+                # tail = tail.replace("b'0'", "'0'").replace("b'1'", "'1'")
+                yield f"INSERT INTO {table_name.lower()} {head} VALUES {tail}"
+
+    @staticmethod
+    def index(ddl: Dict) -> Generator:
+        """生成索引定义
+
+        Args:
+            ddl (Dict): 表DDL
+
+        Yields:
+            Generator[str]: create index 语句
+        """
+
+        def generate_columns(columns):
+            keys = [
+                f"{col['name'].lower()}{' ' + col['order'].lower() if col['order'] != 'ASC' else ''}"
+                for col in columns[0]
+            ]
+            return ", ".join(keys)
+
+        for no, index in enumerate(ddl["index"], 1):
+            columns = generate_columns(index["columns"])
+            table_name = ddl["table_name"].lower()
+            yield f"CREATE INDEX idx_{table_name}_{no:02d} ON {table_name} ({columns})"
+
+    @staticmethod
+    def filed_comments(table_sql: str) -> Generator:
+        for line in table_sql.split("\n"):
+            match = re.match(r"^`([^`]+)`.* COMMENT '([^']+)'", line.strip())
+            if match:
+                field = match.group(1)
+                comment_string = match.group(2).replace("\\n", "\n")
+                yield field, comment_string
+
+    def table_comment(self, table_sql: str) -> str:
+        match = re.search(r"COMMENT \= '([^']+)';", table_sql)
+        return match.group(1) if match else None
+
+    def print(self):
+        """打印转换后的sql脚本到终端"""
+        print(
+            PREAMBLE.format(
+                db_type=self.db_type,
+                date=time.strftime("%Y-%m-%d %H:%M:%S"),
+            )
+        )
+
+        dual = self.gen_dual()
+        if dual:
+            print(
+                f"""-- ----------------------------
+-- Table structure for dual
+-- ----------------------------
+{dual}
+"""
+            )
+
+        error_scripts = []
+        for table_sql in self.table_script_list:
+            ddl = DDLParser(table_sql.replace("`", "")).run()
+
+            # 如果parse失败, 需要跟进
+            if len(ddl) == 0:
+                error_scripts.append(table_sql)
+                continue
+
+            table_ddl = ddl[0]
+            table_name = table_ddl["table_name"]
+
+            # 忽略 quartz 的内容
+            if table_name.lower().startswith("qrtz"):
+                continue
+
+            # 为每个表生成个5个基本部分
+            create = self.gen_create(table_ddl)
+            pk = self.gen_pk(table_name)
+            index = self.gen_index(table_ddl)
+            comment = self.gen_comment(table_sql, table_name)
+            inserts = self.gen_insert(table_name)
+
+            # 组合当前表的DDL脚本
+            script = f"""{create}
+
+{pk}
+
+{index}
+
+{comment}
+
+{inserts}
+"""
+
+            # 清理
+            script = re.sub("\n{3,}", "\n\n", script).strip() + "\n"
+
+            print(script)
+
+        # 将parse失败的脚本打印出来
+        if error_scripts:
+            for script in error_scripts:
+                print(script)
+
+
+class PostgreSQLConvertor(Convertor):
+    def __init__(self, src):
+        super().__init__(src, "PostgreSQL")
+
+    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]):
+        """类型转换"""
+
+        type = type.lower()
+
+        if type == "varchar":
+            return f"varchar({size})"
+        if type == "int":
+            return "int4"
+        if type == "bigint" or type == "bigint unsigned":
+            return "int8"
+        if type == "datetime":
+            return "timestamp"
+        if type == "bit":
+            return "bool"
+        if type in ("tinyint", "smallint"):
+            return "int2"
+        if type == "text":
+            return "text"
+        if type in ("blob", "mediumblob"):
+            return "bytea"
+        if type == "decimal":
+            return (
+                f"numeric({','.join(str(s) for s in size)})" if len(size) else "numeric"
+            )
+
+    def gen_create(self, ddl: Dict) -> str:
+        """生成 create"""
+
+        def _generate_column(col):
+            name = col["name"].lower()
+            if name == "deleted":
+                return "deleted int2 NOT NULL DEFAULT 0"
+
+            type = col["type"].lower()
+            full_type = self.translate_type(type, col["size"])
+            nullable = "NULL" if col["nullable"] else "NOT NULL"
+            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
+            return f"{name} {full_type} {nullable} {default}"
+
+        table_name = ddl["table_name"].lower()
+        columns = [f"{_generate_column(col).strip()}" for col in ddl["columns"]]
+        filed_def_list = ",\n  ".join(columns)
+        script = f"""-- ----------------------------
+-- Table structure for {table_name}
+-- ----------------------------
+DROP TABLE IF EXISTS {table_name};
+CREATE TABLE {table_name} (
+    {filed_def_list}
+);"""
+
+        return script
+
+    def gen_index(self, ddl: Dict) -> str:
+        return "\n".join(f"{script};" for script in self.index(ddl))
+
+    def gen_comment(self, table_sql: str, table_name: str) -> str:
+        """生成字段及表的注释"""
+
+        script = ""
+        for field, comment_string in self.filed_comments(table_sql):
+            script += (
+                f"COMMENT ON COLUMN {table_name}.{field} IS '{comment_string}';" + "\n"
+            )
+
+        table_comment = self.table_comment(table_sql)
+        if table_comment:
+            script += f"COMMENT ON TABLE {table_name} IS '{table_comment}';\n"
+
+        return script
+
+    def gen_pk(self, table_name) -> str:
+        """生成主键定义"""
+        return f"ALTER TABLE {table_name} ADD CONSTRAINT pk_{table_name} PRIMARY KEY (id);\n"
+
+    def gen_insert(self, table_name: str) -> str:
+        """生成 insert 语句，以及根据最后的 insert id+1 生成 Sequence"""
+
+        inserts = list(Convertor.inserts(table_name, self.content))
+        ## 生成 insert 脚本
+        script = ""
+        last_id = 0
+        if inserts:
+            inserts_lines = "\n".join(inserts)
+            script += f"""\n\n-- ----------------------------
+-- Records of {table_name.lower()}
+-- ----------------------------
+-- @formatter:off
+BEGIN;
+{inserts_lines}
+COMMIT;
+-- @formatter:on"""
+            match = re.search(r"VALUES \((\d+),", inserts[-1])
+            if match:
+                last_id = int(match.group(1))
+
+        # 生成 Sequence
+        script += (
+            "\n\n"
+            + f"""DROP SEQUENCE IF EXISTS {table_name}_seq;
+CREATE SEQUENCE {table_name}_seq
+    START {last_id + 1};"""
+        )
+
+        return script
+
+    def gen_dual(self) -> str:
+        return """DROP TABLE IF EXISTS dual;
+CREATE TABLE dual
+(
+    id int2
+);
+
+COMMENT ON TABLE dual IS '数据库连接的表';
+
+-- ----------------------------
+-- Records of dual
+-- ----------------------------
+-- @formatter:off
+INSERT INTO dual VALUES (1);
+-- @formatter:on"""
+
+
+class OracleConvertor(Convertor):
+    def __init__(self, src):
+        super().__init__(src, "Oracle")
+
+    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]):
+        """类型转换"""
+        type = type.lower()
+
+        if type == "varchar":
+            return f"varchar2({size if size < 4000 else 4000})"
+        if type == "int":
+            return "number"
+        if type == "bigint" or type == "bigint unsigned":
+            return "number"
+        if type == "datetime":
+            return "date"
+        if type == "bit":
+            return "number(1,0)"
+        if type in ("tinyint", "smallint"):
+            return "smallint"
+        if type == "text":
+            return "clob"
+        if type in ("blob", "mediumblob"):
+            return "blob"
+        if type == "decimal":
+            return (
+                f"number({','.join(str(s) for s in size)})" if len(size) else "number"
+            )
+
+    def gen_create(self, ddl) -> str:
+        """生成 CREATE 语句"""
+
+        def generate_column(col):
+            name = col["name"].lower()
+            if name == "deleted":
+                return "deleted number(1,0) DEFAULT 0 NOT NULL"
+
+            type = col["type"].lower()
+            full_type = self.translate_type(type, col["size"])
+            nullable = "NULL" if col["nullable"] else "NOT NULL"
+            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
+            # Oracle 中 size 不能作为字段名
+            field_name = '"size"' if name == "size" else name
+            # Oracle DEFAULT 定义在 NULLABLE 之前
+            return f"{field_name} {full_type} {default} {nullable}"
+
+        table_name = ddl["table_name"].lower()
+        columns = [f"{generate_column(col).strip()}" for col in ddl["columns"]]
+        field_def_list = ",\n    ".join(columns)
+        script = f"""-- ----------------------------
+-- Table structure for {table_name}
+-- ----------------------------
+CREATE TABLE {table_name} (
+    {field_def_list}
+);"""
+
+        # oracle INSERT '' 不能通过 NOT NULL 校验
+        script = script.replace("DEFAULT '' NOT NULL", "DEFAULT '' NULL")
+
+        return script
+
+    def gen_index(self, ddl: Dict) -> str:
+        return "\n".join(f"{script};" for script in self.index(ddl))
+
+    def gen_comment(self, table_sql: str, table_name: str) -> str:
+        script = ""
+        for field, comment_string in self.filed_comments(table_sql):
+            script += (
+                f"COMMENT ON COLUMN {table_name}.{field} IS '{comment_string}';" + "\n"
+            )
+
+        table_comment = self.table_comment(table_sql)
+        if table_comment:
+            script += f"COMMENT ON TABLE {table_name} IS '{table_comment}';\n"
+
+        return script
+
+    def gen_pk(self, table_name: str) -> str:
+        """生成主键定义"""
+        return f"ALTER TABLE {table_name} ADD CONSTRAINT pk_{table_name} PRIMARY KEY (id);\n"
+
+    def gen_index(self, ddl: Dict) -> str:
+        return "\n".join(f"{script};" for script in self.index(ddl))
+
+    def gen_insert(self, table_name: str) -> str:
+        """拷贝 INSERT 语句"""
+        inserts = []
+        for insert_script in Convertor.inserts(table_name, self.content):
+            # 对日期数据添加 TO_DATE 转换
+            insert_script = re.sub(
+                r"('\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}')",
+                r"to_date(\g<1>, 'SYYYY-MM-DD HH24:MI:SS')",
+                insert_script,
+            )
+            inserts.append(insert_script)
+
+        ## 生成 insert 脚本
+        script = ""
+        last_id = 0
+        if inserts:
+            inserts_lines = "\n".join(inserts)
+            script += f"""\n\n-- ----------------------------
+-- Records of {table_name.lower()}
+-- ----------------------------
+-- @formatter:off
+{inserts_lines}
+COMMIT;
+-- @formatter:on"""
+            match = re.search(r"VALUES \((\d+),", inserts[-1])
+            if match:
+                last_id = int(match.group(1))
+
+        # 生成 Sequence
+        script += f"""
+
+CREATE SEQUENCE {table_name}_seq
+    START WITH {last_id + 1};"""
+
+        return script
+
+
+class SQLServerConvertor(Convertor):
+    """_summary_
+
+    Args:
+        Convertor (_type_): _description_
+    """
+
+    def __init__(self, src):
+        super().__init__(src, "Microsoft SQL Server")
+
+    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]):
+        """类型转换"""
+
+        type = type.lower()
+
+        if type == "varchar":
+            return f"nvarchar({size if size < 4000 else 4000})"
+        if type == "int":
+            return "int"
+        if type == "bigint" or type == "bigint unsigned":
+            return "bigint"
+        if type == "datetime":
+            return "datetime2"
+        if type == "bit":
+            return "varchar(1)"
+        if type in ("tinyint", "smallint"):
+            return "tinyint"
+        if type == "text":
+            return "nvarchar(max)"
+        if type in ("blob", "mediumblob"):
+            return "varbinary(max)"
+        if type == "decimal":
+            return (
+                f"numeric({','.join(str(s) for s in size)})" if len(size) else "numeric"
+            )
+
+    def gen_create(self, ddl: Dict) -> str:
+        """生成 create"""
+
+        def _generate_column(col):
+            name = col["name"].lower()
+            if name == "id":
+                return "id bigint NOT NULL PRIMARY KEY IDENTITY"
+            if name == "deleted":
+                return "deleted bit DEFAULT 0 NOT NULL"
+
+            type = col["type"].lower()
+            full_type = self.translate_type(type, col["size"])
+            nullable = "NULL" if col["nullable"] else "NOT NULL"
+            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
+            return f"{name} {full_type} {default} {nullable}"
+
+        table_name = ddl["table_name"].lower()
+        columns = [f"{_generate_column(col).strip()}" for col in ddl["columns"]]
+        filed_def_list = ",\n    ".join(columns)
+        script = f"""-- ----------------------------
+-- Table structure for {table_name}
+-- ----------------------------
+DROP TABLE IF EXISTS {table_name}
+GO
+CREATE TABLE {table_name} (
+    {filed_def_list}
+)
+GO"""
+
+        return script
+
+    def gen_comment(self, table_sql: str, table_name: str) -> str:
+        """生成字段及表的注释"""
+
+        script = ""
+
+        for field, comment_string in self.filed_comments(table_sql):
+            script += f"""EXEC sp_addextendedproperty
+    'MS_Description', N'{comment_string}',
+    'SCHEMA', N'dbo',
+    'TABLE', N'{table_name}',
+    'COLUMN', N'{field}'
+GO
+
+"""
+
+        table_comment = self.table_comment(table_sql)
+        if table_comment:
+            script += f"""EXEC sp_addextendedproperty
+    'MS_Description', N'{table_comment}',
+    'SCHEMA', N'dbo',
+    'TABLE', N'{table_name}'
+GO
+
+"""
+        return script
+
+    def gen_pk(self, table_name: str) -> str:
+        """生成主键定义"""
+        return ""
+
+    def gen_index(self, ddl: Dict) -> str:
+        """生成 index"""
+        return "\n".join(f"{script}\nGO" for script in self.index(ddl))
+
+    def gen_insert(self, table_name: str) -> str:
+        """生成 insert 语句"""
+
+        # 收集 `table_name` 对应的 insert 语句
+        inserts = []
+        for insert_script in Convertor.inserts(table_name, self.content):
+            # SQLServer: 字符串前加N，hack，是否存在替换字符串内容的风险
+            insert_script = insert_script.replace(", '", ", N'").replace(
+                "VALUES ('", "VALUES (N')"
+            )
+            # 删除 insert 的结尾分号
+            insert_script = re.sub(";$", r"\nGO", insert_script)
+            inserts.append(insert_script)
+
+        ## 生成 insert 脚本
+        script = ""
+        if inserts:
+            inserts_lines = "\n".join(inserts)
+            script += f"""\n\n-- ----------------------------
+-- Records of {table_name.lower()}
+-- ----------------------------
+-- @formatter:off
+BEGIN TRANSACTION
+GO
+SET IDENTITY_INSERT {table_name.lower()} ON
+GO
+{inserts_lines}
+SET IDENTITY_INSERT {table_name.lower()} OFF
+GO
+COMMIT
+GO
+-- @formatter:on"""
+
+        return script
+
+    def gen_dual(self) -> str:
+        return """DROP TABLE IF EXISTS dual
+GO
+CREATE TABLE dual
+(
+  id int
+)
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'数据库连接的表',
+    'SCHEMA', N'dbo',
+    'TABLE', N'dual'
+GO
+
+-- ----------------------------
+-- Records of dual
+-- ----------------------------
+-- @formatter:off
+INSERT INTO dual VALUES (1)
+GO
+-- @formatter:on"""
+
+
+class DM8Convertor(Convertor):
+    def __init__(self, src):
+        super().__init__(src, "DM8")
+
+    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]):
+        """类型转换"""
+        type = type.lower()
+
+        if type == "varchar":
+            return f"varchar({size})"
+        if type == "int":
+            return "int"
+        if type == "bigint" or type == "bigint unsigned":
+            return "bigint"
+        if type == "datetime":
+            return "datetime"
+        if type == "bit":
+            return "bit"
+        if type in ("tinyint", "smallint"):
+            return "smallint"
+        if type == "text":
+            return "text"
+        if type == "blob":
+            return "blob"
+        if type == "mediumblob":
+            return "varchar(10240)"
+        if type == "decimal":
+            return (
+                f"decimal({','.join(str(s) for s in size)})" if len(size) else "decimal"
+            )
+
+    def gen_create(self, ddl) -> str:
+        """生成 CREATE 语句"""
+
+        def generate_column(col):
+            name = col["name"].lower()
+            if name == "id":
+                return "id bigint NOT NULL PRIMARY KEY IDENTITY"
+
+            type = col["type"].lower()
+            full_type = self.translate_type(type, col["size"])
+            nullable = "NULL" if col["nullable"] else "NOT NULL"
+            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
+            return f"{name} {full_type} {default} {nullable}"
+
+        table_name = ddl["table_name"].lower()
+        columns = [f"{generate_column(col).strip()}" for col in ddl["columns"]]
+        field_def_list = ",\n    ".join(columns)
+        script = f"""-- ----------------------------
+-- Table structure for {table_name}
+-- ----------------------------
+CREATE TABLE {table_name} (
+    {field_def_list}
+);"""
+
+        # oracle INSERT '' 不能通过 NOT NULL 校验
+        script = script.replace("DEFAULT '' NOT NULL", "DEFAULT '' NULL")
+
+        return script
+
+    def gen_index(self, ddl: Dict) -> str:
+        return "\n".join(f"{script};" for script in self.index(ddl))
+
+    def gen_comment(self, table_sql: str, table_name: str) -> str:
+        script = ""
+        for field, comment_string in self.filed_comments(table_sql):
+            script += (
+                f"COMMENT ON COLUMN {table_name}.{field} IS '{comment_string}';" + "\n"
+            )
+
+        table_comment = self.table_comment(table_sql)
+        if table_comment:
+            script += f"COMMENT ON TABLE {table_name} IS '{table_comment}';\n"
+
+        return script
+
+    def gen_pk(self, table_name: str) -> str:
+        """生成主键定义"""
+        return ""
+
+    def gen_index(self, ddl: Dict) -> str:
+        return "\n".join(f"{script};" for script in self.index(ddl))
+
+    def gen_insert(self, table_name: str) -> str:
+        """拷贝 INSERT 语句"""
+        inserts = list(Convertor.inserts(table_name, self.content))
+
+        ## 生成 insert 脚本
+        script = ""
+        if inserts:
+            inserts_lines = "\n".join(inserts)
+            script += f"""\n\n-- ----------------------------
+-- Records of {table_name.lower()}
+-- ----------------------------
+-- @formatter:off
+SET IDENTITY_INSERT {table_name.lower()} ON;
+{inserts_lines}
+COMMIT;
+SET IDENTITY_INSERT {table_name.lower()} OFF;
+-- @formatter:on"""
+
+        return script
+
+
+class KingbaseConvertor(PostgreSQLConvertor):
+    def __init__(self, src):
+        super().__init__(src)
+        self.db_type = "Kingbase"
+
+    def gen_create(self, ddl: Dict) -> str:
+        """生成 create"""
+
+        def _generate_column(col):
+            name = col["name"].lower()
+            if name == "deleted":
+                return "deleted int2 NOT NULL DEFAULT 0"
+
+            type = col["type"].lower()
+            full_type = self.translate_type(type, col["size"])
+            nullable = "NULL" if col["nullable"] else "NOT NULL"
+            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
+            return f"{name} {full_type} {nullable} {default}"
+
+        table_name = ddl["table_name"].lower()
+        columns = [f"{_generate_column(col).strip()}" for col in ddl["columns"]]
+        filed_def_list = ",\n  ".join(columns)
+        script = f"""-- ----------------------------
+-- Table structure for {table_name}
+-- ----------------------------
+DROP TABLE IF EXISTS {table_name};
+CREATE TABLE {table_name} (
+    {filed_def_list}
+);"""
+
+        # Kingbase INSERT '' 不能通过 NOT NULL 校验
+        script = script.replace("NOT NULL DEFAULT ''", "NULL DEFAULT ''")
+
+        return script
+
+
+class OpengaussConvertor(KingbaseConvertor):
+    def __init__(self, src):
+        super().__init__(src)
+        self.db_type = "OpenGauss"
+
+
+def main():
+    parser = argparse.ArgumentParser(description="芋道系统数据库转换工具")
+    parser.add_argument(
+        "type",
+        type=str,
+        help="目标数据库类型",
+        choices=["postgres", "oracle", "sqlserver", "dm8", "kingbase", "opengauss"],
+    )
+    args = parser.parse_args()
+
+    sql_file = pathlib.Path("../mysql/ruoyi-vue-pro.sql").resolve().as_posix()
+    convertor = None
+    if args.type == "postgres":
+        convertor = PostgreSQLConvertor(sql_file)
+    elif args.type == "oracle":
+        convertor = OracleConvertor(sql_file)
+    elif args.type == "sqlserver":
+        convertor = SQLServerConvertor(sql_file)
+    elif args.type == "dm8":
+        convertor = DM8Convertor(sql_file)
+    elif args.type == "kingbase":
+        convertor = KingbaseConvertor(sql_file)
+    elif args.type == "opengauss":
+        convertor = OpengaussConvertor(sql_file)
+    else:
+        raise NotImplementedError(f"不支持目标数据库类型: {args.type}")
+
+    convertor.print()
+
+
+if __name__ == "__main__":
+    main()

sql/tools/docker-compose.yaml

@@ -0,0 +1,134 @@
+name: ruoyi-vue-pro
+
+volumes:
+    mysql: { }
+    postgres: { }
+    sqlserver: { }
+    dm8: { }
+    kingbase: { }
+    opengauss: { }
+
+services:
+    mysql:
+        image: mysql:8.0.33
+        restart: unless-stopped
+        environment:
+            TZ: Asia/Shanghai
+            MYSQL_ROOT_PASSWORD: 123456
+            MYSQL_DATABASE: ruoyi-vue-pro
+        ports:
+            - "3306:3306"
+        volumes:
+            - mysql:/var/lib/mysql/
+            # 注入初始化脚本
+            - ./mysql/ruoyi-vue-pro.sql:/docker-entrypoint-initdb.d/init.sql:ro
+        command:
+            --default-authentication-plugin=mysql_native_password
+            --character-set-server=utf8mb4
+            --collation-server=utf8mb4_general_ci
+            --explicit_defaults_for_timestamp=true
+            --lower_case_table_names=1
+
+    postgres:
+        image: postgres:14.2
+        restart: unless-stopped
+        environment:
+            POSTGRES_USER: root
+            POSTGRES_PASSWORD: 123456
+            POSTGRES_DB: ruoyi-vue-pro
+        ports:
+            - "5432:5432"
+        volumes:
+            - postgres:/var/lib/postgresql/data
+            # 注入初始化脚本
+            - ../postgresql/quartz.sql:/docker-entrypoint-initdb.d/quartz.sql:ro
+            - ../postgresql/ruoyi-vue-pro.sql:/docker-entrypoint-initdb.d/ruoyi-vue-pro.sql:ro
+
+    oracle:
+        image: gvenzl/oracle-xe:18-slim-faststart
+        restart: unless-stopped
+        environment:
+            ## 登录信息 SID: XE user: system password: oracle
+            ORACLE_PASSWORD: oracle
+        ports:
+            - "1521:1521"
+        volumes:
+            - ../oracle/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
+            # 创建app用户: ROOT/123456@//localhost/XEPDB1
+            - ./oracle/1_create_user.sql:/docker-entrypoint-initdb.d/1_create_user.sql:ro
+            - ./oracle/2_create_schema.sh:/docker-entrypoint-initdb.d/2_create_schema.sh:ro
+
+    oracle_m1:
+      image: einslib/oracle-19c:19.3.0-ee-slim-faststart
+      restart: unless-stopped
+      environment:
+        ## 登录信息 SID: FREE user: system password: oracle
+        ORACLE_PASSWORD: oracle
+      ports:
+        - "1521:1521"
+      volumes:
+        - ../oracle/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
+        # 创建app用户: ROOT/123456@//localhost/XEPDB1
+        - ./oracle/1_create_user.sql:/docker-entrypoint-initdb.d/1_create_user.sql:ro
+        - ./oracle/2_create_schema.sh:/docker-entrypoint-initdb.d/2_create_schema.sh:ro
+
+    sqlserver:
+        image: mcr.microsoft.com/mssql/server:2017-latest
+        restart: unless-stopped
+        environment:
+            TZ: Asia/Shanghai
+            ACCEPT_EULA: "Y"
+            SA_PASSWORD: "Yudao@2024"
+        ports:
+            - "1433:1433"
+        volumes:
+            - sqlserver:/var/opt/mssql
+            - ../sqlserver/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
+            # docker compose exec sqlserver bash /tmp/create_schema.sh
+            - ./sqlserver/create_schema.sh:/tmp/create_schema.sh:ro
+
+    dm8:
+        # docker load -i dm8_20240715_x86_rh6_rq_single.tar
+        image: dm8_single:dm8_20240715_rev232765_x86_rh6_64
+        restart: unless-stopped
+        environment:
+            PAGE_SIZE: 16
+            LD_LIBRARY_PATH: /opt/dmdbms/bin
+            EXTENT_SIZE: 32
+            BLANK_PAD_MODE: 1
+            LOG_SIZE: 1024
+            UNICODE_FLAG: 1
+            LENGTH_IN_CHAR: 1
+            INSTANCE_NAME: dm8_test
+        ports:
+            - "5236:5236"
+        volumes:
+            - dm8:/opt/dmdbms/data
+            - ../dm/ruoyi-vue-pro-dm8.sql:/tmp/schema.sql:ro
+
+    kingbase:
+        image: kingbase_v009r001c001b0025_single_x86:v1
+#        image: kingbase_v009r001c001b0025_single_arm:v1
+        restart: unless-stopped
+        environment:
+            DB_USER: root
+            DB_PASSWORD: 123456
+        ports:
+            - "54321:54321"
+        volumes:
+            - kingbase:/home/kingbase/userdata
+            - ../kingbase/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
+
+    opengauss:
+        image: opengauss/opengauss:5.0.0
+        restart: unless-stopped
+        environment:
+            GS_USERNAME: root
+            GS_PASSWORD: Yudao@2024
+            LD_LIBRARY_PATH: /usr/local/opengauss/lib:/usr/lib
+        ports:
+            - "5432:5432"
+        volumes:
+            - opengauss:/var/lib/opengauss
+            - ../opengauss/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
+            # docker compose exec opengauss bash -c '/usr/local/opengauss/bin/gsql -U $GS_USERNAME -W $GS_PASSWORD -d postgres -f /tmp/schema.sql'

sql/tools/oracle/1_create_user.sql

@@ -0,0 +1,3 @@
+ALTER SESSION SET CONTAINER=XEPDB1;
+CREATE USER ROOT IDENTIFIED BY 123456 QUOTA UNLIMITED ON USERS;
+GRANT CONNECT, RESOURCE TO ROOT;

sql/tools/oracle/2_create_schema.sh

@@ -0,0 +1 @@
+sqlplus -s ROOT/123456@//localhost/XEPDB1 @/tmp/schema.sql

sql/tools/sqlserver/create_schema.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -Q "CREATE DATABASE [ruoyi-vue-pro];
+GO"
+/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -d 'ruoyi-vue-pro' -i /tmp/schema.sql

tashow-dependencies/pom.xml

@@ -34,8 +34,6 @@
         <rocketmq-spring.version>2.3.1</rocketmq-spring.version>
         <!-- RPC 相关 -->
         <!-- Config 配置中心相关 -->
-        <springdoc.version>2.7.0</springdoc.version>
-        <knife4j.version>4.6.0</knife4j.version>
         <!-- Job 定时任务相关 -->
         <xxl-job.version>2.4.0</xxl-job.version>
         <!-- 服务保障相关 -->
@@ -152,9 +150,40 @@
                 <artifactId>tashow-data-permission</artifactId>
                 <version>${revision}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.tashow.cloud</groupId>
-                <artifactId>tashow-sdk-file</artifactId>
+                <artifactId>tashow-trade-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-module-trade</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-pay-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-sdk-payment</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-member-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-module-pay</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-sdk-payment</artifactId>
                 <version>${revision}</version>
             </dependency>
 
@@ -404,22 +433,6 @@
                 <version>${spring-boot-admin.version}</version>
             </dependency>
 
-
-            <dependency>
-                <groupId>com.github.xingfudeshi</groupId> <!-- TODO 芋艿：https://github.com/xiaoymin/knife4j/issues/874 -->
-                <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
-                <version>${knife4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springdoc</groupId>
-                <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-                <version>${springdoc.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.xiaoymin</groupId> <!-- 接口文档 UI：knife4j【网关专属】 -->
-                <artifactId>knife4j-gateway-spring-boot-starter</artifactId>
-                <version>4.5.0</version> <!-- TODO 芋艿：等 4.5.0 => 4.6.0 -->
-            </dependency>
             <!-- Test 测试相关 -->
             <dependency>
                 <groupId>org.mockito</groupId>

tashow-feign/pom.xml

@@ -14,6 +14,9 @@
         <module>tashow-infra-api</module>
         <module>tashow-system-api</module>
         <module>tashow-product-api</module>
+        <module>tashow-trade-api</module>
+        <module>tashow-pay-api</module>
+        <module>tashow-member-api</module>
     </modules>
 
 </project>

tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/FileApi.java

@@ -9,54 +9,50 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-/**
- * RPC 服务 - 文件
- */
 @FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+/** RPC 服务 - 文件 */
 public interface FileApi {
 
-    String PREFIX = ApiConstants.PREFIX + "/file";
+  String PREFIX = ApiConstants.PREFIX + "/file";
 
-    /**
-     * 保存文件，并返回文件的访问路径
-     *
-     * @param content 文件内容
-     * @return 文件路径
-     */
-    default String createFile(byte[] content) {
-        return createFile(null, null, content);
-    }
+  /**
+   * 保存文件，并返回文件的访问路径
+   *
+   * @param content 文件内容
+   * @return 文件路径
+   */
+  default String createFile(byte[] content) {
+    return createFile(null, null, content);
+  }
 
-    /**
-     * 保存文件，并返回文件的访问路径
-     *
-     * @param path    文件路径
-     * @param content 文件内容
-     * @return 文件路径
-     */
-    default String createFile(String path, byte[] content) {
-        return createFile(null, path, content);
-    }
+  /**
+   * 保存文件，并返回文件的访问路径
+   *
+   * @param path 文件路径
+   * @param content 文件内容
+   * @return 文件路径
+   */
+  default String createFile(String path, byte[] content) {
+    return createFile(null, path, content);
+  }
 
-    /**
-     * 保存文件，并返回文件的访问路径
-     *
-     * @param name    原文件名称
-     * @param path    文件路径
-     * @param content 文件内容
-     * @return 文件路径
-     */
-    default String createFile(
-            @RequestParam("name") String name,
-            @RequestParam("path") String path,
-            @RequestParam("content") byte[] content) {
-        return createFile(new FileCreateReqDTO().setName(name).setPath(path).setContent(content))
-                .getCheckedData();
-    }
+  /**
+   * 保存文件，并返回文件的访问路径
+   *
+   * @param name 原文件名称
+   * @param path 文件路径
+   * @param content 文件内容
+   * @return 文件路径
+   */
+  default String createFile(
+      @RequestParam("name") String name,
+      @RequestParam("path") String path,
+      @RequestParam("content") byte[] content) {
+    return createFile(new FileCreateReqDTO().setName(name).setPath(path).setContent(content))
+        .getCheckedData();
+  }
 
-    /**
-     * 保存文件，并返回文件的访问路径
-     */
-    @PostMapping(PREFIX + "/create")
-    CommonResult<String> createFile(@Valid @RequestBody FileCreateReqDTO createReqDTO);
+  @PostMapping(PREFIX + "/create")
+  /** 保存文件，并返回文件的访问路径 */
+  CommonResult<String> createFile(@Valid @RequestBody FileCreateReqDTO createReqDTO);
 }

tashow-feign/tashow-member-api/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.tashow.cloud</groupId>
+        <artifactId>tashow-feign</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tashow-member-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        member 模块 API，暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-common</artifactId>
+        </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/api/address/MemberAddressApi.java

@@ -0,0 +1,36 @@
+package com.tashow.cloud.memberapi.api.address;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.memberapi.api.address.dto.MemberAddressRespDTO;
+import com.tashow.cloud.memberapi.enums.ApiConstants;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * RPC 服务 - 用户收件地址
+ */
+@FeignClient(name = ApiConstants.NAME)
+public interface MemberAddressApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/address";
+
+    /**
+     * 获得用户收件地址
+     * @param id 收件地址编号
+     * @param userId 用户编号
+     * @return
+     */
+    @GetMapping(PREFIX + "/get")
+    CommonResult<MemberAddressRespDTO> getAddress(@RequestParam("id") Long id,
+                                                  @RequestParam("userId") Long userId);
+
+    /**
+     * 获得用户默认收件地址
+     * @param userId 用户编号
+     * @return
+     */
+    @GetMapping(PREFIX + "/get-default")
+    CommonResult<MemberAddressRespDTO> getDefaultAddress(@RequestParam("userId") Long userId);
+
+}

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/api/address/dto/MemberAddressRespDTO.java

@@ -0,0 +1,32 @@
+package com.tashow.cloud.memberapi.api.address.dto;
+
+import lombok.Data;
+
+/**
+ * RPC 服务 - 用户收件地址 Response DTO
+ */
+@Data
+public class MemberAddressRespDTO {
+
+    //编号
+    private Long id;
+
+    //用户编号
+    private Long userId;
+
+    //收件人名称
+    private String name;
+
+    //手机号
+    private String mobile;
+
+    //地区编号
+    private Integer areaId;
+
+    //收件详细地址
+    private String detailAddress;
+
+    //是否默认
+    private Boolean defaultStatus;
+
+}

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/api/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * member API 包，定义暴露给其它模块的 API
+ */
+package com.tashow.cloud.memberapi.api;

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/api/user/MemberUserApi.java

@@ -0,0 +1,76 @@
+package com.tashow.cloud.memberapi.api.user;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.memberapi.api.user.dto.MemberUserRespDTO;
+import com.tashow.cloud.memberapi.enums.ApiConstants;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import static com.tashow.cloud.common.util.collection.CollectionUtils.convertMap;
+
+/**
+ * RPC 服务 - 会员用户
+ */
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+public interface MemberUserApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/user";
+
+
+    /**
+     * 获得会员用户 Map
+     *
+     * @param ids 用户编号的数组
+     * @return 会员用户 Map
+     */
+    default Map<Long, MemberUserRespDTO> getUserMap(Collection<Long> ids) {
+        List<MemberUserRespDTO> list = getUserList(ids).getCheckedData();
+        return convertMap(list, MemberUserRespDTO::getId);
+    }
+
+    /**
+     * 获得会员用户信息
+     * @param id 编号
+     * @return
+     */
+    @GetMapping(PREFIX + "/get")
+    CommonResult<MemberUserRespDTO> getUser(@RequestParam("id") Long id);
+
+    /**
+     * 获得会员用户信息们
+     * @param ids 用户编号的数组
+     * @return
+     */
+    @GetMapping(PREFIX + "/list")
+    CommonResult<List<MemberUserRespDTO>> getUserList(@RequestParam("ids") Collection<Long> ids);
+
+    /**
+     * 基于用户昵称，模糊匹配用户列表
+     * @param nickname 用户昵称，模糊匹配
+     * @return
+     */
+    @GetMapping(PREFIX + "/list-by-nickname")
+    CommonResult<List<MemberUserRespDTO>> getUserListByNickname(@RequestParam("nickname") String nickname);
+
+    /**
+     * 基于手机号，精准匹配用户
+     * @param mobile 基于手机号，精准匹配用户
+     * @return
+     */
+    @GetMapping(PREFIX + "/get-by-mobile")
+    CommonResult<MemberUserRespDTO> getUserByMobile(@RequestParam("mobile") String mobile);
+
+    /**
+     * 校验用户是否存在
+     * @param id 用户编号
+     * @return
+     */
+    @GetMapping(PREFIX + "/valid")
+    CommonResult<Boolean> validateUser(@RequestParam("id") Long id);
+
+}

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/api/user/dto/MemberUserRespDTO.java

@@ -0,0 +1,31 @@
+package com.tashow.cloud.memberapi.api.user.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * RPC 服务 - 用户信息 Response DTO
+ */
+@Data
+public class MemberUserRespDTO {
+
+    //用户编号
+    private Long id;
+
+    //昵称
+    private String nickname;
+
+    //帐号状态
+    private Integer status; // 参见 CommonStatusEnum 枚举
+
+    //用户头像
+    private String avatar;
+
+    //手机号
+    private String mobile;
+
+    //创建时间
+    private LocalDateTime createTime;
+
+}

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/enums/ApiConstants.java

@@ -0,0 +1,24 @@
+package com.tashow.cloud.memberapi.enums;
+
+
+import com.tashow.cloud.common.enums.RpcConstants;
+
+/**
+ * API 相关的枚举
+ *
+ * @author 芋道源码
+ */
+public class ApiConstants {
+
+    /**
+     * 服务名
+     *
+     * 注意，需要保证和 spring.application.name 保持一致
+     */
+    public static final String NAME = "member-server";
+
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/member";
+
+    public static final String VERSION = "1.0.0";
+
+}

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/enums/DictTypeConstants.java

@@ -0,0 +1,15 @@
+package com.tashow.cloud.memberapi.enums;
+
+/**
+ * Member 字典类型的枚举类
+ *
+ * @author owen
+ */
+public interface DictTypeConstants {
+
+    /**
+     * 会员经验记录 - 业务类型
+     */
+    String MEMBER_EXPERIENCE_BIZ_TYPE = "member_experience_biz_type";
+
+}

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/enums/ErrorCodeConstants.java

@@ -0,0 +1,59 @@
+package com.tashow.cloud.memberapi.enums;
+
+
+import com.tashow.cloud.common.exception.ErrorCode;
+
+/**
+ * Member 错误码枚举类
+ * <p>
+ * member 系统，使用 1-004-000-000 段
+ */
+public interface ErrorCodeConstants {
+
+    // ========== 用户相关  1-004-001-000 ============
+    ErrorCode USER_NOT_EXISTS = new ErrorCode(1_004_001_000, "用户不存在");
+    ErrorCode USER_MOBILE_NOT_EXISTS = new ErrorCode(1_004_001_001, "手机号未注册用户");
+    ErrorCode USER_MOBILE_USED = new ErrorCode(1_004_001_002, "修改手机失败，该手机号({})已经被使用");
+    ErrorCode USER_POINT_NOT_ENOUGH = new ErrorCode(1_004_001_003, "用户积分余额不足");
+
+    // ========== AUTH 模块 1-004-003-000 ==========
+    ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1_004_003_000, "登录失败，账号密码不正确");
+    ErrorCode AUTH_LOGIN_USER_DISABLED = new ErrorCode(1_004_003_001, "登录失败，账号被禁用");
+    ErrorCode AUTH_SOCIAL_USER_NOT_FOUND = new ErrorCode(1_004_003_005, "登录失败，解析不到三方登录信息");
+    ErrorCode AUTH_MOBILE_USED = new ErrorCode(1_004_003_007, "手机号已经被使用");
+
+    // ========== 用户收件地址 1-004-004-000 ==========
+    ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1_004_004_000, "用户收件地址不存在");
+
+    //========== 用户标签 1-004-006-000 ==========
+    ErrorCode TAG_NOT_EXISTS = new ErrorCode(1_004_006_000, "用户标签不存在");
+    ErrorCode TAG_NAME_EXISTS = new ErrorCode(1_004_006_001, "用户标签已经存在");
+    ErrorCode TAG_HAS_USER = new ErrorCode(1_004_006_002, "用户标签下存在用户，无法删除");
+
+    //========== 积分配置 1-004-007-000 ==========
+
+    //========== 积分记录 1-004-008-000 ==========
+    ErrorCode POINT_RECORD_BIZ_NOT_SUPPORT = new ErrorCode(1_004_008_000, "用户积分记录业务类型不支持");
+
+    //========== 签到配置 1-004-009-000 ==========
+    ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1_004_009_000, "签到天数规则不存在");
+    ErrorCode SIGN_IN_CONFIG_EXISTS = new ErrorCode(1_004_009_001, "签到天数规则已存在");
+
+    //========== 签到配置 1-004-010-000 ==========
+    ErrorCode SIGN_IN_RECORD_TODAY_EXISTS = new ErrorCode(1_004_010_000, "今日已签到，请勿重复签到");
+
+    //========== 用户等级 1-004-011-000 ==========
+    ErrorCode LEVEL_NOT_EXISTS = new ErrorCode(1_004_011_000, "用户等级不存在");
+    ErrorCode LEVEL_NAME_EXISTS = new ErrorCode(1_004_011_001, "用户等级名称[{}]已被使用");
+    ErrorCode LEVEL_VALUE_EXISTS = new ErrorCode(1_004_011_002, "用户等级值[{}]已被[{}]使用");
+    ErrorCode LEVEL_EXPERIENCE_MIN = new ErrorCode(1_004_011_003, "升级经验必须大于上一个等级[{}]设置的升级经验[{}]");
+    ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1_004_011_004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]");
+    ErrorCode LEVEL_HAS_USER = new ErrorCode(1_004_011_005, "用户等级下存在用户，无法删除");
+
+    ErrorCode EXPERIENCE_BIZ_NOT_SUPPORT = new ErrorCode(1_004_011_201, "用户经验业务类型不支持");
+
+    //========== 用户分组 1-004-012-000 ==========
+    ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1_004_012_000, "用户分组不存在");
+    ErrorCode GROUP_HAS_USER = new ErrorCode(1_004_012_001, "用户分组下存在用户，无法删除");
+
+}

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/enums/MemberExperienceBizTypeEnum.java

@@ -0,0 +1,51 @@
+package com.tashow.cloud.memberapi.enums;
+
+import cn.hutool.core.util.EnumUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * 会员经验 - 业务类型
+ *
+ * @author owen
+ */
+@Getter
+@AllArgsConstructor
+public enum MemberExperienceBizTypeEnum {
+
+    /**
+     * 管理员调整、邀请新用户、下单、退单、签到、抽奖
+     */
+    ADMIN(0, "管理员调整", "管理员调整获得 {} 经验", true),
+    INVITE_REGISTER(1, "邀新奖励", "邀请好友获得 {} 经验", true),
+    SIGN_IN(4, "签到奖励", "签到获得 {} 经验", true),
+    LOTTERY(5, "抽奖奖励", "抽奖获得 {} 经验", true),
+    ORDER_GIVE(11, "下单奖励", "下单获得 {} 经验", true),
+    ORDER_GIVE_CANCEL(12, "下单奖励（整单取消）", "取消订单获得 {} 经验", false), // ORDER_GIVE 的取消
+    ORDER_GIVE_CANCEL_ITEM(13, "下单奖励（单个退款）", "退款订单获得 {} 经验", false), // ORDER_GIVE 的取消
+    ;
+
+    /**
+     * 业务类型
+     */
+    private final int type;
+    /**
+     * 标题
+     */
+    private final String title;
+    /**
+     * 描述
+     */
+    private final String description;
+    /**
+     * 是否为扣减积分
+     */
+    private final boolean add;
+
+    public static MemberExperienceBizTypeEnum getByType(Integer type) {
+        return EnumUtil.getBy(MemberExperienceBizTypeEnum.class,
+                e -> Objects.equals(type, e.getType()));
+    }
+}

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/enums/point/MemberPointBizTypeEnum.java

@@ -0,0 +1,58 @@
+package com.tashow.cloud.memberapi.enums.point;
+
+import cn.hutool.core.util.EnumUtil;
+import com.tashow.cloud.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * 会员积分的业务类型枚举
+ *
+ * @author 芋道源码
+ */
+@AllArgsConstructor
+@Getter
+public enum MemberPointBizTypeEnum implements ArrayValuable<Integer> {
+
+    SIGN(1, "签到", "签到获得 {} 积分", true),
+    ADMIN(2, "管理员修改", "管理员修改 {} 积分", true),
+
+    ORDER_USE(11, "订单积分抵扣", "下单使用 {} 积分", false), // 下单时，扣减积分
+    ORDER_USE_CANCEL(12, "订单积分抵扣（整单取消）", "订单取消，退还 {} 积分", true), // ORDER_USE 的取消
+    ORDER_USE_CANCEL_ITEM(13, "订单积分抵扣（单个退款）", "订单退款，退还 {} 积分", true), // ORDER_USE 的取消
+
+    ORDER_GIVE(21, "订单积分奖励", "下单获得 {} 积分", true), // 支付订单时，赠送积分
+    ORDER_GIVE_CANCEL(22, "订单积分奖励（整单取消）", "订单取消，退还 {} 积分", false), // ORDER_GIVE 的取消
+    ORDER_GIVE_CANCEL_ITEM(23, "订单积分奖励（单个退款）", "订单退款，扣除赠送的 {} 积分", false) // ORDER_GIVE 的取消
+    ;
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+    /**
+     * 名字
+     */
+    private final String name;
+    /**
+     * 描述
+     */
+    private final String description;
+    /**
+     * 是否为扣减积分
+     */
+    private final boolean add;
+
+    @Override
+    public Integer[] array() {
+        return new Integer[0];
+    }
+
+    public static MemberPointBizTypeEnum getByType(Integer type) {
+        return EnumUtil.getBy(MemberPointBizTypeEnum.class,
+                e -> Objects.equals(type, e.getType()));
+    }
+
+}

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/message/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 消息队列的消息
+ */
+package com.tashow.cloud.memberapi.message;

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/message/user/MemberUserCreateMessage.java

@@ -0,0 +1,21 @@
+package com.tashow.cloud.memberapi.message.user;
+
+import lombok.Data;
+
+import jakarta.validation.constraints.NotNull;
+
+/**
+ * 会员用户创建消息
+ *
+ * @author owen
+ */
+@Data
+public class MemberUserCreateMessage {
+
+    /**
+     * 用户编号
+     */
+    @NotNull(message = "用户编号不能为空")
+    private Long userId;
+
+}

tashow-feign/tashow-pay-api/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.tashow.cloud</groupId>
+        <artifactId>tashow-feign</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tashow-pay-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        pay 模块 API，暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-common</artifactId>
+        </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-sdk-payment</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/notify/dto/PayOrderNotifyReqDTO.java

@@ -0,0 +1,33 @@
+package com.tashow.cloud.payapi.api.notify.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 支付单的通知 Request DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PayOrderNotifyReqDTO {
+
+    /**
+     * 商户订单编号
+     */
+    @NotEmpty(message = "商户订单号不能为空")
+    private String merchantOrderId;
+
+    /**
+     * 支付订单编号
+     */
+    @NotNull(message = "支付订单编号不能为空")
+    private Long payOrderId;
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/notify/dto/PayRefundNotifyReqDTO.java

@@ -0,0 +1,33 @@
+package com.tashow.cloud.payapi.api.notify.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 退款单的通知 Request DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PayRefundNotifyReqDTO {
+
+    /**
+     * 商户退款单编号
+     */
+    @NotEmpty(message = "商户退款单编号不能为空")
+    private String merchantOrderId;
+
+    /**
+     * 支付退款编号
+     */
+    @NotNull(message = "支付退款编号不能为空")
+    private Long payRefundId;
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/notify/dto/PayTransferNotifyReqDTO.java

@@ -0,0 +1,26 @@
+package com.tashow.cloud.payapi.api.notify.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 转账单的通知 Request DTO
+ *
+ * @author jason
+ */
+@Data
+public class PayTransferNotifyReqDTO {
+
+    /**
+     * 商户转账单号
+     */
+    @NotEmpty(message = "商户转账单号不能为空")
+    private String merchantTransferId;
+
+    /**
+     * 转账订单编号
+     */
+    @NotNull(message = "转账订单编号不能为空")
+    private Long payTransferId;
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/order/PayOrderApi.java

@@ -0,0 +1,39 @@
+package com.tashow.cloud.payapi.api.order;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.payapi.api.order.dto.PayOrderCreateReqDTO;
+import com.tashow.cloud.payapi.enums.ApiConstants;
+import com.tashow.cloud.sdk.payment.dto.order.PayOrderRespDTO;
+import jakarta.annotation.security.PermitAll;
+import jakarta.validation.Valid;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * RPC 服务 - 支付单
+ */
+@FeignClient(name = ApiConstants.NAME) //
+public interface PayOrderApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/order";
+
+    /*创建支付单*/
+    @PostMapping(PREFIX + "/create")
+    CommonResult<Long> createOrder(@Valid @RequestBody PayOrderCreateReqDTO reqDTO);
+
+    /*获得支付单*/
+    @GetMapping(PREFIX + "/get")
+    @PermitAll
+    CommonResult<PayOrderRespDTO> getOrder(@RequestParam("id") Long id);
+
+    /**
+     * 更新支付订单价格
+     * @param id 支付单编号
+     * @param payPrice 支付单价格
+     * @return
+     */
+    @PutMapping(PREFIX + "/update-price")
+    CommonResult<Boolean> updatePayOrderPrice(@RequestParam("id") Long id ,//支付单编号
+                                              @RequestParam("payPrice") Integer payPrice);
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/order/dto/PayOrderCreateReqDTO.java

@@ -0,0 +1,65 @@
+package com.tashow.cloud.payapi.api.order.dto;
+
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 支付单创建 Request DTO
+ */
+@Data
+public class PayOrderCreateReqDTO implements Serializable {
+
+    public static final int SUBJECT_MAX_LENGTH = 32;
+
+    /**
+     * 应用标识
+     */
+    @NotNull(message = "应用标识不能为空")
+    private String appKey;
+    /**
+     * 用户 IP
+     */
+    @NotEmpty(message = "用户 IP 不能为空")
+    private String userIp;
+
+    // ========== 商户相关字段 ==========
+
+    /**
+     * 商户订单编号
+     */
+    @NotEmpty(message = "商户订单编号不能为空")
+    private String merchantOrderId;
+    /**
+     * 商品标题
+     */
+    @NotEmpty(message = "商品标题不能为空")
+    @Length(max = SUBJECT_MAX_LENGTH, message = "商品标题不能超过 32")
+    private String subject;
+    /**
+     * 商品描述
+     */
+    @Length(max = 128, message = "商品描述信息长度不能超过128")
+    private String body;
+
+    // ========== 订单相关字段 ==========
+
+    /**
+     * 支付金额，单位：分
+     */
+    @NotNull(message = "支付金额不能为空")
+    @DecimalMin(value = "0", inclusive = false, message = "支付金额必须大于零")
+    private Integer price;
+
+    /**
+     * 支付过期时间
+     */
+    @NotNull(message = "支付过期时间不能为空")
+    private LocalDateTime expireTime;
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/order/dto/PayOrderRespDTO.java

@@ -0,0 +1,46 @@
+package com.tashow.cloud.payapi.api.order.dto;
+
+import com.tashow.cloud.payapi.enums.order.PayOrderStatusEnum;
+import lombok.Data;
+
+/**
+ * 支付单信息 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class PayOrderRespDTO {
+
+    /**
+     * 订单编号，数据库自增
+     */
+    private Long id;
+    /**
+     * 渠道编码
+     *
+     * 枚举 PayChannelEnum
+     */
+    private String channelCode;
+
+    // ========== 商户相关字段 ==========
+    /**
+     * 商户订单编号
+     * 例如说，内部系统 A 的订单号。需要保证每个 PayMerchantDO 唯一
+     */
+    private String merchantOrderId;
+
+    // ========== 订单相关字段 ==========
+    /**
+     * 支付金额，单位：分
+     */
+    private Integer price;
+    /**
+     * 支付状态
+     *
+     * 枚举 {@link PayOrderStatusEnum}
+     */
+    private Integer status;
+
+    // ========== 渠道相关字段 ==========
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/refund/PayRefundApi.java

@@ -0,0 +1,38 @@
+package com.tashow.cloud.payapi.api.refund;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.payapi.api.refund.dto.PayRefundCreateReqDTO;
+import com.tashow.cloud.payapi.api.refund.dto.PayRefundRespDTO;
+import com.tashow.cloud.payapi.enums.ApiConstants;
+import jakarta.validation.Valid;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * RPC 服务 - 退款单
+ */
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+public interface PayRefundApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/refund";
+
+    /**
+     * 创建退款单
+     * @param reqDTO
+     * @return
+     */
+    @PostMapping(PREFIX + "/create")
+    CommonResult<Long> createRefund(@Valid @RequestBody PayRefundCreateReqDTO reqDTO);
+
+    /**
+     * 获得退款单
+     * @param id 退款单编号
+     * @return
+     */
+    @GetMapping(PREFIX + "/get")
+    CommonResult<PayRefundRespDTO> getRefund(@RequestParam("id") Long id);
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/refund/dto/PayRefundCreateReqDTO.java

@@ -0,0 +1,57 @@
+package com.tashow.cloud.payapi.api.refund.dto;
+
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 退款单创建 Request DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class PayRefundCreateReqDTO {
+
+    /**
+     * 应用标识
+     */
+    @NotNull(message = "应用标识不能为空")
+    private String appKey;
+    /**
+     * 用户 IP
+     */
+    @NotEmpty(message = "用户 IP 不能为空")
+    private String userIp;
+
+    // ========== 商户相关字段 ==========
+    /**
+     * 商户订单编号
+     */
+    @NotEmpty(message = "商户订单编号不能为空")
+    private String merchantOrderId;
+
+    /**
+     * 商户退款编号
+     */
+    @NotEmpty(message = "商户退款编号不能为空")
+    private String merchantRefundId;
+
+    /**
+     * 退款描述
+     */
+    @NotEmpty(message = "退款描述不能为空")
+    @Length(max = 128, message = "退款描述长度不能超过 128")
+    private String reason;
+
+    // ========== 订单相关字段 ==========
+
+    /**
+     * 退款金额，单位：分
+     */
+    @NotNull(message = "退款金额不能为空")
+    @Min(value = 1, message = "退款金额必须大于零")
+    private Integer price;
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/refund/dto/PayRefundRespDTO.java

@@ -0,0 +1,43 @@
+package com.tashow.cloud.payapi.api.refund.dto;
+
+import com.tashow.cloud.payapi.enums.refund.PayRefundStatusEnum;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 退款单信息 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class PayRefundRespDTO {
+
+    /**
+     * 退款单编号
+     */
+    private Long id;
+
+    // ========== 退款相关字段 ==========
+    /**
+     * 退款状态
+     *
+     * 枚举 {@link PayRefundStatusEnum}
+     */
+    private Integer status;
+    /**
+     * 退款金额，单位：分
+     */
+    private Integer refundPrice;
+
+    // ========== 商户相关字段 ==========
+    /**
+     * 商户订单编号
+     */
+    private String merchantOrderId;
+    /**
+     * 退款成功时间
+     */
+    private LocalDateTime successTime;
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/transfer/PayTransferApi.java

@@ -0,0 +1,38 @@
+package com.tashow.cloud.payapi.api.transfer;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.payapi.api.transfer.dto.PayTransferCreateReqDTO;
+import com.tashow.cloud.payapi.enums.ApiConstants;
+import com.tashow.cloud.sdk.payment.dto.transfer.PayTransferRespDTO;
+import jakarta.validation.Valid;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * RPC 服务 - 转账单
+ */
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+public interface PayTransferApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/transfer";
+
+    /**
+     * 创建转账单
+     * @param reqDTO
+     * @return
+     */
+    @PostMapping(PREFIX + "/create")
+    CommonResult<Long> createTransfer(@Valid @RequestBody PayTransferCreateReqDTO reqDTO);
+
+    /**
+     * 获得转账单
+     * @param id 转账单编号
+     * @return
+     */
+    @GetMapping(PREFIX + "/get")
+    CommonResult<PayTransferRespDTO> getTransfer(@RequestParam("id") Long id);
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/transfer/dto/PayTransferCreateReqDTO.java

@@ -0,0 +1,77 @@
+package com.tashow.cloud.payapi.api.transfer.dto;
+
+import com.tashow.cloud.common.validation.InEnum;
+import com.tashow.cloud.sdk.payment.enums.transfer.PayTransferTypeEnum;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * 转账单创建 Request DTO
+ *
+ * @author jason
+ */
+@Data
+public class PayTransferCreateReqDTO {
+
+    /**
+     * 应用标识
+     */
+    @NotNull(message = "应用标识不能为空")
+    private String appKey;
+
+    @NotEmpty(message = "转账渠道不能为空")
+    private String channelCode;
+
+    /**
+     * 转账渠道的额外参数
+     */
+    private Map<String, String> channelExtras;
+
+    @NotEmpty(message = "用户 IP 不能为空")
+    private String userIp;
+
+    /**
+     * 类型
+     */
+    @NotNull(message = "转账类型不能为空")
+    @InEnum(PayTransferTypeEnum.class)
+    private Integer type;
+
+
+    /**
+     * 商户转账单编号
+     */
+    @NotEmpty(message = "商户转账单编号能为空")
+    private String merchantTransferId;
+
+    /**
+     * 转账金额，单位：分
+     */
+    @Min(value = 1, message = "转账金额必须大于零")
+    @NotNull(message = "转账金额不能为空")
+    private Integer price;
+
+    /**
+     * 转账标题
+     */
+    @NotEmpty(message = "转账标题不能为空")
+    private String subject;
+
+    /**
+     * 收款人姓名
+     */
+    @NotBlank(message = "收款人姓名不能为空", groups = {PayTransferTypeEnum.Alipay.class})
+    private String userName;
+
+    @NotBlank(message = "支付宝登录号不能为空", groups = {PayTransferTypeEnum.Alipay.class})
+    private String alipayLogonId;
+
+    // ========== 微信转账相关字段 ==========
+    @NotBlank(message = "微信 openId 不能为空", groups = {PayTransferTypeEnum.WxPay.class})
+    private String openid;
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/transfer/dto/PayTransferRespDTO.java

@@ -0,0 +1,31 @@
+package com.tashow.cloud.payapi.api.transfer.dto;
+
+import com.tashow.cloud.payapi.enums.transfer.PayTransferStatusEnum;
+import lombok.Data;
+
+@Data
+public class PayTransferRespDTO {
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 转账单号
+     */
+    private String no;
+
+    /**
+     * 转账金额，单位：分
+     */
+    private Integer price;
+
+    /**
+     * 转账状态
+     *
+     * 枚举 {@link PayTransferStatusEnum}
+     */
+    private Integer status;
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/wallet/PayWalletApi.java

@@ -0,0 +1,27 @@
+package com.tashow.cloud.payapi.api.wallet;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.payapi.api.wallet.dto.PayWalletAddBalanceReqDTO;
+import com.tashow.cloud.payapi.enums.ApiConstants;
+import jakarta.validation.Valid;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * RPC 服务 - 钱包
+ */
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+public interface PayWalletApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/wallet";
+
+    /**
+     * 添加钱包余额
+     * @param reqDTO
+     * @return
+     */
+    @PostMapping(PREFIX + "/add-balance")
+    CommonResult<Boolean> addWalletBalance(@Valid @RequestBody PayWalletAddBalanceReqDTO reqDTO);
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/api/wallet/dto/PayWalletAddBalanceReqDTO.java

@@ -0,0 +1,49 @@
+package com.tashow.cloud.payapi.api.wallet.dto;
+
+import com.tashow.cloud.common.enums.UserTypeEnum;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 钱包余额增加 Request DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class PayWalletAddBalanceReqDTO {
+
+    /**
+     * 用户编号
+     *
+     * 关联 MemberUserDO 的 id 属性，或者 AdminUserDO 的 id 属性
+     */
+    @NotNull(message = "用户编号不能为空")
+    private Long userId;
+    /**
+     * 用户类型
+     *
+     * 关联 {@link  UserTypeEnum}
+     */
+    @NotNull(message = "用户类型不能为空")
+    private Integer userType;
+
+    /**
+     * 关联业务分类
+     */
+    @NotNull(message = "关联业务分类不能为空")
+    private Integer bizType;
+    /**
+     * 关联业务编号
+     */
+    @NotNull(message = "关联业务编号不能为空")
+    private String bizId;
+
+    /**
+     * 交易金额，单位分
+     *
+     * 正值表示余额增加，负值表示余额减少
+     */
+    @NotNull(message = "交易金额不能为空")
+    private Integer price;
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/ApiConstants.java

@@ -0,0 +1,24 @@
+package com.tashow.cloud.payapi.enums;
+
+
+import com.tashow.cloud.common.enums.RpcConstants;
+
+/**
+ * API 相关的枚举
+ *
+ * @author 芋道源码
+ */
+public class ApiConstants {
+
+    /**
+     * 服务名
+     *
+     * 注意，需要保证和 spring.application.name 保持一致
+     */
+    public static final String NAME = "pay-server";
+
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/pay";
+
+    public static final String VERSION = "1.0.0";
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/DictTypeConstants.java

@@ -0,0 +1,18 @@
+package com.tashow.cloud.payapi.enums;
+
+/**
+ * Pay 字典类型的枚举类
+ *
+ * @author 芋道源码
+ */
+public interface DictTypeConstants {
+
+    String CHANNEL_CODE = "pay_channel_code"; // 支付渠道编码
+
+    String ORDER_STATUS = "pay_order_status"; // 支付渠道
+
+    String REFUND_STATUS = "pay_order_status"; // 退款状态
+
+    String NOTIFY_STATUS = "pay_notify_status"; // 回调状态
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/ErrorCodeConstants.java

@@ -0,0 +1,94 @@
+package com.tashow.cloud.payapi.enums;
+
+
+import com.tashow.cloud.common.exception.ErrorCode;
+
+/**
+ * Pay 错误码 Core 枚举类
+ *
+ * pay 系统，使用 1-007-000-000 段
+ */
+public interface ErrorCodeConstants {
+
+    // ========== APP 模块 1-007-000-000 ==========
+    ErrorCode APP_NOT_FOUND = new ErrorCode(1_007_000_000, "App 不存在");
+    ErrorCode APP_IS_DISABLE = new ErrorCode(1_007_000_002, "App 已经被禁用");
+    ErrorCode APP_EXIST_ORDER_CANT_DELETE =  new ErrorCode(1_007_000_003, "支付应用存在支付订单，无法删除");
+    ErrorCode APP_EXIST_REFUND_CANT_DELETE =  new ErrorCode(1_007_000_004, "支付应用存在退款订单，无法删除");
+    ErrorCode APP_KEY_EXISTS = new ErrorCode(1_007_000_005, "支付应用标识已经存在");
+
+    // ========== CHANNEL 模块 1-007-001-000 ==========
+    ErrorCode CHANNEL_NOT_FOUND = new ErrorCode(1_007_001_000, "支付渠道的配置不存在");
+    ErrorCode CHANNEL_IS_DISABLE = new ErrorCode(1_007_001_001, "支付渠道已经禁用");
+    ErrorCode CHANNEL_EXIST_SAME_CHANNEL_ERROR = new ErrorCode(1_007_001_004, "已存在相同的渠道");
+
+    // ========== ORDER 模块 1-007-002-000 ==========
+    ErrorCode PAY_ORDER_NOT_FOUND = new ErrorCode(1_007_002_000, "支付订单不存在");
+    ErrorCode PAY_ORDER_STATUS_IS_NOT_WAITING = new ErrorCode(1_007_002_001, "支付订单不处于待支付");
+    ErrorCode PAY_ORDER_STATUS_IS_SUCCESS = new ErrorCode(1_007_002_002, "订单已支付，请刷新页面");
+    ErrorCode PAY_ORDER_IS_EXPIRED = new ErrorCode(1_007_002_003, "支付订单已经过期");
+    ErrorCode PAY_ORDER_SUBMIT_CHANNEL_ERROR = new ErrorCode(1_007_002_004, "发起支付报错，错误码：{}，错误提示：{}");
+    ErrorCode PAY_ORDER_REFUND_FAIL_STATUS_ERROR = new ErrorCode(1_007_002_005, "支付订单退款失败，原因：状态不是已支付或已退款");
+
+    // ========== ORDER 模块(拓展单) 1-007-003-000 ==========
+    ErrorCode PAY_ORDER_EXTENSION_NOT_FOUND = new ErrorCode(1_007_003_000, "支付交易拓展单不存在");
+    ErrorCode PAY_ORDER_EXTENSION_STATUS_IS_NOT_WAITING = new ErrorCode(1_007_003_001, "支付交易拓展单不处于待支付");
+    ErrorCode PAY_ORDER_EXTENSION_IS_PAID = new ErrorCode(1_007_003_002, "订单已支付，请等待支付结果");
+
+    // ========== 支付模块(退款) 1-007-006-000 ==========
+    ErrorCode REFUND_PRICE_EXCEED = new ErrorCode(1_007_006_000, "退款金额超过订单可退款金额");
+    ErrorCode REFUND_HAS_REFUNDING = new ErrorCode(1_007_006_002, "已经有退款在处理中");
+    ErrorCode REFUND_EXISTS = new ErrorCode(1_007_006_003, "已经存在退款单");
+    ErrorCode REFUND_NOT_FOUND = new ErrorCode(1_007_006_004, "支付退款单不存在");
+    ErrorCode REFUND_STATUS_IS_NOT_WAITING = new ErrorCode(1_007_006_005, "支付退款单不处于待退款");
+
+    // ========== 钱包模块 1-007-007-000 ==========
+    ErrorCode WALLET_NOT_FOUND = new ErrorCode(1_007_007_000, "用户钱包不存在");
+    ErrorCode WALLET_BALANCE_NOT_ENOUGH = new ErrorCode(1_007_007_001, "钱包余额不足");
+    ErrorCode WALLET_TRANSACTION_NOT_FOUND = new ErrorCode(1_007_007_002, "未找到对应的钱包交易");
+    ErrorCode WALLET_REFUND_EXIST = new ErrorCode(1_007_007_003, "已经存在钱包退款");
+    ErrorCode WALLET_FREEZE_PRICE_NOT_ENOUGH = new ErrorCode(1_007_007_004, "钱包冻结余额不足");
+
+    // ========== 钱包充值模块 1-007-008-000 ==========
+    ErrorCode WALLET_RECHARGE_NOT_FOUND = new ErrorCode(1_007_008_000, "钱包充值记录不存在");
+    ErrorCode WALLET_RECHARGE_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1_007_008_001, "钱包充值更新支付状态失败，钱包充值记录不是【未支付】状态");
+    ErrorCode WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_ID_ERROR = new ErrorCode(1_007_008_002, "钱包充值更新支付状态失败，支付单编号不匹配");
+    ErrorCode WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_STATUS_NOT_SUCCESS = new ErrorCode(1_007_008_003, "钱包充值更新支付状态失败，支付单状态不是【支付成功】状态");
+    ErrorCode WALLET_RECHARGE_UPDATE_PAID_PAY_PRICE_NOT_MATCH = new ErrorCode(1_007_008_004, "钱包充值更新支付状态失败，支付单金额不匹配");
+    ErrorCode WALLET_RECHARGE_REFUND_FAIL_NOT_PAID = new ErrorCode(1_007_008_005, "钱包发起退款失败，钱包充值订单未支付");
+    ErrorCode WALLET_RECHARGE_REFUND_FAIL_REFUNDED = new ErrorCode(1_007_008_006, "钱包发起退款失败，钱包充值订单已退款");
+    ErrorCode WALLET_RECHARGE_REFUND_BALANCE_NOT_ENOUGH = new ErrorCode(1_007_008_007, "钱包发起退款失败，钱包余额不足");
+    ErrorCode WALLET_RECHARGE_REFUND_FAIL_REFUND_ORDER_ID_ERROR = new ErrorCode(1_007_008_008, "钱包退款更新失败，钱包退款单编号不匹配");
+    ErrorCode WALLET_RECHARGE_REFUND_FAIL_REFUND_NOT_FOUND = new ErrorCode(1_007_008_009, "钱包退款更新失败，退款订单不存在");
+    ErrorCode WALLET_RECHARGE_REFUND_FAIL_REFUND_PRICE_NOT_MATCH = new ErrorCode(1_007_008_010, "钱包退款更新失败，退款单金额不匹配");
+    ErrorCode WALLET_RECHARGE_PACKAGE_NOT_FOUND = new ErrorCode(1_007_008_011, "钱包充值套餐不存在");
+    ErrorCode WALLET_RECHARGE_PACKAGE_IS_DISABLE = new ErrorCode(1_007_008_012, "钱包充值套餐已禁用");
+    ErrorCode WALLET_RECHARGE_PACKAGE_NAME_EXISTS = new ErrorCode(1_007_008_013, "钱包充值套餐名称已存在");
+
+    // ========== 转账模块 1-007-009-000 ==========
+    ErrorCode PAY_TRANSFER_SUBMIT_CHANNEL_ERROR = new ErrorCode(1_007_009_000, "发起转账报错，错误码：{}，错误提示：{}");
+    ErrorCode PAY_TRANSFER_NOT_FOUND = new ErrorCode(1_007_009_001, "转账单不存在");
+    ErrorCode PAY_SAME_MERCHANT_TRANSFER_TYPE_NOT_MATCH = new ErrorCode(1_007_009_002, "两次相同转账请求的类型不匹配");
+    ErrorCode PAY_SAME_MERCHANT_TRANSFER_PRICE_NOT_MATCH = new ErrorCode(1_007_009_003, "两次相同转账请求的金额不匹配");
+    ErrorCode PAY_MERCHANT_TRANSFER_EXISTS = new ErrorCode(1_007_009_004, "该笔业务的转账已经发起,请查询转账订单相关状态");
+    ErrorCode PAY_TRANSFER_STATUS_IS_NOT_WAITING = new ErrorCode(1_007_009_005, "转账单不处于待转账");
+    ErrorCode PAY_TRANSFER_STATUS_IS_NOT_PENDING = new ErrorCode(1_007_009_006, "转账单不处于待转账或转账中");
+
+    // ========== 示例订单 1-007-900-000 ==========
+    ErrorCode DEMO_ORDER_NOT_FOUND = new ErrorCode(1_007_900_000, "示例订单不存在");
+    ErrorCode DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1_007_900_001, "示例订单更新支付状态失败，订单不是【未支付】状态");
+    ErrorCode DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR = new ErrorCode(1_007_900_002, "示例订单更新支付状态失败，支付单编号不匹配");
+    ErrorCode DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS = new ErrorCode(1_007_900_003, "示例订单更新支付状态失败，支付单状态不是【支付成功】状态");
+    ErrorCode DEMO_ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH = new ErrorCode(1_007_900_004, "示例订单更新支付状态失败，支付单金额不匹配");
+    ErrorCode DEMO_ORDER_REFUND_FAIL_NOT_PAID = new ErrorCode(1_007_900_005, "发起退款失败，示例订单未支付");
+    ErrorCode DEMO_ORDER_REFUND_FAIL_REFUNDED = new ErrorCode(1_007_900_006, "发起退款失败，示例订单已退款");
+    ErrorCode DEMO_ORDER_REFUND_FAIL_REFUND_NOT_FOUND = new ErrorCode(1_007_900_007, "发起退款失败，退款订单不存在");
+    ErrorCode DEMO_ORDER_REFUND_FAIL_REFUND_NOT_SUCCESS = new ErrorCode(1_007_900_008, "发起退款失败，退款订单未退款成功");
+    ErrorCode DEMO_ORDER_REFUND_FAIL_REFUND_ORDER_ID_ERROR = new ErrorCode(1_007_900_009, "发起退款失败，退款单编号不匹配");
+    ErrorCode DEMO_ORDER_REFUND_FAIL_REFUND_PRICE_NOT_MATCH = new ErrorCode(1_007_900_010, "发起退款失败，退款单金额不匹配");
+
+    // ========== 示例转账订单 1-007-901-001 ==========
+    ErrorCode DEMO_TRANSFER_NOT_FOUND = new ErrorCode(1_007_901_001, "示例转账单不存在");
+    ErrorCode DEMO_TRANSFER_FAIL_TRANSFER_ID_ERROR = new ErrorCode(1_007_901_002, "转账失败，转账单编号不匹配");
+    ErrorCode DEMO_TRANSFER_FAIL_PRICE_NOT_MATCH = new ErrorCode(1_007_901_003, "转账失败，转账单金额不匹配");
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/MessageTemplateConstants.java

@@ -0,0 +1,14 @@
+package com.tashow.cloud.payapi.enums;
+
+/**
+ * 通知模板枚举类
+ *
+ * @author HUIHUI
+ */
+public interface MessageTemplateConstants {
+
+    // ======================= 小程序订阅消息 =======================
+
+    String WXA_WALLET_RECHARGER_PAID = "充值成功通知";
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/notify/PayNotifyStatusEnum.java

@@ -0,0 +1,32 @@
+package com.tashow.cloud.payapi.enums.notify;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 支付通知状态枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum PayNotifyStatusEnum {
+
+    WAITING(0, "等待通知"),
+    SUCCESS(10, "通知成功"),
+    FAILURE(20, "通知失败"), // 多次尝试，彻底失败
+    REQUEST_SUCCESS(21, "请求成功，但是结果失败"),
+    REQUEST_FAILURE(22, "请求失败"),
+
+    ;
+
+    /**
+     * 状态
+     */
+    private final Integer status;
+    /**
+     * 名字
+     */
+    private final String name;
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/notify/PayNotifyTypeEnum.java

@@ -0,0 +1,29 @@
+package com.tashow.cloud.payapi.enums.notify;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 支付通知类型
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum PayNotifyTypeEnum {
+
+    ORDER(1, "支付单"),
+    REFUND(2, "退款单"),
+    TRANSFER(3, "转账单")
+    ;
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+    /**
+     * 名字
+     */
+    private final String name;
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/order/PayOrderStatusEnum.java

@@ -0,0 +1,74 @@
+package com.tashow.cloud.payapi.enums.order;
+
+import com.tashow.cloud.common.core.ArrayValuable;
+import com.tashow.cloud.common.util.object.ObjectUtils;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * 支付订单的状态枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum PayOrderStatusEnum implements ArrayValuable<Integer> {
+
+    WAITING(0, "未支付"),
+    SUCCESS(10, "支付成功"),
+    REFUND(20, "已退款"),
+    CLOSED(30, "支付关闭"), // 注意：全部退款后，还是 REFUND 状态
+    ;
+
+    private final Integer status;
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return new Integer[0];
+    }
+
+    /**
+     * 判断是否等待支付
+     *
+     * @param status 状态
+     * @return 是否等待支付
+     */
+    public static boolean isWaiting(Integer status) {
+        return Objects.equals(status, WAITING.getStatus());
+    }
+
+    /**
+     * 判断是否支付成功
+     *
+     * @param status 状态
+     * @return 是否支付成功
+     */
+    public static boolean isSuccess(Integer status) {
+        return Objects.equals(status, SUCCESS.getStatus());
+    }
+
+    /**
+     * 判断是否支付成功或者已退款
+     *
+     * @param status 状态
+     * @return 是否支付成功或者已退款
+     */
+    public static boolean isSuccessOrRefund(Integer status) {
+        return ObjectUtils.equalsAny(status,
+                SUCCESS.getStatus(), REFUND.getStatus());
+    }
+
+    /**
+     * 判断是否支付关闭
+     *
+     * @param status 状态
+     * @return 是否支付关闭
+     */
+    public static boolean isClosed(Integer status) {
+        return Objects.equals(status, CLOSED.getStatus());
+    }
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/refund/PayRefundStatusEnum.java

@@ -0,0 +1,32 @@
+package com.tashow.cloud.payapi.enums.refund;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * 渠道的退款状态枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum PayRefundStatusEnum {
+
+    WAITING(0, "未退款"),
+    SUCCESS(10, "退款成功"),
+    FAILURE(20, "退款失败");
+
+    private final Integer status;
+    private final String name;
+
+    public static boolean isSuccess(Integer status) {
+        return Objects.equals(status, SUCCESS.getStatus());
+    }
+
+    public static boolean isFailure(Integer status) {
+        return Objects.equals(status, FAILURE.getStatus());
+    }
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/transfer/PayTransferStatusEnum.java

@@ -0,0 +1,59 @@
+package com.tashow.cloud.payapi.enums.transfer;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * @author jason
+ */
+@Getter
+@AllArgsConstructor
+public enum PayTransferStatusEnum {
+
+    WAITING(0, "等待转账"),
+    /**
+     * TODO 转账到银行卡. 会有T+0 T+1 到账的请情况。 还未实现
+     */
+    IN_PROGRESS(10, "转账进行中"),
+
+    SUCCESS(20, "转账成功"),
+    /**
+     * 转账关闭 (失败，或者其它情况) // TODO 改成 转账失败状态
+     */
+    CLOSED(30, "转账关闭");
+
+    /**
+     * 状态
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    public static boolean isSuccess(Integer status) {
+        return Objects.equals(status, SUCCESS.getStatus());
+    }
+
+    public static boolean isClosed(Integer status) {
+        return Objects.equals(status, CLOSED.getStatus());
+    }
+
+    public static boolean isWaiting(Integer status) {
+        return Objects.equals(status, WAITING.getStatus());
+    }
+    public static boolean isInProgress(Integer status) {
+        return Objects.equals(status, IN_PROGRESS.getStatus());
+    }
+
+    /**
+     * 是否处于待转账或者转账中的状态
+     * @param status 状态
+     */
+    public static boolean isPendingStatus(Integer status) {
+        return Objects.equals(status, WAITING.getStatus()) || Objects.equals(status, IN_PROGRESS.getStatus());
+    }
+
+}

tashow-feign/tashow-pay-api/src/main/java/com/tashow/cloud/payapi/enums/transfer/PayTransferTypeEnum.java

@@ -0,0 +1,44 @@
+package com.tashow.cloud.payapi.enums.transfer;
+
+import cn.hutool.core.util.ArrayUtil;
+import com.tashow.cloud.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 转账类型枚举
+ *
+ * @author jason
+ */
+@AllArgsConstructor
+@Getter
+public enum PayTransferTypeEnum implements ArrayValuable<Integer> {
+
+    ALIPAY_BALANCE(1, "支付宝余额"),
+    WX_BALANCE(2, "微信余额"),
+    BANK_CARD(3, "银行卡"),
+    WALLET_BALANCE(4, "钱包余额");
+
+    public interface WxPay {
+    }
+
+    public interface Alipay {
+    }
+
+    private final Integer type;
+    private final String name;
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(PayTransferTypeEnum::getType).toArray(Integer[]::new);
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+    public static PayTransferTypeEnum typeOf(Integer type) {
+        return ArrayUtil.firstMatch(item -> item.getType().equals(type), values());
+    }
+
+}

tashow-feign/tashow-product-api/pom.xml

@@ -1,90 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.tashow.cloud</groupId>
-		<artifactId>tashow-feign</artifactId>
-		<version>${revision}</version>
-	</parent>
-	<artifactId>tashow-product-api</artifactId>
-	<packaging>jar</packaging>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.tashow.cloud</groupId>
+        <artifactId>tashow-feign</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>tashow-product-api</artifactId>
+    <packaging>jar</packaging>
 
-	<name>${project.artifactId}</name>
-	<description>
-		infra 模块 API，暴露给其它模块调用
-	</description>
+    <name>${project.artifactId}</name>
+    <description>
+        infra 模块 API，暴露给其它模块调用
+    </description>
 
-	<dependencies>
-		<dependency>
-			<groupId>com.tashow.cloud</groupId>
-			<artifactId>tashow-common</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-common</artifactId>
+        </dependency>
 
-		<!-- 参数校验 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-			<optional>true</optional>
-		</dependency>
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
 
-		<dependency>
-			<groupId>jakarta.validation</groupId>
-			<artifactId>jakarta.validation-api</artifactId>
-		</dependency>
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.13</version> <!-- 推荐使用最新稳定版本 -->
+        </dependency>
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+        <!-- Swagger Core -->
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>2.2.20</version>
+        </dependency>
 
-		<!-- RPC 远程调用相关 -->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-openfeign</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>3.5.13</version> <!-- 推荐使用最新稳定版本 -->
-		</dependency>
-		<!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-models</artifactId>
-			<version>1.6.2</version>
-		</dependency>
-		<!-- Swagger Core -->
-		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-core</artifactId>
-			<version>2.2.20</version>
-		</dependency>
-
-		<!-- Swagger Models -->
-		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-models</artifactId>
-			<version>2.2.20</version>
-		</dependency>
-		<!-- EasyExcel 核心库 -->
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>easyexcel</artifactId>
-			<version>4.0.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>3.5.9</version>
-		</dependency>
-		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-annotation</artifactId>
-			<version>3.5.9</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.tashow.cloud</groupId>
-			<artifactId>tashow-data-mybatis</artifactId>
-		</dependency>
-	</dependencies>
+        <!-- Swagger Models -->
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>2.2.20</version>
+        </dependency>
+        <!-- EasyExcel 核心库 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>4.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.9</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.5.9</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-data-mybatis</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeeDatesDO.java

@@ -43,22 +43,16 @@ public class ProdAdditionalFeeDatesDO extends BaseDO {
      * 日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'
      */
     private Integer dateType;
-
     /**
-     * 类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期
-     */
-    private Integer type;
-
-    /**
-     * 日期
+     * 自定义日期时间段
      */
     @TableField(typeHandler = StringListTypeHandler.class)
     private List<String> customTimeSlots;
-/*    *//**
+    /**
      * 指定日期
-     *//*
+     */
     @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> specificDates;*/
+    private List<String> specificDates;
     /**
      * 收费方式0：''固定金额'':1：''基准价上浮
      */
@@ -71,7 +65,5 @@ public class ProdAdditionalFeeDatesDO extends BaseDO {
      * 是否启用该规则是否启用该规则0关1开
      */
     private Integer isEnabled;
-    public boolean isEmpty() {
-        return id == null ;
-    }
+
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeePeriodsDO.java

@@ -56,7 +56,5 @@ public class ProdAdditionalFeePeriodsDO extends BaseDO {
      * 浮动百分比
      */
     private BigDecimal floatingPercentage;
-    public boolean isEmpty() {
-        return id == null ;
-    }
+
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseDO.java

@@ -39,5 +39,23 @@ public class ProdEmergencyResponseDO extends BaseDO {
      */
     @TableField(typeHandler = StringListTypeHandler.class)
     private List<String> responseTimeSlots;
+    /**
+     * 黑名自定义日期
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> blacklistedDates;
+    /**
+     * 黑名单指定日期
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> blackAppointDates;
+    /**
+     * 法定节假日是否开启0:关闭1开启
+     */
+    private Integer blackHappy;
+    /**
+     * 固定休息日周末是否开启0关闭1开启
+     */
+    private Integer blackWeekend;
 
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseIntervalsDO.java

@@ -38,9 +38,9 @@ public class ProdEmergencyResponseIntervalsDO extends BaseDO {
     private Long prodId;
 
     /**
-     * 响应模式名称modeName
+     * 响应模式名称
      */
-    private String name;
+    private String modeName;
     /**
      * 响应时间（小时）
      */
@@ -58,8 +58,4 @@ public class ProdEmergencyResponseIntervalsDO extends BaseDO {
      */
     private BigDecimal price;
 
-
-    public boolean isEmpty() {
-        return id == null;
-    }
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdExtendDO.java

@@ -41,9 +41,4 @@ public class ProdExtendDO {
      */
     private Integer isDisable;
 
-    /**
-     * 体重是否收费0否1是
-     */
-    private Integer isWeightCharge;
-
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdReservationConfigDO.java

@@ -66,6 +66,37 @@ public class ProdReservationConfigDO extends BaseDO {
      * 允许更改预约时间的最大次数
      */
     private Integer maxChangeTimes;
+    /**
+     * 黑名自定义日期
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> blacklistedDates;
+
+    /**
+     * '是否开启黑名单自定义0关1开'
+     */
+    private Integer isBlacklisted;
+
+    /**
+     * '是否开启黑名单指定日期0关1开'
+     */
+    private Integer isBlackAppoint;
+
+    /**
+     * 黑名单指定日期
+     */
+    //private String blackAppointDates;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> blackAppointDates;
+    /**
+     * 法定节假日是否开启0:关闭1开启
+     */
+    private Integer blackHappy;
+    /**
+     * 固定休息日周末是否开启0关闭1开启
+     */
+    private Integer blackWeekend;
+
     /**
      * 预约时间区间设置
      */

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategorySaveReqVO.java

@@ -1,6 +1,8 @@
 package com.tashow.cloud.productapi.api.product.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java

@@ -63,8 +63,7 @@ public class ProdListVO {
     /**
      * 服务时段
      */
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> reservationTimeSlots;
+    private BigDecimal reservationTimeSlots;
 
     /**
      * 还剩多少天

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRestoreListVO.java

@@ -1,9 +1,7 @@
 package com.tashow.cloud.productapi.api.product.vo.prod;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tashow.cloud.productapi.general.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -51,8 +49,7 @@ public class ProdRestoreListVO {
     /**
      * 服务时段
      */
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> reservationTimeSlots;
+    private BigDecimal reservationTimeSlots;
 
     /**
      * 还剩多少天

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdSaveReqVO.java

@@ -3,6 +3,7 @@ package com.tashow.cloud.productapi.api.product.vo.prod;
 import com.tashow.cloud.productapi.api.product.dto.SkuDO;
 import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.util.List;

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceInfoVO.java

@@ -1,84 +0,0 @@
-package com.tashow.cloud.productapi.api.product.vo.prod;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO;
-import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeePeriodsDO;
-import com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO;
-import com.tashow.cloud.productapi.api.product.dto.ProductOrderLimitDO;
-import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoReqVO;
-import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
-import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoReqVO;
-import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoVO;
-import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
-import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveInfoVO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Schema(description = "商品服务配置 VO")
-@Data
-public class ProdServiceInfoVO {
-
-    @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6943")
-    private Long prodId;
-
-    @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-
-    @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateTime;
-
-    @Schema(description = "新建人")
-    private String creator;
-
-    @Schema(description = "修改人")
-    private String updater;
-
-    @Schema(description = "分类名称")
-    private String categoryName;
-
-    @Schema(description = "是否开启服务区域配置0关1开")
-    private Integer regionSwitch;
-    @Schema(description = "服务区域配置")
-    public  ProdServiceAreasInfoVO prodServiceAreasInfo;
-
-
-    @Schema(description = "是否预约0关1开")
-    private Integer reservationSwitch;
-    @Schema(description = "预约配置")
-    public ProdReservationInfoReqVO prodReservationConfig;
-
-    @Schema(description = "是否紧急响应服务0关1开")
-    private Integer emergencySwitch;
-    @Schema(description = "急响应服务配置")
-    public ProdEmergencyInfoReqVO prodEmergencyInfoVO;
-
-    @Schema(description = "是否接单上线0关1开")
-    private Integer orderLimitSwitch;
-    @Schema(description = "接单上线配置")
-    public ProductOrderLimitDO productOrderLimitVO;
-
-
-    @Schema(description = "是否特殊日期（节假日周末什么的）0关1开 ")
-    private Integer additionalSwitch;
-    @Schema(description = "特殊日期规则配置")
-    public List<ProdAdditionalFeeDatesDO> prodAdditionalFeeDatesList;
-
-    @Schema(description = "是否特殊时段0关1开")
-    private Integer additionalFeeSwitch;
-    @Schema(description = "特殊时段规则配置 ")
-    public List<ProdAdditionalFeePeriodsDO> prodAdditionalFeePeriodsList;
-
-
-    @Schema(description = "是否开启体重配置0关1开")
-    private Integer weightSwitch;
-    @Schema(description = "体重配置")
-    public ProdWeightRangePricesSaveInfoVO prodWeightConfig;
-
-
-}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java

@@ -1,20 +1,14 @@
 package com.tashow.cloud.productapi.api.product.vo.prod;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
 import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
-import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoVO;
 import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
 import com.tashow.cloud.productapi.api.product.dto.*;
-import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveInfoVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 @Schema(description = "商品服务配置 VO")
 @Data
@@ -49,23 +43,7 @@ public class ProdServiceVO {
     @Schema(description = "是否预约0关1开")
     private Integer reservationSwitch;
     @Schema(description = "预约配置")
-    public ProdReservationInfoVO prodReservationConfig;
-
-   /* public List<ProdAdditionalFeeBlackVO> getProdReservationBlackList() {
-        if (prodReservationBlackList == null || prodReservationBlackList.isEmpty()) {
-            return prodReservationBlackList;
-        }
-        return prodReservationBlackList.stream()
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-    }
-
-    public void setProdReservationBlackList(List<ProdAdditionalFeeBlackVO> prodReservationBlackList) {
-        this.prodReservationBlackList = prodReservationBlackList;
-    }*/
-
-
-
+    public  ProdReservationConfigDO prodReservationConfig;
 
     @Schema(description = "是否紧急响应服务0关1开")
     private Integer emergencySwitch;
@@ -78,42 +56,20 @@ public class ProdServiceVO {
     public ProductOrderLimitDO productOrderLimitVO;
 
 
-    @Schema(description = "是否特殊日期（节假日周末什么的）0关1开")
+    @Schema(description = "是否特殊时段0关1开")
     private Integer additionalSwitch;
-    @Schema(description = "特殊日期规则配置")
+    @Schema(description = "特殊时段规则配置")
     public List<ProdAdditionalFeeDatesDO> prodAdditionalFeeDatesList;
 
-    @Schema(description = "是否特殊时段0关1开 ")
+    @Schema(description = "是否特殊日期（节假日周末什么的）0关1开")
     private Integer additionalFeeSwitch;
-    @Schema(description = "特殊时段规则配置 ")
+    @Schema(description = "特殊日期规则配置")
     public List<ProdAdditionalFeePeriodsDO> prodAdditionalFeePeriodsList;
 
 
     @Schema(description = "是否开启体重配置0关1开")
     private Integer weightSwitch;
     @Schema(description = "体重配置")
-    public ProdWeightRangePricesSaveInfoVO prodWeightConfig;
+    public ProdWeightRangePricesDO prodWeightConfig;
 
-
-    public ProdReservationInfoVO getProdReservationConfig() {
-
-        if (this.prodReservationConfig == null) {
-            return null;
-        }
-        // 判断是否“逻辑上为空”
-        if (isProdReservationInfoEmpty(this.prodReservationConfig)) {
-            return null;
-        }
-        return this.prodReservationConfig;
-    }
-
-    public void setProdReservationConfig(ProdReservationInfoVO prodReservationConfig) {
-        this.prodReservationConfig = prodReservationConfig;
-    }
-
-    private boolean isProdReservationInfoEmpty(ProdReservationInfoVO config) {
-        if (config == null) return true;
-        // 判断所有字段是否都为 null 或空
-        return config.getId() == null;
-    }
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeBlackVO.java

@@ -1,42 +0,0 @@
-package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.tashow.cloud.productapi.general.StringListTypeHandler;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Schema(description = "管理后台 - 特殊日期附加费用规则 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class ProdAdditionalFeeBlackVO {
-
-    @Schema(description = "特殊日期规则的唯一标识符")
-    @ExcelProperty("特殊日期规则的唯一标识符")
-    private Long id;
-
-    @Schema(description = "日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'")
-    @ExcelProperty("日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'")
-    private Integer dateType;
-
-    @Schema(description = "黑名单日期设置")
-    @ExcelProperty("黑名单日期设置")
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> customTimeSlots;
-
-
-    @Schema(description = "类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期")
-    @ExcelProperty("类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期")
-    private Integer type;
-
-    @Schema(description = "是否启用该规则是否启用该规则0关1开", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("是否启用该规则是否启用该规则0关1开")
-    private Integer isEnabled;
-    public boolean isEmpty() {
-        return id == null ;
-    }
-}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoReqVO.java

@@ -1,40 +0,0 @@
-package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
-import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
-import com.tashow.cloud.productapi.general.StringListTypeHandler;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class ProdEmergencyInfoReqVO {
-
-
-    /**
-     * 紧急响应服务配置的唯一标识符
-     */
-    private Long id;
-    /**
-     * 关联的商品ID
-     */
-    private Long prodId;
-    /**
-     * 可响应时间段
-     */
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> responseTimeSlots;
-
-    @Schema(description = "紧急响应时间区间设置")
-    public List<ProdEmergencyResponseIntervalsDO> prodEmergencyResponseIntervalsList;
-
-    @Schema(description = "紧急响应黑名单日期设置")
-    public List<ProdAdditionalFeeBlackVO> prodEmergencyResponseBlackList;
-
-}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java

@@ -1,15 +1,11 @@
 package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
-import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
-import com.tashow.cloud.productapi.general.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
 @Data
@@ -28,12 +24,27 @@ public class ProdEmergencyInfoVO {
     /**
      * 可响应时间段
      */
-    @TableField(typeHandler = StringListTypeHandler.class)
     private List<String> responseTimeSlots;
+    /**
+     * 黑名自定义日期
+     */
+    private List<String> blacklistedDates;
+    /**
+     * 黑名单指定日期
+     */
+    private List<String> blackAppointDates;
+    /**
+     * 法定节假日是否开启0:关闭1开启
+     */
+    private Integer blackHappy;
+    /**
+     * 固定休息日周末是否开启0关闭1开启
+     */
+    private Integer blackWeekend;
+
+
 
     @Schema(description = "紧急响应时间区间设置")
     public List<ProdEmergencyResponseIntervalsDO> prodEmergencyResponseIntervalsList;
 
-    @Schema(description = "紧急响应黑名单日期设置")
-    public List<ProdAdditionalFeeBlackVO> prodEmergencyResponseBlackList;
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java

@@ -19,7 +19,7 @@ public class ProdEmergencyResponseIntervalsPageReqVO extends PageParam {
     private Long configId;
 
     @Schema(description = "响应模式名称", example = "王五")
-    private String name;
+    private String modeName;
 
     @Schema(description = "响应时间（小时）")
     private BigDecimal responseHours;

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java

@@ -23,7 +23,7 @@ public class ProdEmergencyResponseIntervalsRespVO {
 
     @Schema(description = "响应模式名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @ExcelProperty("响应模式名称")
-    private String name;
+    private String modeName;
 
     @Schema(description = "响应时间（小时）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("响应时间（小时）")

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java

@@ -21,7 +21,7 @@ public class ProdEmergencyResponseIntervalsSaveReqVO {
 
     @Schema(description = "响应模式名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @NotEmpty(message = "响应模式名称不能为空")
-    private String name;
+    private String modeName;
 
     @Schema(description = "响应时间（小时）", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "响应时间（小时）不能为空")

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPageReqVO.java

@@ -1,25 +0,0 @@
-package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
-
-import com.tashow.cloud.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class ProPageReqVO extends PageParam {
-
-    /**
-     * 属性规格名称
-     */
-    private String propValue;
-
-    /**
-     * 商品id
-     */
-    private Long prodId;
-
-}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPropRecycleBinVO.java

@@ -1,32 +0,0 @@
-package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ProPropRecycleBinVO {
-    @Schema(description = "规格值id")
-    private Long id;
-
-    /**
-     * 属性规格名称
-     */
-    private String propValue;
-    /**
-     * 关联规格属性id
-     */
-    private Long propId;
-
-    /**
-     * 还剩多少天
-     */
-    private Long remainingDays;
-    /**
-     * 删除时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date deleteTime;
-}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationInfoReqVO.java

@@ -1,84 +0,0 @@
-package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
-import com.tashow.cloud.productapi.general.StringListTypeHandler;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-@Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class ProdReservationInfoReqVO {
-
-    /**
-     * 预约配置的唯一标识符
-     */
-    @TableId
-    private Long id;
-    /**
-     * 关联的商品ID
-     */
-    private Long prodId;
-    /**
-     * 预约时段设置
-     */
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> reservationTimeSlots;
-    /**
-     * 需提前多少小时预约
-     */
-    private Integer advanceHours;
-    /**
-     * 预约日期范围 7天 10天 15天 30天
-     */
-    private Integer reservationDateRange;
-    /**
-     * 是否允许更改预约时间 1可以 0不可以
-     */
-    private Integer allowChange;
-
-    /**
-     * 时间段
-     */
-    private Integer timeSlot;
-
-    /**
-     * 更改预约时间的时间规则（如服务开始前1小时可更改）
-     */
-    private Integer changeTimeRule;
-    /**
-     * 允许更改预约时间的最大次数
-     */
-    private Integer maxChangeTimes;
-
-    /**
-     * 预约时间区间设置
-     */
-    @TableField(exist=false)
-    private TimeBookVO timeBook;
-
-    public TimeBookVO getTimeBook() {
-        if (this.timeBook == null) {
-            this.timeBook = new TimeBookVO();
-            this.timeBook.setTimeSlot(this.timeSlot);
-            this.timeBook.setReservationTimeSlots(this.reservationTimeSlots);
-        }
-        return this.timeBook;
-    }
-
-    public void setTimeBook(TimeBookVO timeBook) {
-        this.timeBook = timeBook;
-    }
-
-    @Schema(description = "预约黑名单日期设置")
-    public List<ProdAdditionalFeeBlackVO> prodReservationBlackList = new ArrayList<>();
-
-}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationInfoVO.java

@@ -1,103 +0,0 @@
-package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
-import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
-import com.tashow.cloud.productapi.general.StringListTypeHandler;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-@Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class ProdReservationInfoVO {
-
-    /**
-     * 预约配置的唯一标识符
-     */
-    @TableId
-    private Long id;
-    /**
-     * 关联的商品ID
-     */
-    private Long prodId;
-    /**
-     * 预约时段设置
-     */
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> reservationTimeSlots;
-    /**
-     * 需提前多少小时预约
-     */
-    private Integer advanceHours;
-    /**
-     * 预约日期范围 7天 10天 15天 30天
-     */
-    private Integer reservationDateRange;
-    /**
-     * 是否允许更改预约时间 1可以 0不可以
-     */
-    private Integer allowChange;
-
-    /**
-     * 时间段
-     */
-    private Integer timeSlot;
-
-    /**
-     * 更改预约时间的时间规则（如服务开始前1小时可更改）
-     */
-    private Integer changeTimeRule;
-    /**
-     * 允许更改预约时间的最大次数
-     */
-    private Integer maxChangeTimes;
-
-    /**
-     * 预约时间区间设置
-     */
-    @TableField(exist=false)
-    private TimeBookVO timeBook;
-
-    public TimeBookVO getTimeBook() {
-        if (this.timeBook == null) {
-            this.timeBook = new TimeBookVO();
-            this.timeBook.setTimeSlot(this.timeSlot);
-            this.timeBook.setReservationTimeSlots(this.reservationTimeSlots);
-        }
-        return this.timeBook;
-    }
-
-    public void setTimeBook(TimeBookVO timeBook) {
-        this.timeBook = timeBook;
-    }
-
-    @Schema(description = "预约黑名单日期设置")
-    public List<ProdAdditionalFeeBlackVO> prodReservationBlackList;
-
-
-/*    public List<ProdAdditionalFeeBlackVO> getProdReservationBlackList() {
-        if (prodReservationBlackList == null || prodReservationBlackList.isEmpty()) {
-            return prodReservationBlackList;
-        }
-        return prodReservationBlackList.stream()
-                .filter(black -> black != null && !black.isEmpty())
-                .collect(Collectors.toList());
-    }
-
-    public void setProdReservationBlackList(List<ProdAdditionalFeeBlackVO> prodReservationBlackList) {
-        this.prodReservationBlackList = prodReservationBlackList;
-    }*/
-
-
-
-
-
-}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesSaveInfoVO.java

@@ -1,23 +0,0 @@
-package com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices;
-
-import com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Schema(description = "管理后台 - 体重区间价格新增/修改 Request VO")
-@Data
-public class ProdWeightRangePricesSaveInfoVO {
-
-    @Schema(description = "体重是否收费0否1是")
-    private Integer isWeightCharge;
-
-    @Schema(description = "体重配置")
-    public List<ProdWeightRangePricesDO> prodWeightConfigList;
-
-
-}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRecycleBinVO.java

@@ -1,12 +1,9 @@
 package com.tashow.cloud.productapi.api.product.vo.sku;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -14,14 +11,10 @@ public class SkuRecycleBinVO {
     @Schema(description = "单品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32230")
     private Long skuId;
 
-    /**
-     * 属性规格名称
-     */
-    private String properties;
     /**
      * 是否显示失效规格值 0否1是
      */
-    private String skuName;
+    private String properties;
 
     /**
      * 还剩多少天
@@ -32,140 +25,4 @@ public class SkuRecycleBinVO {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date deleteTime;
-
-
-
-
-    @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18784")
-    @ExcelProperty("商品ID")
-    private Long prodId;
-
-    @Schema(description = "别名")
-    @ExcelProperty("别名")
-    private String alias;
-
-    @Schema(description = "当前价格", example = "32405")
-    @ExcelProperty("价格")
-    private BigDecimal price;
-
-    /**
-     * 基准价
-     */
-    private BigDecimal basePrice;
-
-    @Schema(description = "最低价格", example = "5040")
-    @ExcelProperty("最低价格")
-    private BigDecimal minPrice;
-
-    @Schema(description = "最高价格", example = "11547")
-    @ExcelProperty("最高价格")
-    private BigDecimal maxPrice;
-
-    @Schema(description = "成本价", example = "28062")
-    @ExcelProperty("成本价")
-    private BigDecimal originalPrice;
-
-    @Schema(description = "市场价", example = "11547")
-    @ExcelProperty("市场价")
-    private BigDecimal marketPrice;
-
-    @Schema(description = "单位")
-    @ExcelProperty("单位")
-    private String unit;
-
-    @Schema(description = "0:主服务1:待定", example = "1")
-    @ExcelProperty("0:主服务1:待定")
-    private Integer type;
-
-    @Schema(description = "概述")
-    @ExcelProperty("概述")
-    private String overview;
-
-    @Schema(description = "库存")
-    @ExcelProperty("库存")
-    private Integer stocks;
-
-
-    @Schema(description = "总库存是0 无线库存是1")
-    @ExcelProperty("总库存是0 无线库存是1")
-    private Integer stocksFlg;
-
-    /**
-     * 锁定库存数
-     */
-    @Schema(description = "锁定库存数")
-    @ExcelProperty("锁定库存数")
-    private Integer stocksLockNum;
-
-    @Schema(description = "预警库存")
-    @ExcelProperty("预警库存")
-    private Integer warnStocks;
-
-    @Schema(description = "库存扣款时机0:付款扣1：下单扣", example = "1")
-    @ExcelProperty("库存扣款时机0:付款扣1：下单扣")
-    private Boolean stocksType;
-
-    @Schema(description = "sku编码")
-    @ExcelProperty("sku编码")
-    private String skuCode;
-
-    @Schema(description = "商品条形码", example = "14390")
-    @ExcelProperty("商品条形码")
-    private String modelId;
-
-    @Schema(description = "sku图片")
-    @ExcelProperty("sku图片")
-    private String pic;
-
-
-    @Schema(description = "商品名称", example = "芋艿")
-    @ExcelProperty("商品名称")
-    private String prodName;
-
-    @Schema(description = "版本号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("版本号")
-    private Integer version;
-
-    @Schema(description = "商品重量")
-    @ExcelProperty("商品重量")
-    private Double weight;
-
-    @Schema(description = "商品体积")
-    @ExcelProperty("商品体积")
-    private Double volume;
-
-    @Schema(description = "0 禁用 1 启用", example = "1")
-    @ExcelProperty("0 禁用 1 启用")
-    private Integer status;
-
-    @Schema(description = "0 正常 1 已被删除")
-    @ExcelProperty("0 正常 1 已被删除")
-    private Integer isDelete;
-
-    @Schema(description = "最小购买数量")
-    @ExcelProperty("最小购买数量")
-    private Integer moq;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-    /**
-     * 是否上下架0下架1上架
-     */
-    private Integer isShelf;
-
-    /**
-     * 是否默认规则0否1是
-     */
-    private Integer isSpecs;
-
-    /**
-     * 服务内容
-     */
-    private String serviceContent;
-    /**
-     * 规格id 多个用逗号分隔（1,2,3）
-     */
-    private String propIds;
-
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuSaveReqVO.java

@@ -15,6 +15,7 @@ public class SkuSaveReqVO {
     private Long skuId;
 
     @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18784")
+    @NotNull(message = "商品ID不能为空")
     private Long prodId;
 
     @Schema(description = "销售属性组合字符串 格式是p1:v1;p2:v2")
@@ -85,6 +86,7 @@ public class SkuSaveReqVO {
     private String prodName;
 
     @Schema(description = "版本号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "版本号不能为空")
     private Integer version;
 
     @Schema(description = "商品重量")
@@ -101,11 +103,6 @@ public class SkuSaveReqVO {
 
     @Schema(description = "最小购买数量")
     private Integer moq;
-    /**
-     * 是否默认规则0否1是
-     */
-    private Integer isSpecs;
-
     /**
      * 扩展服务表单id
      */

tashow-feign/tashow-trade-api/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.tashow.cloud</groupId>
+        <artifactId>tashow-feign</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tashow-trade-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        trade 模块 API，暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-common</artifactId>
+        </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/api/order/TradeOrderApi.java

@@ -0,0 +1,32 @@
+package com.tashow.cloud.tradeapi.api.order;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.tradeapi.api.order.dto.TradeOrderRespDTO;
+import com.tashow.cloud.tradeapi.enums.ApiConstants;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Collection;
+import java.util.List;
+
+@FeignClient(name = ApiConstants.NAME)
+public interface TradeOrderApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/order";
+
+    /*获得订单列表*/
+    @GetMapping(PREFIX + "/order/list")
+    CommonResult<List<TradeOrderRespDTO>> getOrderList(@RequestParam("ids") Collection<Long> ids);
+
+    /*获得订单*/
+    @GetMapping(PREFIX + "/get")
+    CommonResult<TradeOrderRespDTO> getOrder(@RequestParam("id") Long id);
+
+    @PutMapping(PREFIX + "/cancel-paid")
+    CommonResult<Boolean> cancelPaidOrder(@RequestParam("userId") Long userId,
+                                          @RequestParam("orderId") Long orderId,
+                                          @RequestParam("cancelType") Integer cancelType);
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/api/order/dto/TradeOrderRespDTO.java

@@ -0,0 +1,67 @@
+package com.tashow.cloud.tradeapi.api.order.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 订单信息 Response DTO
+ * RPC 服务 - 订单信息 Response DTO
+ * @author HUIHUI
+ */
+@Data
+public class TradeOrderRespDTO {
+
+    // ========== 订单基本信息 ==========
+
+    //订单编号
+    private Long id;
+
+    //订单流水号
+    private String no;
+
+    //订单类型
+    private Integer type; // 参见 TradeOrderTypeEnum 枚举
+
+    //订单来源
+    private Integer terminal; // 参见 TerminalEnum 枚举
+
+    //用户编号
+    private Long userId;
+
+    //用户 IP
+    private String userIp;
+
+    //用户备注
+    private String userRemark;
+
+    //订单状态
+    private Integer status; // 参见 TradeOrderStatusEnum 枚举
+
+    //购买的商品数量
+    private Integer productCount;
+
+    //订单完成时间
+    private LocalDateTime finishTime;
+
+    //订单取消时间
+    private LocalDateTime cancelTime;
+
+    //取消类型
+    private Integer cancelType; // 参见 TradeOrderCancelTypeEnum 枚举
+
+    //商家备注
+    private String remark;
+
+    //是否评价
+    private Boolean commentStatus;
+
+    // ========== 价格 + 支付基本信息 ==========
+
+    //支付订单编号
+    private Long payOrderId;
+
+    //是否已支付
+    private Boolean payStatus;
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/api/package-info.java

@@ -0,0 +1 @@
+package com.tashow.cloud.tradeapi.api;

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/ApiConstants.java

@@ -0,0 +1,24 @@
+package com.tashow.cloud.tradeapi.enums;
+
+
+import com.tashow.cloud.common.enums.RpcConstants;
+
+/**
+ * API 相关的枚举
+ *
+ * @author 芋道源码
+ */
+public class ApiConstants {
+
+    /**
+     * 服务名
+     *
+     * 注意，需要保证和 spring.application.name 保持一致
+     */
+    public static final String NAME = "trade-server";
+
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX +  "/trade";
+
+    public static final String VERSION = "1.0.0";
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/DictTypeConstants.java

@@ -0,0 +1,12 @@
+package com.tashow.cloud.tradeapi.enums;
+
+/**
+ * Trade 字典类型的枚举类
+ *
+ * @author owen
+ */
+public interface DictTypeConstants {
+
+    String BROKERAGE_WITHDRAW_STATUS = "brokerage_withdraw_status"; // 佣金提现状态
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/ErrorCodeConstants.java

@@ -0,0 +1,106 @@
+package com.tashow.cloud.tradeapi.enums;
+
+
+import com.tashow.cloud.common.exception.ErrorCode;
+
+/**
+ * Trade 错误码枚举类
+ * trade 系统，使用 1-011-000-000 段
+ *
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+public interface ErrorCodeConstants {
+
+    // ========== Order 模块 1-011-000-000 ==========
+    ErrorCode ORDER_ITEM_NOT_FOUND = new ErrorCode(1_011_000_010, "交易订单项不存在");
+    ErrorCode ORDER_NOT_FOUND = new ErrorCode(1_011_000_011, "交易订单不存在");
+    ErrorCode ORDER_ITEM_UPDATE_AFTER_SALE_STATUS_FAIL = new ErrorCode(1_011_000_012, "交易订单项更新售后状态失败，请重试");
+    ErrorCode ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1_011_000_013, "交易订单更新支付状态失败，订单不是【未支付】状态");
+    ErrorCode ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR = new ErrorCode(1_011_000_014, "交易订单更新支付状态失败，支付单编号不匹配");
+    ErrorCode ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS = new ErrorCode(1_011_000_015, "交易订单更新支付状态失败，支付单状态不是【支付成功】状态");
+    ErrorCode ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH = new ErrorCode(1_011_000_016, "交易订单更新支付状态失败，支付单金额不匹配");
+    ErrorCode ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED = new ErrorCode(1_011_000_017, "交易订单发货失败，订单不是【待发货】状态");
+    ErrorCode ORDER_RECEIVE_FAIL_STATUS_NOT_DELIVERED = new ErrorCode(1_011_000_018, "交易订单收货失败，订单不是【待收货】状态");
+    ErrorCode ORDER_COMMENT_FAIL_STATUS_NOT_COMPLETED = new ErrorCode(1_011_000_019, "创建交易订单项的评价失败，订单不是【已完成】状态");
+    ErrorCode ORDER_COMMENT_STATUS_NOT_FALSE = new ErrorCode(1_011_000_020, "创建交易订单项的评价失败，订单已评价");
+    ErrorCode ORDER_DELIVERY_FAIL_REFUND_STATUS_NOT_NONE = new ErrorCode(1_011_000_021, "交易订单发货失败，订单已退款或部分退款");
+    ErrorCode ORDER_DELIVERY_FAIL_COMBINATION_RECORD_STATUS_NOT_SUCCESS = new ErrorCode(1_011_000_022, "交易订单发货失败，拼团未成功");
+    ErrorCode ORDER_DELIVERY_FAIL_BARGAIN_RECORD_STATUS_NOT_SUCCESS = new ErrorCode(1_011_000_023, "交易订单发货失败，砍价未成功");
+    ErrorCode ORDER_DELIVERY_FAIL_DELIVERY_TYPE_NOT_EXPRESS = new ErrorCode(1_011_000_024, "交易订单发货失败，发货类型不是快递");
+    ErrorCode ORDER_CANCEL_FAIL_STATUS_NOT_UNPAID = new ErrorCode(1_011_000_025, "交易订单取消失败，订单不是【待支付】状态");
+    ErrorCode ORDER_UPDATE_PRICE_FAIL_PAID = new ErrorCode(1_011_000_026, "支付订单调价失败，原因：支付订单已付款,不能调价");
+    ErrorCode ORDER_UPDATE_PRICE_FAIL_ALREADY = new ErrorCode(1_011_000_027, "支付订单调价失败，原因：已经修改过价格");
+    ErrorCode ORDER_UPDATE_PRICE_FAIL_PRICE_ERROR = new ErrorCode(1_011_000_028, "支付订单调价失败，原因：调整后支付价格不能小于 0.01 元");
+    ErrorCode ORDER_DELETE_FAIL_STATUS_NOT_CANCEL = new ErrorCode(1_011_000_029, "交易订单删除失败，订单不是【已取消】状态");
+    ErrorCode ORDER_RECEIVE_FAIL_DELIVERY_TYPE_NOT_PICK_UP = new ErrorCode(1_011_000_030, "交易订单自提失败，收货方式不是【用户自提】");
+    ErrorCode ORDER_UPDATE_ADDRESS_FAIL_STATUS_NOT_DELIVERED = new ErrorCode(1_011_000_031, "交易订单修改收货地址失败，原因：订单不是【待发货】状态");
+    ErrorCode ORDER_CREATE_FAIL_EXIST_UNPAID = new ErrorCode(1_011_000_032, "交易订单创建失败，原因：存在未付款订单");
+    ErrorCode ORDER_CANCEL_PAID_FAIL = new ErrorCode(1_011_000_033, "交易订单取消支付失败，原因：订单不是【{}】状态");
+    ErrorCode ORDER_PICK_UP_FAIL_NOT_VERIFY_USER = new ErrorCode(1_011_000_034, "交易订单自提失败，原因：你没有核销该门店订单的权限");
+    ErrorCode ORDER_CREATE_FAIL_INSUFFICIENT_USER_POINTS = new ErrorCode(1_011_000_035, "交易订单创建失败，原因：用户积分不足");
+
+    // ========== After Sale 模块 1-011-000-100 ==========
+    ErrorCode AFTER_SALE_NOT_FOUND = new ErrorCode(1_011_000_100, "售后单不存在");
+    ErrorCode AFTER_SALE_CREATE_FAIL_REFUND_PRICE_ERROR = new ErrorCode(1_011_000_101, "申请退款金额错误");
+    ErrorCode AFTER_SALE_CREATE_FAIL_ORDER_STATUS_CANCELED = new ErrorCode(1_011_000_102, "订单已关闭，无法申请售后");
+    ErrorCode AFTER_SALE_CREATE_FAIL_ORDER_STATUS_NO_PAID = new ErrorCode(1_011_000_103, "订单未支付，无法申请售后");
+    ErrorCode AFTER_SALE_CREATE_FAIL_ORDER_STATUS_NO_DELIVERED = new ErrorCode(1_011_000_104, "订单未发货，无法申请【退货退款】售后");
+    ErrorCode AFTER_SALE_CREATE_FAIL_ORDER_ITEM_APPLIED = new ErrorCode(1_011_000_105, "订单项已申请售后，无法重复申请");
+    ErrorCode AFTER_SALE_AUDIT_FAIL_STATUS_NOT_APPLY = new ErrorCode(1_011_000_106, "审批失败，售后状态不处于审批中");
+    ErrorCode AFTER_SALE_UPDATE_STATUS_FAIL = new ErrorCode(1_011_000_107, "操作售后单失败，请刷新后重试");
+    ErrorCode AFTER_SALE_DELIVERY_FAIL_STATUS_NOT_SELLER_AGREE = new ErrorCode(1_011_000_108, "退货失败，售后单状态不处于【待买家退货】");
+    ErrorCode AFTER_SALE_CONFIRM_FAIL_STATUS_NOT_BUYER_DELIVERY = new ErrorCode(1_011_000_109, "确认收货失败，售后单状态不处于【待确认收货】");
+    ErrorCode AFTER_SALE_REFUND_FAIL_STATUS_NOT_WAIT_REFUND = new ErrorCode(1_011_000_110, "退款失败，售后单状态不是【待退款】");
+    ErrorCode AFTER_SALE_CANCEL_FAIL_STATUS_NOT_APPLY_OR_AGREE_OR_BUYER_DELIVERY =
+            new ErrorCode(1_011_000_111, "取消售后单失败，售后单状态不是【待审核】或【卖家同意】或【商家待收货】");
+    ErrorCode AFTER_SALE_CREATE_FAIL_ORDER_STATUS_COMBINATION_IN_PROGRESS = new ErrorCode(1_011_000_112, "订单拼团中，无法申请售后");
+
+    // ========== Cart 模块 1-011-002-000 ==========
+    ErrorCode CARD_ITEM_NOT_FOUND = new ErrorCode(1_011_002_000, "购物车项不存在");
+
+    // ========== Price 相关 1-011-003-000 ============
+    ErrorCode PRICE_CALCULATE_PAY_PRICE_ILLEGAL = new ErrorCode(1_011_003_000, "支付价格计算异常，原因：价格小于等于 0");
+    ErrorCode PRICE_CALCULATE_DELIVERY_PRICE_TEMPLATE_NOT_FOUND = new ErrorCode(1_011_003_001, "计算快递运费异常，找不到对应的运费模板");
+    ErrorCode PRICE_CALCULATE_COUPON_NOT_MATCH_NORMAL_ORDER = new ErrorCode(1_011_003_002, "参与秒杀、拼团、砍价的营销商品，无法使用优惠劵");
+    ErrorCode PRICE_CALCULATE_SECKILL_TOTAL_LIMIT_COUNT = new ErrorCode(1_011_003_003, "参与秒杀的商品，超过了秒杀总限购数量");
+    ErrorCode PRICE_CALCULATE_POINT_TOTAL_LIMIT_COUNT = new ErrorCode(1_011_003_004, "参与积分活动的商品，超过了积分活动商品总限购数量");
+    ErrorCode PRICE_CALCULATE_DELIVERY_PRICE_TYPE_ILLEGAL = new ErrorCode(1_011_003_005, "计算快递运费异常，配送方式不匹配");
+    ErrorCode PRICE_CALCULATE_COUPON_CAN_NOT_USE = new ErrorCode(1_011_003_006, "该优惠劵无法使用，原因：{}」");
+
+    // ========== 物流 Express 模块 1-011-004-000 ==========
+    ErrorCode EXPRESS_NOT_EXISTS = new ErrorCode(1_011_004_000, "快递公司不存在");
+    ErrorCode EXPRESS_CODE_DUPLICATE = new ErrorCode(1_011_004_001, "已经存在该编码的快递公司");
+    ErrorCode EXPRESS_CLIENT_NOT_PROVIDE = new ErrorCode(1_011_004_002, "需要接入快递服务商，比如【快递100】");
+    ErrorCode EXPRESS_STATUS_NOT_ENABLE = new ErrorCode(1_011_004_003, "快递公司未启用");
+
+    ErrorCode EXPRESS_API_QUERY_ERROR = new ErrorCode(1_011_004_101, "快递查询接口异常");
+    ErrorCode EXPRESS_API_QUERY_FAILED = new ErrorCode(1_011_004_102, "快递查询返回失败，原因：{}");
+
+    // ========== 物流 Template 模块 1-011-005-000 ==========
+    ErrorCode EXPRESS_TEMPLATE_NAME_DUPLICATE = new ErrorCode(1_011_005_000, "已经存在该运费模板名");
+    ErrorCode EXPRESS_TEMPLATE_NOT_EXISTS = new ErrorCode(1_011_005_001, "运费模板不存在");
+
+    // ==========  物流 PICK_UP 模块 1-011-006-000 ==========
+    ErrorCode PICK_UP_STORE_NOT_EXISTS = new ErrorCode(1_011_006_000, "自提门店不存在");
+    ErrorCode PICK_UP_STORE_STAFF_NOT_EXISTS = new ErrorCode(1_011_006_000, "自提门店店员不存在");
+
+    // ========== 分销用户 模块 1-011-007-000 ==========
+    ErrorCode BROKERAGE_USER_NOT_EXISTS = new ErrorCode(1_011_007_000, "分销用户不存在");
+    ErrorCode BROKERAGE_USER_FROZEN_PRICE_NOT_ENOUGH = new ErrorCode(1_011_007_001, "用户冻结佣金({})数量不足");
+    ErrorCode BROKERAGE_BIND_SELF = new ErrorCode(1_011_007_002, "不能绑定自己");
+    ErrorCode BROKERAGE_BIND_USER_NOT_ENABLED = new ErrorCode(1_011_007_003, "绑定用户没有推广资格");
+    ErrorCode BROKERAGE_BIND_CONDITION_ADMIN = new ErrorCode(1_011_007_004, "仅可在后台绑定推广员");
+    ErrorCode BROKERAGE_BIND_MODE_REGISTER = new ErrorCode(1_011_007_005, "只有在注册时可以绑定");
+    ErrorCode BROKERAGE_BIND_OVERRIDE = new ErrorCode(1_011_007_006, "已绑定了推广人");
+    ErrorCode BROKERAGE_BIND_LOOP = new ErrorCode(1_011_007_007, "下级不能绑定自己的上级");
+    ErrorCode BROKERAGE_USER_LEVEL_NOT_SUPPORT = new ErrorCode(1_011_007_008, "目前只支持 level 小于等于 2");
+    ErrorCode BROKERAGE_CREATE_USER_EXISTS = new ErrorCode(1_011_007_009, "分销用户已存在");
+
+    // ========== 分销提现 模块 1-011-008-000 ==========
+    ErrorCode BROKERAGE_WITHDRAW_NOT_EXISTS = new ErrorCode(1_011_008_000, "佣金提现记录不存在");
+    ErrorCode BROKERAGE_WITHDRAW_STATUS_NOT_AUDITING = new ErrorCode(1_011_008_001, "佣金提现记录状态不是审核中");
+    ErrorCode BROKERAGE_WITHDRAW_MIN_PRICE = new ErrorCode(1_011_008_002, "提现金额不能低于 {} 元");
+    ErrorCode BROKERAGE_WITHDRAW_USER_BALANCE_NOT_ENOUGH = new ErrorCode(1_011_008_003, "您当前最多可提现 {} 元");
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/MessageTemplateConstants.java

@@ -0,0 +1,18 @@
+package com.tashow.cloud.tradeapi.enums;
+
+/**
+ * 通知模板枚举类
+ *
+ * @author HUIHUI
+ */
+public interface MessageTemplateConstants {
+
+    // ======================= 短信消息模版 =======================
+
+    String SMS_ORDER_DELIVERY = "order_delivery"; // 短信模版编号
+
+    // ======================= 小程序订阅消息模版 =======================
+
+    String WXA_ORDER_DELIVERY = "订单发货通知";
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/aftersale/AfterSaleOperateTypeEnum.java

@@ -0,0 +1,35 @@
+package com.tashow.cloud.tradeapi.enums.aftersale;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 售后操作类型的枚举
+ *
+ * @author 陈賝
+ * @since 2023/6/13 13:53
+ */
+@RequiredArgsConstructor
+@Getter
+public enum AfterSaleOperateTypeEnum {
+
+    MEMBER_CREATE(10, "会员申请退款"),
+    ADMIN_AGREE_APPLY(11, "商家同意退款"),
+    ADMIN_DISAGREE_APPLY(12, "商家拒绝退款"),
+    MEMBER_DELIVERY(20, "会员填写退货物流信息，快递公司：{deliveryName}，快递单号：{logisticsNo}"),
+    ADMIN_AGREE_RECEIVE(21, "商家收货"),
+    ADMIN_DISAGREE_RECEIVE(22, "商家拒绝收货，原因：{reason}"),
+    ADMIN_REFUND(30, "商家退款"),
+    MEMBER_CANCEL(40, "会员取消退款"),
+    ;
+
+    /**
+     * 操作类型
+     */
+    private final Integer type;
+    /**
+     * 操作描述
+     */
+    private final String content;
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/aftersale/AfterSaleStatusEnum.java

@@ -0,0 +1,95 @@
+package com.tashow.cloud.tradeapi.enums.aftersale;
+
+import com.tashow.cloud.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static cn.hutool.core.util.ArrayUtil.firstMatch;
+
+/**
+ * 售后状态的枚举
+ *
+ * <a href="https://www.processon.com/view/link/63731a270e3e742ce7b7c194">状态流转</a>
+ *
+ * @author 芋道源码
+ */
+@AllArgsConstructor
+@Getter
+public enum AfterSaleStatusEnum implements ArrayValuable<Integer> {
+
+    /**
+     * 【申请售后】
+     */
+    APPLY(10,"申请中", "会员申请退款"), // 有赞的状态提示：退款申请待商家处理
+    /**
+     * 卖家通过售后；【商品待退货】
+     */
+    SELLER_AGREE(20, "卖家通过", "商家同意退款"), // 有赞的状态提示：请退货并填写物流信息
+    /**
+     * 买家已退货，等待卖家收货；【商家待收货】
+     */
+    BUYER_DELIVERY(30,"待卖家收货", "会员填写退货物流信息"), // 有赞的状态提示：退货退款申请待商家处理
+    /**
+     * 卖家已收货，等待平台退款；等待退款【等待退款】
+     */
+    WAIT_REFUND(40, "等待平台退款", "商家收货"), // 有赞的状态提示：无（有赞无该状态）
+    /**
+     * 完成退款【退款成功】
+     */
+    COMPLETE(50, "完成", "商家确认退款"), // 有赞的状态提示：退款成功
+    /**
+     * 【买家取消】
+     */
+    BUYER_CANCEL(61, "买家取消售后", "会员取消退款"), // 有赞的状态提示：退款关闭
+    /**
+     * 卖家拒绝售后；商家拒绝【商家拒绝】
+     */
+    SELLER_DISAGREE(62,"卖家拒绝", "商家拒绝退款"), // 有赞的状态提示：商家不同意退款申请
+    /**
+     * 卖家拒绝收货，终止售后；【商家拒收货】
+     */
+    SELLER_REFUSE(63,"卖家拒绝收货", "商家拒绝收货"), // 有赞的状态提示：商家拒绝收货，不同意退款
+    ;
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(AfterSaleStatusEnum::getStatus).toArray(Integer[]::new);
+
+    /**
+     * 进行中的售后状态
+     *
+     * 不包括已经结束的状态
+     */
+    public static final Collection<Integer> APPLYING_STATUSES = Arrays.asList(
+            APPLY.getStatus(),
+            SELLER_AGREE.getStatus(),
+            BUYER_DELIVERY.getStatus(),
+            WAIT_REFUND.getStatus()
+    );
+
+    /**
+     * 状态
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+    /**
+     * 操作内容
+     *
+     * 目的：记录售后日志的内容
+     */
+    private final String content;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+    public static AfterSaleStatusEnum valueOf(Integer status) {
+        return firstMatch(value -> value.getStatus().equals(status), values());
+    }
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/aftersale/AfterSaleTypeEnum.java

@@ -0,0 +1,37 @@
+package com.tashow.cloud.tradeapi.enums.aftersale;
+
+import com.tashow.cloud.common.core.ArrayValuable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * 交易售后 - 类型
+ *
+ * @author 芋道源码
+ */
+@RequiredArgsConstructor
+@Getter
+public enum AfterSaleTypeEnum implements ArrayValuable<Integer> {
+
+    IN_SALE(10, "售中退款"), // 交易完成前买家申请退款
+    AFTER_SALE(20, "售后退款"); // 交易完成后买家申请退款
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(AfterSaleTypeEnum::getType).toArray(Integer[]::new);
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+    /**
+     * 类型名
+     */
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/aftersale/AfterSaleWayEnum.java

@@ -0,0 +1,37 @@
+package com.tashow.cloud.tradeapi.enums.aftersale;
+
+import com.tashow.cloud.common.core.ArrayValuable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * 交易售后 - 方式
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum AfterSaleWayEnum implements ArrayValuable<Integer> {
+
+    REFUND(10, "仅退款"),
+    RETURN_AND_REFUND(20, "退货退款");
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(AfterSaleWayEnum::getWay).toArray(Integer[]::new);
+
+    /**
+     * 方式
+     */
+    private final Integer way;
+    /**
+     * 方式名
+     */
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/brokerage/BrokerageBindModeEnum.java

@@ -0,0 +1,48 @@
+package com.tashow.cloud.tradeapi.enums.brokerage;
+
+import com.tashow.cloud.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 分销关系绑定模式枚举
+ *
+ * @author owen
+ */
+@AllArgsConstructor
+@Getter
+public enum BrokerageBindModeEnum implements ArrayValuable<Integer> {
+
+    /**
+     * 只要用户没有推广人，随时都可以绑定分销关系
+     */
+    ANYTIME(1, "首次绑定"),
+    /**
+     * 仅新用户注册时才能绑定推广关系
+     */
+    REGISTER(2, "注册绑定"),
+    /**
+     * 每次扫码都覆盖
+     */
+    OVERRIDE(3, "覆盖绑定"),
+    ;
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(BrokerageBindModeEnum::getMode).toArray(Integer[]::new);
+
+    /**
+     * 模式
+     */
+    private final Integer mode;
+    /**
+     * 名字
+     */
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/brokerage/BrokerageEnabledConditionEnum.java

@@ -0,0 +1,44 @@
+package com.tashow.cloud.tradeapi.enums.brokerage;
+
+import com.tashow.cloud.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 分佣模式枚举
+ *
+ * @author owen
+ */
+@AllArgsConstructor
+@Getter
+public enum BrokerageEnabledConditionEnum implements ArrayValuable<Integer> {
+
+    /**
+     * 所有用户都可以分销
+     */
+    ALL(1, "人人分销"),
+    /**
+     * 仅可后台手动设置推广员
+     */
+    ADMIN(2, "指定分销"),
+    ;
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(BrokerageEnabledConditionEnum::getCondition).toArray(Integer[]::new);
+
+    /**
+     * 模式
+     */
+    private final Integer condition;
+    /**
+     * 名字
+     */
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/brokerage/BrokerageRecordBizTypeEnum.java

@@ -0,0 +1,47 @@
+package com.tashow.cloud.tradeapi.enums.brokerage;
+
+import com.tashow.cloud.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 佣金记录业务类型枚举
+ *
+ * @author owen
+ */
+@AllArgsConstructor
+@Getter
+public enum BrokerageRecordBizTypeEnum implements ArrayValuable<Integer> {
+
+    ORDER(1, "获得推广佣金", "获得推广佣金 {}", true),
+    WITHDRAW(2, "提现申请", "提现申请扣除佣金 {}", false),
+    WITHDRAW_REJECT(3, "提现申请驳回", "提现申请驳回，返还佣金 {}", true),
+    ;
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(BrokerageRecordBizTypeEnum::getType).toArray(Integer[]::new);
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+    /**
+     * 标题
+     */
+    private final String title;
+    /**
+     * 描述
+     */
+    private final String description;
+    /**
+     * 是否为增加佣金
+     */
+    private final boolean add;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/brokerage/BrokerageRecordStatusEnum.java

@@ -0,0 +1,39 @@
+package com.tashow.cloud.tradeapi.enums.brokerage;
+
+import com.tashow.cloud.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 佣金记录状态枚举
+ *
+ * @author owen
+ */
+@AllArgsConstructor
+@Getter
+public enum BrokerageRecordStatusEnum implements ArrayValuable<Integer> {
+
+    WAIT_SETTLEMENT(0, "待结算"),
+    SETTLEMENT(1, "已结算"),
+    CANCEL(2, "已取消"),
+    ;
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(BrokerageRecordStatusEnum::getStatus).toArray(Integer[]::new);
+
+    /**
+     * 状态
+     */
+    private final Integer status;
+    /**
+     * 名字
+     */
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}