Commit fea84deca0f0e0fa9da99b0dc65de3fb932b011e
1 parent
ee187080
✨ Pay:code review 支付转账的部分逻辑
Showing
10 changed files
with
2 additions
and
318 deletions
sql/mysql/Ureport.sql renamed to sql/mysql/optinal/Ureport.sql
sql/mysql/optinal/crm.sql deleted
| 1 | --- `ruoyi-vue-pro`.crm_contact_business_link definition | ||
| 2 | - | ||
| 3 | -CREATE TABLE `crm_contact_business` ( | ||
| 4 | - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', | ||
| 5 | - `contact_id` int(11) DEFAULT NULL COMMENT '联系人id', | ||
| 6 | - `business_id` int(11) DEFAULT NULL COMMENT '商机id', | ||
| 7 | - `creator` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', | ||
| 8 | - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | ||
| 9 | - `updater` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', | ||
| 10 | - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', | ||
| 11 | - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | ||
| 12 | - `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号', | ||
| 13 | - PRIMARY KEY (`id`) | ||
| 14 | -) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='联系人商机关联表'; | ||
| 15 | \ No newline at end of file | 0 | \ No newline at end of file |
sql/mysql/optinal/crm_20240114.sql deleted
| 1 | - | ||
| 2 | --- ---------------------------- | ||
| 3 | --- Table structure for crm_business_product | ||
| 4 | --- ---------------------------- | ||
| 5 | -DROP TABLE IF EXISTS `crm_business_product`; | ||
| 6 | -CREATE TABLE `crm_business_product` ( | ||
| 7 | - `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '主键', | ||
| 8 | - `business_id` bigint(0) NOT NULL COMMENT '商机ID', | ||
| 9 | - `product_id` bigint(0) NOT NULL COMMENT '产品ID', | ||
| 10 | - `price` decimal(18, 2) NOT NULL COMMENT '产品单价', | ||
| 11 | - `sales_price` decimal(18, 2) NULL DEFAULT NULL COMMENT '销售价格', | ||
| 12 | - `num` int(0) NULL DEFAULT NULL COMMENT '数量', | ||
| 13 | - `discount` decimal(10, 2) NULL DEFAULT NULL COMMENT '折扣', | ||
| 14 | - `subtotal` decimal(18, 2) NULL DEFAULT NULL COMMENT '小计(折扣后价格)', | ||
| 15 | - `unit` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '单位', | ||
| 16 | - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者', | ||
| 17 | - `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | ||
| 18 | - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者', | ||
| 19 | - `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', | ||
| 20 | - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | ||
| 21 | - `tenant_id` bigint(0) NOT NULL DEFAULT 1 COMMENT '租户编号', | ||
| 22 | - PRIMARY KEY (`id`) USING BTREE | ||
| 23 | -) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商机产品关联表' ROW_FORMAT = Dynamic; | ||
| 24 | \ No newline at end of file | 0 | \ No newline at end of file |
sql/mysql/optinal/mall.sql deleted
sql/mysql/optinal/pay_wallet.sql deleted
| 1 | --- ---------------------------- | ||
| 2 | --- 转账单表 | ||
| 3 | --- ---------------------------- | ||
| 4 | -DROP TABLE IF EXISTS `pay_transfer`; | ||
| 5 | -CREATE TABLE `pay_transfer` | ||
| 6 | -( | ||
| 7 | - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', | ||
| 8 | - `no` varchar(64) NOT NULL COMMENT '转账单号', | ||
| 9 | - `app_id` bigint NOT NULL COMMENT '应用编号', | ||
| 10 | - `channel_id` bigint NOT NULL COMMENT '转账渠道编号', | ||
| 11 | - `channel_code` varchar(32) NOT NULL COMMENT '转账渠道编码', | ||
| 12 | - `merchant_transfer_id` varchar(64) NOT NULL COMMENT '商户转账单编号', | ||
| 13 | - `type` int NOT NULL COMMENT '类型', | ||
| 14 | - `status` tinyint NOT NULL COMMENT '转账状态', | ||
| 15 | - `success_time` datetime NULL COMMENT '转账成功时间', | ||
| 16 | - `price` int NOT NULL COMMENT '转账金额,单位:分', | ||
| 17 | - `subject` varchar(512) NOT NULL COMMENT '转账标题', | ||
| 18 | - `user_name` varchar(64) NULL COMMENT '收款人姓名', | ||
| 19 | - `alipay_logon_id` varchar(64) NULL COMMENT '支付宝登录号', | ||
| 20 | - `openid` varchar(64) NULL COMMENT '微信 openId', | ||
| 21 | - `notify_url` varchar(1024) NOT NULL COMMENT '异步通知商户地址', | ||
| 22 | - `user_ip` varchar(50) NOT NULL COMMENT '用户 IP', | ||
| 23 | - `channel_extras` varchar(512) NULL DEFAULT NULL COMMENT '渠道的额外参数', | ||
| 24 | - `channel_transfer_no` varchar(64) NULL DEFAULT NULL COMMENT '渠道转账单号', | ||
| 25 | - `channel_error_code` varchar(128) NULL DEFAULT NULL COMMENT '调用渠道的错误码', | ||
| 26 | - `channel_error_msg` varchar(256) NULL DEFAULT NULL COMMENT '调用渠道的错误提示', | ||
| 27 | - `channel_notify_data` varchar(4096) NULL DEFAULT NULL COMMENT '渠道的同步/异步通知的内容', | ||
| 28 | - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者', | ||
| 29 | - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | ||
| 30 | - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者', | ||
| 31 | - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', | ||
| 32 | - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | ||
| 33 | - `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | ||
| 34 | - PRIMARY KEY (`id`) USING BTREE | ||
| 35 | -) ENGINE=InnoDB COMMENT='转账单表'; | ||
| 36 | - | ||
| 37 | --- ---------------------------- | ||
| 38 | --- Table structure for pay_demo_transfer | ||
| 39 | --- ---------------------------- | ||
| 40 | -DROP TABLE IF EXISTS `pay_demo_transfer`; | ||
| 41 | -CREATE TABLE `pay_demo_transfer` ( | ||
| 42 | - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '订单编号', | ||
| 43 | - `app_id` bigint NOT NULL COMMENT '应用编号', | ||
| 44 | - `type` int NOT NULL COMMENT '转账类型', | ||
| 45 | - `price` int NOT NULL COMMENT '转账金额,单位:分', | ||
| 46 | - `user_name` varchar(64) NULL COMMENT '收款人姓名', | ||
| 47 | - `alipay_logon_id` varchar(64) NULL COMMENT '支付宝登录号', | ||
| 48 | - `openid` varchar(64) NULL COMMENT '微信 openId', | ||
| 49 | - `transfer_status` tinyint NOT NULL DEFAULT 0 COMMENT '转账状态', | ||
| 50 | - `pay_transfer_id` bigint NULL DEFAULT NULL COMMENT '转账订单编号', | ||
| 51 | - `pay_channel_code` varchar(16) NULL DEFAULT NULL COMMENT '转账支付成功渠道', | ||
| 52 | - `transfer_time` datetime NULL DEFAULT NULL COMMENT '转账支付时间', | ||
| 53 | - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '创建者', | ||
| 54 | - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | ||
| 55 | - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者', | ||
| 56 | - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', | ||
| 57 | - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | ||
| 58 | - `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | ||
| 59 | - PRIMARY KEY (`id`) USING BTREE | ||
| 60 | -) ENGINE = InnoDB COMMENT = '示例业务转账订单'; | ||
| 61 | - | ||
| 62 | - | ||
| 63 | --- ALTER TABLE `pay_channel` | ||
| 64 | --- MODIFY COLUMN `config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '支付渠道配置' AFTER `app_id`; | ||
| 65 | - | ||
| 66 | --- ---------------------------- | ||
| 67 | --- 充值套餐表 | ||
| 68 | --- ---------------------------- | ||
| 69 | -DROP TABLE IF EXISTS `pay_wallet_recharge_package`; | ||
| 70 | -CREATE TABLE `pay_wallet_recharge_package` | ||
| 71 | -( | ||
| 72 | - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', | ||
| 73 | - `name` varchar(64) NOT NULL COMMENT '套餐名', | ||
| 74 | - `pay_price` int NOT NULL COMMENT '支付金额', | ||
| 75 | - `bonus_price` int NOT NULL COMMENT '赠送金额', | ||
| 76 | - `status` tinyint NOT NULL COMMENT '状态', | ||
| 77 | - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '创建者', | ||
| 78 | - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | ||
| 79 | - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者', | ||
| 80 | - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', | ||
| 81 | - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | ||
| 82 | - `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | ||
| 83 | - PRIMARY KEY (`id`) USING BTREE | ||
| 84 | -) ENGINE=InnoDB COMMENT='充值套餐表'; | ||
| 85 | - | ||
| 86 | --- ---------------------------- | ||
| 87 | --- Table structure for pay_wallet_recharge | ||
| 88 | --- ---------------------------- | ||
| 89 | -DROP TABLE IF EXISTS `pay_wallet_recharge`; | ||
| 90 | -CREATE TABLE `pay_wallet_recharge` ( | ||
| 91 | - `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '编号', | ||
| 92 | - `wallet_id` bigint(0) NOT NULL COMMENT '会员钱包 id', | ||
| 93 | - `total_price` int(0) NOT NULL COMMENT '用户实际到账余额,例如充 100 送 20,则该值是 120', | ||
| 94 | - `pay_price` int(0) NOT NULL COMMENT '实际支付金额', | ||
| 95 | - `bonus_price` int(0) NOT NULL COMMENT '钱包赠送金额', | ||
| 96 | - `package_id` bigint(0) DEFAULT NULL COMMENT '充值套餐编号', | ||
| 97 | - `pay_status` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否已支付:[0:未支付 1:已经支付过]', | ||
| 98 | - `pay_order_id` bigint(0) DEFAULT NULL COMMENT '支付订单编号', | ||
| 99 | - `pay_channel_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付成功的支付渠道', | ||
| 100 | - `pay_time` datetime(0) DEFAULT NULL COMMENT '订单支付时间', | ||
| 101 | - `pay_refund_id` bigint(0) DEFAULT NULL COMMENT '支付退款单编号', | ||
| 102 | - `refund_total_price` int(0) NOT NULL DEFAULT 0 COMMENT '退款金额,包含赠送金额', | ||
| 103 | - `refund_pay_price` int(0) NOT NULL DEFAULT 0 COMMENT '退款支付金额', | ||
| 104 | - `refund_bonus_price` int(0) NOT NULL DEFAULT 0 COMMENT '退款钱包赠送金额', | ||
| 105 | - `refund_time` datetime(0) DEFAULT NULL COMMENT '退款时间', | ||
| 106 | - `refund_status` int(0) NOT NULL DEFAULT 0 COMMENT '退款状态', | ||
| 107 | - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', | ||
| 108 | - `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | ||
| 109 | - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', | ||
| 110 | - `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', | ||
| 111 | - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | ||
| 112 | - `tenant_id` bigint(0) NOT NULL DEFAULT 0 COMMENT '租户编号', | ||
| 113 | - PRIMARY KEY (`id`) USING BTREE | ||
| 114 | -) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '会员钱包充值' ROW_FORMAT = Dynamic; | ||
| 115 | - | ||
| 116 | --- 钱包充值套餐,钱包余额菜单脚本 | ||
| 117 | - | ||
| 118 | -INSERT INTO system_menu( | ||
| 119 | - name, permission, type, sort, parent_id, | ||
| 120 | - path, icon, component, status, component_name | ||
| 121 | -) | ||
| 122 | -VALUES ( | ||
| 123 | - '钱包管理', '', 1, 5, 1117, | ||
| 124 | - 'wallet', 'ep:caret-right', '', 0, '' | ||
| 125 | - ); | ||
| 126 | -SELECT @parentId1 := LAST_INSERT_ID(); | ||
| 127 | - | ||
| 128 | -INSERT INTO system_menu( | ||
| 129 | - name, permission, type, sort, parent_id, | ||
| 130 | - path, icon, component, status, component_name | ||
| 131 | -) | ||
| 132 | -VALUES ( | ||
| 133 | - '充值套餐', '', 2, 2, @parentId1, | ||
| 134 | - 'wallet-recharge-package', 'fa:leaf', 'pay/wallet/rechargePackage/index', 0, 'WalletRechargePackage' | ||
| 135 | - ); | ||
| 136 | -SELECT @parentId := LAST_INSERT_ID(); | ||
| 137 | - | ||
| 138 | --- 按钮 SQL | ||
| 139 | -INSERT INTO system_menu( | ||
| 140 | - name, permission, type, sort, parent_id, | ||
| 141 | - path, icon, component, status | ||
| 142 | -) | ||
| 143 | -VALUES ( | ||
| 144 | - '钱包充值套餐查询', 'pay:wallet-recharge-package:query', 3, 1, @parentId, | ||
| 145 | - '', '', '', 0 | ||
| 146 | - ); | ||
| 147 | -INSERT INTO system_menu( | ||
| 148 | - name, permission, type, sort, parent_id, | ||
| 149 | - path, icon, component, status | ||
| 150 | -) | ||
| 151 | -VALUES ( | ||
| 152 | - '钱包充值套餐创建', 'pay:wallet-recharge-package:create', 3, 2, @parentId, | ||
| 153 | - '', '', '', 0 | ||
| 154 | - ); | ||
| 155 | -INSERT INTO system_menu( | ||
| 156 | - name, permission, type, sort, parent_id, | ||
| 157 | - path, icon, component, status | ||
| 158 | -) | ||
| 159 | -VALUES ( | ||
| 160 | - '钱包充值套餐更新', 'pay:wallet-recharge-package:update', 3, 3, @parentId, | ||
| 161 | - '', '', '', 0 | ||
| 162 | - ); | ||
| 163 | -INSERT INTO system_menu( | ||
| 164 | - name, permission, type, sort, parent_id, | ||
| 165 | - path, icon, component, status | ||
| 166 | -) | ||
| 167 | -VALUES ( | ||
| 168 | - '钱包充值套餐删除', 'pay:wallet-recharge-package:delete', 3, 4, @parentId, | ||
| 169 | - '', '', '', 0 | ||
| 170 | - ); | ||
| 171 | - | ||
| 172 | -INSERT INTO system_menu( | ||
| 173 | - name, permission, type, sort, parent_id, | ||
| 174 | - path, icon, component, status, component_name | ||
| 175 | -) | ||
| 176 | -VALUES ( | ||
| 177 | - '钱包余额', '', 2, 1, @parentId1, | ||
| 178 | - 'wallet-balance', 'fa:leaf', 'pay/wallet/balance/index', 0, 'WalletBalance' | ||
| 179 | - ); | ||
| 180 | - | ||
| 181 | -SELECT @parentId := LAST_INSERT_ID(); | ||
| 182 | - | ||
| 183 | --- 按钮 SQL | ||
| 184 | -INSERT INTO system_menu( | ||
| 185 | - name, permission, type, sort, parent_id, | ||
| 186 | - path, icon, component, status | ||
| 187 | -) | ||
| 188 | -VALUES ( | ||
| 189 | - '钱包余额查询', 'pay:wallet:query', 3, 1, @parentId, | ||
| 190 | - '', '', '', 0 | ||
| 191 | - ); | ||
| 192 | - | ||
| 193 | --- 支付实战和转账实战数据库脚本 | ||
| 194 | - | ||
| 195 | -update system_menu set deleted = 1 where id = 2161; | ||
| 196 | - | ||
| 197 | -INSERT INTO system_menu( | ||
| 198 | - name, permission, type, sort, parent_id, | ||
| 199 | - path, icon, component, status, component_name | ||
| 200 | -) | ||
| 201 | -VALUES ( | ||
| 202 | - '接入示例', '', 1, 99, 1117, | ||
| 203 | - 'demo', 'ep:caret-right', '', 0, '' | ||
| 204 | - ); | ||
| 205 | - | ||
| 206 | -SELECT @parentId1 := LAST_INSERT_ID(); | ||
| 207 | - | ||
| 208 | -INSERT INTO system_menu( | ||
| 209 | - name, permission, type, sort, parent_id, | ||
| 210 | - path, icon, component, status, component_name | ||
| 211 | -) | ||
| 212 | -VALUES ( | ||
| 213 | - '支付实战', '', 2, 1, @parentId1, | ||
| 214 | - 'demo-order', 'fa:leaf', 'pay/demo/order/index', 0, NULL | ||
| 215 | - ); | ||
| 216 | - | ||
| 217 | -INSERT INTO system_menu( | ||
| 218 | - name, permission, type, sort, parent_id, | ||
| 219 | - path, icon, component, status, component_name | ||
| 220 | -) | ||
| 221 | -VALUES ( | ||
| 222 | - '转账实战', '', 2, 1, @parentId1, | ||
| 223 | - 'demo-transfer', 'fa:leaf', 'pay/demo/transfer/index', 0, NULL | ||
| 224 | - ); | ||
| 225 | - | ||
| 226 | --- 转账状态和转账类型数据字典 | ||
| 227 | -INSERT INTO `system_dict_type`(`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES ('支付转账类型', 'pay_transfer_type', 0, '', '1', '2023-10-28 16:27:18', '1', '2023-10-28 16:27:18', b'0', '1970-01-01 00:00:00'); | ||
| 228 | -INSERT INTO `system_dict_type`(`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES ('转账订单状态', 'pay_transfer_status', 0, '', '1', '2023-10-28 16:18:32', '1', '2023-10-28 16:18:32', b'0', '1970-01-01 00:00:00'); | ||
| 229 | - | ||
| 230 | -INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (4, '钱包余额', '4', 'pay_transfer_type', 0, 'info', '', '', '1', '2023-10-28 16:28:37', '1', '2023-10-28 16:28:37', b'0'); | ||
| 231 | -INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3, '银行卡', '3', 'pay_transfer_type', 0, 'default', '', '', '1', '2023-10-28 16:28:21', '1', '2023-10-28 16:28:21', b'0'); | ||
| 232 | -INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2, '微信余额', '2', 'pay_transfer_type', 0, 'info', '', '', '1', '2023-10-28 16:28:07', '1', '2023-10-28 16:28:07', b'0'); | ||
| 233 | -INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, '支付宝余额', '1', 'pay_transfer_type', 0, 'default', '', '', '1', '2023-10-28 16:27:44', '1', '2023-10-28 16:27:44', b'0'); | ||
| 234 | -INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (4, '转账失败', '30', 'pay_transfer_status', 0, 'warning', '', '', '1', '2023-10-28 16:24:16', '1', '2023-10-28 16:24:16', b'0'); | ||
| 235 | -INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3, '转账成功', '20', 'pay_transfer_status', 0, 'success', '', '', '1', '2023-10-28 16:23:50', '1', '2023-10-28 16:23:50', b'0'); | ||
| 236 | -INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2, '转账进行中', '10', 'pay_transfer_status', 0, 'info', '', '', '1', '2023-10-28 16:23:12', '1', '2023-10-28 16:23:12', b'0'); | ||
| 237 | -INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, '等待转账', '0', 'pay_transfer_status', 0, 'default', '', '', '1', '2023-10-28 16:21:43', '1', '2023-10-28 16:23:22', b'0'); | ||
| 238 | - | ||
| 239 | --- 转账订单菜单脚本 | ||
| 240 | - | ||
| 241 | -INSERT INTO system_menu( | ||
| 242 | - name, permission, type, sort, parent_id, | ||
| 243 | - path, icon, component, status, component_name | ||
| 244 | -) | ||
| 245 | -VALUES ( | ||
| 246 | - '转账订单', '', 2, 3, 1117, | ||
| 247 | - 'transfer', 'ep:credit-card', 'pay/transfer/index', 0, 'PayTransfer' | ||
| 248 | - ); | ||
| 249 | - | ||
| 250 | --- 转账通知脚本 | ||
| 251 | - | ||
| 252 | -ALTER TABLE `pay_app` | ||
| 253 | - ADD COLUMN `transfer_notify_url` varchar(1024) NOT NULL COMMENT '转账结果的回调地址' AFTER `refund_notify_url`; | ||
| 254 | -ALTER TABLE `pay_notify_task` | ||
| 255 | - MODIFY COLUMN `merchant_order_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '商户订单编号' AFTER `status`, | ||
| 256 | - ADD COLUMN `merchant_transfer_id` varchar(64) COMMENT '商户转账单编号' AFTER `merchant_order_id`; | ||
| 257 | \ No newline at end of file | 0 | \ No newline at end of file |
sql/mysql/optinal/product_browse_history.sql deleted
| 1 | -CREATE TABLE product_browse_history | ||
| 2 | -( | ||
| 3 | - id bigint AUTO_INCREMENT COMMENT '记录编号' | ||
| 4 | - PRIMARY KEY, | ||
| 5 | - user_id bigint NOT NULL COMMENT '用户编号', | ||
| 6 | - spu_id bigint NOT NULL COMMENT '商品 SPU 编号', | ||
| 7 | - user_deleted bit DEFAULT b'0' NOT NULL COMMENT '用户是否删除', | ||
| 8 | - creator varchar(64) DEFAULT '' NULL COMMENT '创建者', | ||
| 9 | - create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL COMMENT '创建时间', | ||
| 10 | - updater varchar(64) DEFAULT '' NULL COMMENT '更新者', | ||
| 11 | - update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', | ||
| 12 | - deleted bit DEFAULT b'0' NOT NULL COMMENT '是否删除', | ||
| 13 | - tenant_id bigint DEFAULT 0 NOT NULL COMMENT '租户编号' | ||
| 14 | -) | ||
| 15 | - COMMENT '商品浏览记录表'; | ||
| 16 | - | ||
| 17 | -CREATE INDEX idx_spuId | ||
| 18 | - ON product_browse_history (spu_id); | ||
| 19 | - | ||
| 20 | -CREATE INDEX idx_userId | ||
| 21 | - ON product_browse_history (user_id); | ||
| 22 | - |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java
| @@ -64,7 +64,6 @@ public interface MemberGroupService { | @@ -64,7 +64,6 @@ public interface MemberGroupService { | ||
| 64 | */ | 64 | */ |
| 65 | PageResult<MemberGroupDO> getGroupPage(MemberGroupPageReqVO pageReqVO); | 65 | PageResult<MemberGroupDO> getGroupPage(MemberGroupPageReqVO pageReqVO); |
| 66 | 66 | ||
| 67 | - | ||
| 68 | /** | 67 | /** |
| 69 | * 获得指定状态的用户分组列表 | 68 | * 获得指定状态的用户分组列表 |
| 70 | * | 69 | * |
| @@ -73,7 +72,6 @@ public interface MemberGroupService { | @@ -73,7 +72,6 @@ public interface MemberGroupService { | ||
| 73 | */ | 72 | */ |
| 74 | List<MemberGroupDO> getGroupListByStatus(Integer status); | 73 | List<MemberGroupDO> getGroupListByStatus(Integer status); |
| 75 | 74 | ||
| 76 | - | ||
| 77 | /** | 75 | /** |
| 78 | * 获得开启状态的用户分组列表 | 76 | * 获得开启状态的用户分组列表 |
| 79 | * | 77 | * |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordService.java
| 1 | package cn.iocoder.yudao.module.member.service.point; | 1 | package cn.iocoder.yudao.module.member.service.point; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.common.pojo.PageParam; | ||
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO; | 4 | import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO; |
| 6 | import cn.iocoder.yudao.module.member.controller.app.point.vo.AppMemberPointRecordPageReqVO; | 5 | import cn.iocoder.yudao.module.member.controller.app.point.vo.AppMemberPointRecordPageReqVO; |
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/demo/PayDemoTransferDO.java
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/transfer/PayTransferDO.java