Skip to content

J
jiedao-api-boot-master
Commit 2ec88a7c authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'test' into dev

parents 575f8b1f b8c4ba8e
Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 94 deletions
sql/v2.1/20240826.sql
View file @ 2ec88a7c
-- 这里是补充脚本，生产环境已存在
-- 添加新字段
alter table `ecw_customer` add column `no_consignee` bit(1) NOT NULL DEFAULT b'0' COMMENT '控货无收货人';
alter table `ecw_customer` add column `default_pay` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否默认付款';
-- 添加新字段
alter table `ecw_warehouse` add column `rent_free_days` int DEFAULT NULL COMMENT '仓库免租期';
alter table `ecw_warehouse` add column `lock_recipient_days` int DEFAULT NULL COMMENT '锁定收货人天数';
sql/数据字典备份脚本/system_dict_update_20240815.sql
View file @ 2ec88a7c
SET FOREIGN_KEY_CHECKS = 0;
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2751, 0, '上门领取', '1', 'way_of_receiving', 0, 'default', '', NULL, '1', '2024-07-23 13:16:51', '1', '2024-07-23 13:16:51', b'0', 'Collect at home');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (0, '上门领取', '1', 'way_of_receiving', 0, 'default', '', NULL, '1', '2024-07-23 13:16:51', '1', '2024-07-23 13:16:51', b'0', 'Collect at home');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2752, 0, '包邮到家', '2', 'way_of_receiving', 0, 'default', '', NULL, '1', '2024-07-23 13:17:49', '1', '2024-07-23 13:17:49', b'0', 'Free home delivery');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (0, '包邮到家', '2', 'way_of_receiving', 0, 'default', '', NULL, '1', '2024-07-23 13:17:49', '1', '2024-07-23 13:17:49', b'0', 'Free home delivery');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2753, 2, '邮寄到付', '3', 'way_of_receiving', 0, 'default', '', NULL, '1', '2024-07-23 13:18:24', '1', '2024-07-23 13:18:24', b'0', 'Collect by post');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, '邮寄到付', '3', 'way_of_receiving', 0, 'default', '', NULL, '1', '2024-07-23 13:18:24', '1', '2024-07-23 13:18:24', b'0', 'Collect by post');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2754, 1, '未启用', '2', 'gift_status', 0, 'default', '', NULL, '1', '2024-07-23 13:23:20', '1', '2024-07-23 13:41:16', b'0', 'Not enabled');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '未启用', '2', 'gift_status', 0, 'default', '', NULL, '1', '2024-07-23 13:23:20', '1', '2024-07-23 13:41:16', b'0', 'Not enabled');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2755, 0, '已启用', '1', 'gift_status', 0, 'default', '', NULL, '1', '2024-07-23 13:23:45', '1', '2024-07-23 13:41:07', b'0', 'Enabled');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (0, '已启用', '1', 'gift_status', 0, 'default', '', NULL, '1', '2024-07-23 13:23:45', '1', '2024-07-23 13:41:07', b'0', 'Enabled');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2756, 2, '已关闭', '3', 'gift_status', 0, 'default', '', NULL, '1', '2024-07-23 13:24:42', '1', '2024-07-23 13:24:42', b'0', 'Disabled');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, '已关闭', '3', 'gift_status', 0, 'default', '', NULL, '1', '2024-07-23 13:24:42', '1', '2024-07-23 13:24:42', b'0', 'Disabled');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2757, 3, '已过期', '4', 'gift_status', 0, 'default', '', NULL, '1', '2024-07-23 13:25:25', '1', '2024-07-23 13:25:25', b'0', 'Expired');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (3, '已过期', '4', 'gift_status', 0, 'default', '', NULL, '1', '2024-07-23 13:25:25', '1', '2024-07-23 13:25:25', b'0', 'Expired');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2758, 1, '启用', '1', 'gift_enable_status', 0, 'default', '', NULL, '1', '2024-07-25 14:40:30', '1', '2024-07-25 14:40:30', b'0', 'enable');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '启用', '1', 'gift_enable_status', 0, 'default', '', NULL, '1', '2024-07-25 14:40:30', '1', '2024-07-25 14:40:30', b'0', 'enable');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2759, 1, '不启用', '2', 'gift_enable_status', 0, 'default', '', NULL, '1', '2024-07-25 14:41:15', '1', '2024-07-25 14:41:15', b'0', 'disable');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '不启用', '2', 'gift_enable_status', 0, 'default', '', NULL, '1', '2024-07-25 14:41:15', '1', '2024-07-25 14:41:15', b'0', 'disable');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2760, 0, '新增', '1', 'member_user_score_log_operate_type', 0, 'default', '', NULL, '1', '2024-07-26 14:20:48', '1', '2024-07-26 14:20:48', b'0', 'add');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (0, '新增', '1', 'member_user_score_log_operate_type', 0, 'default', '', NULL, '1', '2024-07-26 14:20:48', '1', '2024-07-26 14:20:48', b'0', 'add');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2761, 1, '减少', '2', 'member_user_score_log_operate_type', 0, 'default', '', NULL, '1', '2024-07-26 14:21:06', '1', '2024-07-26 14:21:06', b'0', 'reduce');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '减少', '2', 'member_user_score_log_operate_type', 0, 'default', '', NULL, '1', '2024-07-26 14:21:06', '1', '2024-07-26 14:21:06', b'0', 'reduce');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2762, 1, '人工操作', '1', 'member_score_source', 0, 'default', '', NULL, '1', '2024-07-26 14:23:18', '1', '2024-07-26 14:23:18', b'0', 'manual operation');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '人工操作', '1', 'member_score_source', 0, 'default', '', NULL, '1', '2024-07-26 14:23:18', '1', '2024-07-26 14:23:18', b'0', 'manual operation');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2763, 2, '兑换礼品', '2', 'member_score_source', 0, 'default', '', NULL, '1', '2024-07-26 14:23:32', '1', '2024-07-26 14:23:32', b'0', 'redeem reward');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, '兑换礼品', '2', 'member_score_source', 0, 'default', '', NULL, '1', '2024-07-26 14:23:32', '1', '2024-07-26 14:23:32', b'0', 'redeem reward');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2764, 3, '系统过期', '3', 'member_score_source', 0, 'default', '', NULL, '1', '2024-07-26 14:23:47', '1', '2024-07-26 14:23:47', b'0', 'system expired');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (3, '系统过期', '3', 'member_score_source', 0, 'default', '', NULL, '1', '2024-07-26 14:23:47', '1', '2024-07-26 14:23:47', b'0', 'system expired');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2765, 1, '后台', '1', 'redeem_reward_entrance', 0, 'default', '', NULL, '1', '2024-07-26 14:27:57', '1', '2024-08-06 09:17:29', b'1', 'background');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '后台', '1', 'redeem_reward_entrance', 0, 'default', '', NULL, '1', '2024-07-26 14:27:57', '1', '2024-08-06 09:17:29', b'1', 'background');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2766, 2, '网页端', '3', 'redeem_reward_entrance', 0, 'default', '', NULL, '1', '2024-07-26 14:28:08', '1', '2024-08-06 09:18:29', b'0', 'web');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, '网页端', '3', 'redeem_reward_entrance', 0, 'default', '', NULL, '1', '2024-07-26 14:28:08', '1', '2024-08-06 09:18:29', b'0', 'web');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2767, 3, '客户端', '2', 'redeem_reward_entrance', 0, 'default', '', NULL, '1', '2024-07-26 14:28:17', '1', '2024-08-06 09:18:23', b'0', 'app');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (3, '客户端', '2', 'redeem_reward_entrance', 0, 'default', '', NULL, '1', '2024-07-26 14:28:17', '1', '2024-08-06 09:18:23', b'0', 'app');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2768, 1, '兑换中', '1', 'reward_redeem_status', 0, 'default', '', NULL, '1', '2024-07-26 15:04:08', '1', '2024-07-26 15:04:08', b'0', 'redeeming');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '兑换中', '1', 'reward_redeem_status', 0, 'default', '', NULL, '1', '2024-07-26 15:04:08', '1', '2024-07-26 15:04:08', b'0', 'redeeming');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2769, 2, '已兑换', '2', 'reward_redeem_status', 0, 'default', '', NULL, '1', '2024-07-26 15:04:26', '1', '2024-07-26 15:04:26', b'0', 'redeemed');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, '已兑换', '2', 'reward_redeem_status', 0, 'default', '', NULL, '1', '2024-07-26 15:04:26', '1', '2024-07-26 15:04:26', b'0', 'redeemed');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2770, 3, '已取消', '3', 'reward_redeem_status', 0, 'default', '', NULL, '1', '2024-07-26 15:04:38', '1', '2024-07-26 15:04:38', b'0', 'canceled');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (3, '已取消', '3', 'reward_redeem_status', 0, 'default', '', NULL, '1', '2024-07-26 15:04:38', '1', '2024-07-26 15:04:38', b'0', 'canceled');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2771, 0, '订单V值', '1', 'score_rule_type', 0, 'default', '', NULL, '1', '2024-07-29 13:22:22', '1', '2024-07-29 13:23:19', b'0', 'order v');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (0, '订单V值', '1', 'score_rule_type', 0, 'default', '', NULL, '1', '2024-07-29 13:22:22', '1', '2024-07-29 13:23:19', b'0', 'order v');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2772, 1, '注册', '2', 'score_rule_type', 0, 'default', '', NULL, '1', '2024-07-29 13:23:54', '1', '2024-07-29 13:23:54', b'0', 'register');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '注册', '2', 'score_rule_type', 0, 'default', '', NULL, '1', '2024-07-29 13:23:54', '1', '2024-07-29 13:23:54', b'0', 'register');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2773, 2, '推荐', '3', 'score_rule_type', 0, 'default', '', NULL, '1', '2024-07-29 13:24:25', '1', '2024-07-29 13:24:25', b'0', 'recommend');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, '推荐', '3', 'score_rule_type', 0, 'default', '', NULL, '1', '2024-07-29 13:24:25', '1', '2024-07-29 13:24:25', b'0', 'recommend');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2774, 3, '分享活动', '4', 'score_rule_type', 0, 'default', '', NULL, '1', '2024-07-29 13:24:53', '1', '2024-07-29 13:24:53', b'0', 'share');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (3, '分享活动', '4', 'score_rule_type', 0, 'default', '', NULL, '1', '2024-07-29 13:24:53', '1', '2024-07-29 13:24:53', b'0', 'share');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2775, 0, '后台', '1', 'platform_type', 0, 'default', '', NULL, '1', '2024-07-29 13:37:00', '1', '2024-07-29 13:38:49', b'0', 'backend');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (0, '后台', '1', 'platform_type', 0, 'default', '', NULL, '1', '2024-07-29 13:37:00', '1', '2024-07-29 13:38:49', b'0', 'backend');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2776, 1, 'APP', '2', 'platform_type', 0, 'default', '', NULL, '1', '2024-07-29 13:37:15', '1', '2024-07-29 13:38:01', b'0', 'APP');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, 'APP', '2', 'platform_type', 0, 'default', '', NULL, '1', '2024-07-29 13:37:15', '1', '2024-07-29 13:38:01', b'0', 'APP');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2777, 2, 'WEB', '3', 'platform_type', 0, 'default', '', NULL, '1', '2024-07-29 13:37:55', '1', '2024-07-29 13:37:55', b'0', 'WEB');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, 'WEB', '3', 'platform_type', 0, 'default', '', NULL, '1', '2024-07-29 13:37:55', '1', '2024-07-29 13:37:55', b'0', 'WEB');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2781, 33, '礼品兑换记录', '33', 'download_type', 0, 'default', '', NULL, '1', '2024-07-30 14:11:06', '1', '2024-07-30 14:11:06', b'0', 'RewardRedeemRecord');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (33, '礼品兑换记录', '33', 'download_type', 0, 'default', '', NULL, '1', '2024-07-30 14:11:06', '1', '2024-07-30 14:11:06', b'0', 'RewardRedeemRecord');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2782, 4, '兑换礼品撤销', '4', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 11:14:32', '1', '2024-08-01 11:14:32', b'0', 'redeem reward cancel');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (4, '兑换礼品撤销', '4', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 11:14:32', '1', '2024-08-01 11:14:32', b'0', 'redeem reward cancel');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2783, 5, '订单V值', '5', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 11:18:40', '1', '2024-08-01 13:48:33', b'0', 'oder V');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (5, '订单V值', '5', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 11:18:40', '1', '2024-08-01 13:48:33', b'0', 'oder V');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2784, 7, '推荐', '7', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 14:01:43', '1', '2024-08-01 14:01:43', b'0', 'recommend');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (7, '推荐', '7', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 14:01:43', '1', '2024-08-01 14:01:43', b'0', 'recommend');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2785, 6, '注册', '6', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 14:02:25', '1', '2024-08-01 14:02:25', b'0', 'register');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (6, '注册', '6', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 14:02:25', '1', '2024-08-01 14:02:25', b'0', 'register');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2786, 8, '分享活动', '8', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 14:02:45', '1', '2024-08-01 14:13:23', b'0', 'share');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (8, '分享活动', '8', 'member_score_source', 0, 'default', '', NULL, '1', '2024-08-01 14:02:45', '1', '2024-08-01 14:13:23', b'0', 'share');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2787, 0, '是', '0', 'yes_or_no', 0, 'default', '', NULL, '1', '2024-08-06 15:16:26', '1', '2024-08-06 15:16:26', b'0', 'YES');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (0, '是', '0', 'yes_or_no', 0, 'default', '', NULL, '1', '2024-08-06 15:16:26', '1', '2024-08-06 15:16:26', b'0', 'YES');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2788, 0, '否', '1', 'yes_or_no', 0, 'default', '', NULL, '1', '2024-08-06 15:16:37', '1', '2024-08-06 15:16:37', b'0', 'NO');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (0, '否', '1', 'yes_or_no', 0, 'default', '', NULL, '1', '2024-08-06 15:16:37', '1', '2024-08-06 15:16:37', b'0', 'NO');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2789, 1, 'APP', '2', 'client_platform', 0, 'default', '', NULL, '1', '2024-08-08 09:24:26', '1', '2024-08-08 09:51:47', b'0', 'APP');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, 'APP', '2', 'client_platform', 0, 'default', '', NULL, '1', '2024-08-08 09:24:26', '1', '2024-08-08 09:51:47', b'0', 'APP');
INSERT INTO `jiedao`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2790, 2, 'WEB', '3', 'client_platform', 0, 'default', '', NULL, '1', '2024-08-08 09:24:42', '1', '2024-08-08 09:51:52', b'0', 'WEB');
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, 'WEB', '3', 'client_platform', 0, 'default', '', NULL, '1', '2024-08-08 09:24:42', '1', '2024-08-08 09:51:52', b'0', 'WEB');
UPDATE `jiedao`.`system_dict_data` SET `sort` = 0, `label` = '大于', `value` = '1', `dict_type` = 'quantitative_relation_symbol', `status` = 0, `color_type` = 'default', `css_class` = '', `remark` = NULL, `creator` = '1', `create_time` = '2024-07-23 10:27:47', `updater` = '1', `update_time` = '2024-07-23 10:27:47', `deleted` = b'0', `label_en` = 'Greater than' WHERE `id` = 2748;
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (0, '大于', '1', 'quantitative_relation_symbol', 0, 'default', '', NULL, '1', '2024-07-23 10:27:47', '1', '2024-07-23 10:27:47', b'0', 'Greater than');
UPDATE `jiedao`.`system_dict_data` SET `sort` = 1, `label` = '等于', `value` = '2', `dict_type` = 'quantitative_relation_symbol', `status` = 0, `color_type` = 'default', `css_class` = '', `remark` = NULL, `creator` = '1', `create_time` = '2024-07-23 10:28:04', `updater` = '1', `update_time` = '2024-07-23 10:28:04', `deleted` = b'0', `label_en` = 'Equal' WHERE `id` = 2749;
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '等于', '2', 'quantitative_relation_symbol', 0, 'default', '', NULL, '1', '2024-07-23 10:28:04', '1', '2024-07-23 10:28:04', b'0', 'Equal');
UPDATE `jiedao`.`system_dict_data` SET `sort` = 2, `label` = '小于', `value` = '3', `dict_type` = 'quantitative_relation_symbol', `status` = 0, `color_type` = 'default', `css_class` = '', `remark` = NULL, `creator` = '1', `create_time` = '2024-07-23 10:28:58', `updater` = '1', `update_time` = '2024-07-23 10:28:58', `deleted` = b'0', `label_en` = 'Less than' WHERE `id` = 2750;
INSERT INTO `jiedao`.`system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, '小于', '3', 'quantitative_relation_symbol', 0, 'default', '', NULL, '1', '2024-07-23 10:28:58', '1', '2024-07-23 10:28:58', b'0', 'Less than');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (427, '数量关系符号', 'quantitative_relation_symbol', 0, NULL, '1', '2024-07-23 10:27:02', '1', '2024-07-23 10:27:02', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('数量关系符号', 'quantitative_relation_symbol', 0, NULL, '1', '2024-07-23 10:27:02', '1', '2024-07-23 10:27:02', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (428, '领取方式', 'way_of_receiving', 0, NULL, '1', '2024-07-23 13:14:40', '1', '2024-07-23 13:14:40', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('领取方式', 'way_of_receiving', 0, NULL, '1', '2024-07-23 13:14:40', '1', '2024-07-23 13:14:40', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (429, '礼品状态', 'gift_status', 0, NULL, '1', '2024-07-23 13:19:44', '1', '2024-07-23 13:19:44', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('礼品状态', 'gift_status', 0, NULL, '1', '2024-07-23 13:19:44', '1', '2024-07-23 13:19:44', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (430, '礼品启用状态', 'gift_enable_status', 0, NULL, '1', '2024-07-25 14:37:35', '1', '2024-07-25 14:37:35', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('礼品启用状态', 'gift_enable_status', 0, NULL, '1', '2024-07-25 14:37:35', '1', '2024-07-25 14:37:35', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (431, '会员积分日志操作类型', 'member_user_score_log_operate_type', 0, NULL, '1', '2024-07-26 14:20:27', '1', '2024-07-26 14:20:27', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('会员积分日志操作类型', 'member_user_score_log_operate_type', 0, NULL, '1', '2024-07-26 14:20:27', '1', '2024-07-26 14:20:27', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (432, '会员积分来源', 'member_score_source', 0, NULL, '1', '2024-07-26 14:22:30', '1', '2024-07-26 14:22:30', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('会员积分来源', 'member_score_source', 0, NULL, '1', '2024-07-26 14:22:30', '1', '2024-07-26 14:22:30', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (433, '礼品兑换入口', 'redeem_reward_entrance', 0, NULL, '1', '2024-07-26 14:27:40', '1', '2024-08-06 09:18:11', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('礼品兑换入口', 'redeem_reward_entrance', 0, NULL, '1', '2024-07-26 14:27:40', '1', '2024-08-06 09:18:11', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (434, '礼品兑换状态', 'reward_redeem_status', 0, NULL, '1', '2024-07-26 15:03:53', '1', '2024-07-26 15:03:53', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('礼品兑换状态', 'reward_redeem_status', 0, NULL, '1', '2024-07-26 15:03:53', '1', '2024-07-26 15:03:53', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (435, '积分规则指标类型', 'score_rule_type', 0, NULL, '1', '2024-07-29 13:21:38', '1', '2024-07-29 13:21:38', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('积分规则指标类型', 'score_rule_type', 0, NULL, '1', '2024-07-29 13:21:38', '1', '2024-07-29 13:21:38', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (436, '平台入口', 'platform_type', 0, NULL, '1', '2024-07-29 13:36:23', '1', '2024-07-29 13:36:23', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('平台入口', 'platform_type', 0, NULL, '1', '2024-07-29 13:36:23', '1', '2024-07-29 13:36:23', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (437, '快递公司', 'express_company', 1, NULL, '1', '2024-07-29 15:34:43', '1', '2024-07-30 11:09:44', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('快递公司', 'express_company', 1, NULL, '1', '2024-07-29 15:34:43', '1', '2024-07-30 11:09:44', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (438, '是否开启', 'yes_or_no', 0, NULL, '1', '2024-08-06 15:15:58', '1', '2024-08-06 15:15:58', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('是否开启', 'yes_or_no', 0, NULL, '1', '2024-08-06 15:15:58', '1', '2024-08-06 15:15:58', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (439, 'c端平台', 'client_platform', 0, NULL, '1', '2024-08-08 09:23:52', '1', '2024-08-08 09:27:56', b'0');
INSERT INTO `jiedao`.`system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('c端平台', 'client_platform', 0, NULL, '1', '2024-08-08 09:23:52', '1', '2024-08-08 09:27:56', b'0');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/AbstractMapper.java
View file @ 2ec88a7c
......@@ -55,7 +55,7 @@ public interface AbstractMapper<T> extends BaseMapper<T> {
IPage<T> mpPage = MyBatisUtils.buildPage(pageParam);
selectPage(mpPage, queryWrapper);
// 转换返回
return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
return new PageResult<>(mpPage.getRecords(), mpPage.getTotal(), mpPage.getSize(), mpPage.getCurrent(), mpPage.getPages());
}
/***
......
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customerFollowup/CustomerFollowupQueryVO.java
View file @ 2ec88a7c
......@@ -85,4 +85,15 @@ public class CustomerFollowupQueryVO extends PageParam {
@ApiModelProperty(value = "结束创建时间")
private Date endCreateTime;
@ApiModelProperty(value = "跟进类型，下拉多选")
private List<Integer> followTypes;
@ApiModelProperty(value = "跟进方式，下拉多选")
private List<Integer> followMethods;
@ApiModelProperty(value = "跟进结果，下拉多选")
private List<Integer> resultTypes;
//跟进状态，多选，逗号分隔
@ApiModelProperty(value = "跟进状态，下拉多选")
private List<Integer> statuses;
}
yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerFollowupMapper.xml
View file @ 2ec88a7c
......@@ -38,6 +38,35 @@
AND a.result_type = #{query.resultType}
</if>
<if test="query.followTypes != null and query.followTypes.size()>0">
AND
<foreach item='item' index="index" collection='query.followTypes' open='(' separator='or' close=')'>
FIND_IN_SET(#{item}, a.follow_type)
</foreach>
</if>
<if test="query.followMethods != null and query.followMethods.size()>0">
AND
<foreach item='item' index="index" collection='query.followMethods' open='(' separator='or' close=')'>
FIND_IN_SET(#{item}, a.follow_method)
</foreach>
</if>
<if test="query.resultTypes != null and query.resultTypes.size()>0">
AND
<foreach item='item' index="index" collection='query.resultTypes' open='(' separator='or' close=')'>
FIND_IN_SET(#{item}, a.result_type)
</foreach>
</if>
<if test="query.statuses != null and query.statuses.size()>0">
AND
<foreach item='item' index="index" collection='query.statuses' open='(' separator='or' close=')'>
FIND_IN_SET(#{item}, a.status)
</foreach>
</if>
</sql>
<select id="selectPage1" resultType="cn.iocoder.yudao.module.customer.dal.dataobject.customerFollowup.CustomerFollowupDO">
......
yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerMergeServiceImpl.java
View file @ 2ec88a7c
......@@ -9,15 +9,13 @@ import cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO;
import cn.iocoder.yudao.module.customer.dal.dataobject.customer.complaint.CustomerComplaintDO;
import cn.iocoder.yudao.module.customer.dal.dataobject.customer.follow.CustomerFollowDO;
import cn.iocoder.yudao.module.customer.dal.dataobject.customerContacts.CustomerContactsDO;
import cn.iocoder.yudao.module.customer.dal.dataobject.customerFollowup.CustomerFollowupDO;
import cn.iocoder.yudao.module.customer.service.customer.CustomerService;
import cn.iocoder.yudao.module.customer.service.customer.commission.CustomerCommissionService;
import cn.iocoder.yudao.module.customer.service.customer.complaint.CustomerComplaintService;
import cn.iocoder.yudao.module.customer.service.customer.complaint.follow.CustomerFollowService;
import cn.iocoder.yudao.module.customer.service.customerContacts.CustomerContactsService;
import cn.iocoder.yudao.module.customer.service.customerCredit.CustomerCreditService;
import cn.iocoder.yudao.module.customer.service.customerLevel.CustomerLevelService;
import cn.iocoder.yudao.module.customer.service.customerFollowup.CustomerFollowupService;
import cn.iocoder.yudao.module.customer.service.customerLevelLog.CustomerLevelLogService;
import cn.iocoder.yudao.module.customer.service.customerLevelLog.CustomerLevelLogServiceImpl;
import cn.iocoder.yudao.module.customer.service.customerOperateLog.CustomerOperateLogService;
import cn.iocoder.yudao.module.customer.vo.customerOperateLog.CustomerOperateLogCreateReqVO;
import cn.iocoder.yudao.module.ecw.enums.CustomerOperateTypeEnum;
......@@ -60,7 +58,7 @@ public class CustomerMergeServiceImpl implements CustomerMergeService {
//客户跟进
@Resource
CustomerFollowService customerFollowService;
CustomerFollowupService customerFollowupService;
@Resource
private CustomerComplaintService customerComplaintService;
......@@ -134,7 +132,7 @@ public class CustomerMergeServiceImpl implements CustomerMergeService {
//合并报价单 2
doMogeOffer(customerDOSaved, customerDODeleted, loginUserId);
//合并跟进记录 3
doMergeCustomerFollow(customerDOSaved, customerDODeleted, loginUserId);
doMergeCustomerFollowup(customerDOSaved, customerDODeleted, loginUserId);
//合并客户投诉 4
doMergeCustomerComplaint(customerDOSaved, customerDODeleted, loginUserId);
//合并产品品牌授权 6
......@@ -293,19 +291,19 @@ public class CustomerMergeServiceImpl implements CustomerMergeService {
//合并客户跟进
private void doMergeCustomerFollow(CustomerDO customerDOSaved,
CustomerDO customerDODeleted,
long loginUserId) {
private void doMergeCustomerFollowup(CustomerDO customerDOSaved,
CustomerDO customerDODeleted,
long loginUserId) {
LambdaQueryWrapperX q2 =
new LambdaQueryWrapperX<CustomerFollowDO>().
eq(CustomerFollowDO::getCustomerId, customerDODeleted.getId());
List<CustomerFollowDO> list = customerFollowService.selectList(q2);
new LambdaQueryWrapperX<CustomerFollowupDO>().
eq(CustomerFollowupDO::getCustomerId, customerDODeleted.getId());
List<CustomerFollowupDO> list = customerFollowupService.selectList(q2);
if (CollectionUtil.isEmpty(list)) return;
for (CustomerFollowDO d : list
for (CustomerFollowupDO d : list
) {
d.setCustomerId(customerDOSaved.getId());
customerFollowService.updateById(d);
customerFollowupService.updateById(d);
}
}
......
yudao-module-depository/yudao-module-depository-rest/src/main/java/cn/iocoder/yudao/module/depository/controller/admin/warehouse/WarehouseController.java
View file @ 2ec88a7c
......@@ -33,6 +33,7 @@ import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
......@@ -109,7 +110,7 @@ public class WarehouseController {
@GetMapping("/getGuojiaAndShiAndWarehouseList")
@ApiOperation("获取仓库区域并行国家、城市、仓库列表")
@ApiImplicitParam(name = "tradeType", value = "进出口类型,1-进口，2-出口", required = false, example = "1", dataTypeClass = Integer.class)
@ApiImplicitParam(name = "tradeType", value = "进出口类型,1-进口，2-出口", required = true, example = "1", dataTypeClass = Integer.class)
public CommonResult<WarehouseListVO> getGuojiaAndShiAndWarehouseList(Integer tradeType){
WarehouseListVO warehouseListVO = warehouseService.getGuojiaAndShiAndWarehouseList(tradeType);
return success(warehouseListVO);
......@@ -216,6 +217,9 @@ public class WarehouseController {
channelInfoEvent.setChannelId(requestVO.getChannelId());
applicationContext.publishEvent(channelInfoEvent);
if (Objects.nonNull(channelInfoEvent.getCountryId()) && channelInfoEvent.getCountryId() > 0L){
if (Objects.nonNull(requestVO.getDestCountryId()) && requestVO.getDestCountryId() > 0L && !Objects.equals(requestVO.getDestCountryId(),channelInfoEvent.getCountryId())) {
return error(400,"目的国与渠道不匹配");
}
requestVO.setDestCountryId(channelInfoEvent.getCountryId());
}
}
......
yudao-module-depository/yudao-module-depository-rest/src/main/java/cn/iocoder/yudao/module/depository/controller/app/warehouse/AppWarehouseController.java
View file @ 2ec88a7c
......@@ -29,6 +29,7 @@ import javax.validation.Valid;
import java.util.*;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Api(tags = "app-web - 仓库")
......@@ -137,6 +138,9 @@ public class AppWarehouseController {
channelInfoEvent.setChannelId(requestVO.getChannelId());
applicationContext.publishEvent(channelInfoEvent);
if (Objects.nonNull(channelInfoEvent.getCountryId()) && channelInfoEvent.getCountryId() > 0L){
if (Objects.nonNull(requestVO.getDestCountryId()) && requestVO.getDestCountryId() > 0L && !Objects.equals(requestVO.getDestCountryId(),channelInfoEvent.getCountryId())) {
return error(400,"目的国与渠道不匹配");
}
requestVO.setDestCountryId(channelInfoEvent.getCountryId());
}
}
......@@ -186,7 +190,7 @@ public class AppWarehouseController {
@GetMapping("/getGuojiaAndShiAndWarehouseList")
@ApiOperation("获取仓库区域并行国家、城市、仓库列表")
@ApiImplicitParam(name = "tradeType", value = "进出口类型,1-进口，2-出口", required = false, example = "1", dataTypeClass = Integer.class)
@ApiImplicitParam(name = "tradeType", value = "进出口类型,1-进口，2-出口", required = true, example = "1", dataTypeClass = Integer.class)
public CommonResult<WarehouseListVO> getGuojiaAndShiAndWarehouseList(Integer tradeType){
WarehouseListVO warehouseListVO = warehouseService.getGuojiaAndShiAndWarehouseList(tradeType);
return success(warehouseListVO);
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderCargoControlPick/OrderCargoControlPickMapper.java
View file @ 2ec88a7c
......@@ -111,6 +111,10 @@ public interface OrderCargoControlPickMapper extends AbstractMapper<OrderCargoCo
"o.sum_volume, ",
"o.sum_weight, ",
"o.create_time, ",
"o.`unload_time`, ",
"o.`is_limit_update_consignee`, ",
"o.`lock_consignee_time`, ",
"o.`lock_consignee_day`, ",
"nee.name as consignee_name, ",
"nee.name_en as consignee_name_en, ",
"nee.phone as consignee_phone, ",
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java
View file @ 2ec88a7c
......@@ -2322,6 +2322,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
//15 是费用计算
//10 入仓更新
//30 空运定时刷新价格
@Override
public void costCalculation(String userId,
OrderDO orderDO,
Long consignorCustomerId,
......@@ -2728,7 +2729,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
// 拆单后的子订单直接去生成应收
isPayAdvanceException = this.addOrderReceivable(orderDO, 1);
} else {
if (type == 6 && Objects.equals(orderDO.getInWarehouseState(), OrderWarehouseInStatusEnum.warehouse_finished.getValue())) {
if ((type == 6 || type == 12) && Objects.equals(orderDO.getInWarehouseState(), OrderWarehouseInStatusEnum.warehouse_finished.getValue())) {
// 处理未报价时，如果是已入仓产品去生成应收
isPayAdvanceException = this.addOrderReceivable(orderDO,
1);
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ 2ec88a7c
......@@ -312,7 +312,17 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
String creator = String.valueOf(loginUser != null ? loginUser.getId() : null);
Date now = new Date();
if (Objects.nonNull(createReqVO.getHarvestMethod()) && createReqVO.getHarvestMethod() == 2) {
order.setCountry(createReqVO.getCountry());
order.setProvince(createReqVO.getProvince());
order.setCity(createReqVO.getCity());
order.setConsigneeAddress(createReqVO.getConsigneeAddress());
} else {
order.setCountry(0L);
order.setProvince(0L);
order.setCity(0L);
order.setConsigneeAddress("");
}
order.setCreator(creator);
order.setUpdater(creator);
order.setCreateTime(now);
......@@ -619,8 +629,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeDO.setCompanyEn(createReqVO.getConsigneeCompanyEn());
orderConsigneeDO.setHarvestMethod(createReqVO.getHarvestMethod()); // 收货方式
if (StringUtils.isNotBlank(createReqVO.getConsigneeAddress())) {
orderConsigneeDO.setAddress(createReqVO.getConsigneeAddress());
if (Objects.nonNull(createReqVO.getHarvestMethod()) && createReqVO.getHarvestMethod() == 2) {
if (StringUtils.isNotBlank(createReqVO.getConsigneeAddress())) {
orderConsigneeDO.setAddress(createReqVO.getConsigneeAddress());
}
} else {
orderConsigneeDO.setAddress("");
}
orderConsigneeDO.setCountry(createReqVO.getCountry());
orderConsigneeDO.setProvince(createReqVO.getProvince());
......@@ -684,7 +698,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeService.save(orderConsigneeDO);
} else {
// 控货订单没有收货人则不限制修改收货人
order.setIsLimitUpdateConsignee(Boolean.FALSE);
if (order.getIsCargoControl() && !hasConsignee) {
order.setIsLimitUpdateConsignee(Boolean.TRUE);
} else {
order.setIsLimitUpdateConsignee(Boolean.FALSE);
}
}
if (!Objects.equals(createReqVO.getStatus(), DRAFT.getValue())) {
//customerType 发货人-1 收货人 2
......@@ -879,9 +897,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeDO.setHarvestMethod(createReqVO.getHarvestMethod());
//收货方式
if (StringUtils.isNotBlank(createReqVO.getConsigneeAddress())) {
orderConsigneeDO.setAddress(createReqVO.getConsigneeAddress());
if (Objects.nonNull(createReqVO.getHarvestMethod()) && createReqVO.getHarvestMethod() == 2) {
if (StringUtils.isNotBlank(createReqVO.getConsigneeAddress())) {
orderConsigneeDO.setAddress(createReqVO.getConsigneeAddress());
}
} else {
orderConsigneeDO.setAddress("");
}
orderConsigneeDO.setCountry(createReqVO.getCountry());
orderConsigneeDO.setProvince(createReqVO.getProvince());
......@@ -931,7 +952,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
} else {
// 控货订单没有收货人则不限制修改收货人
order.setIsLimitUpdateConsignee(Boolean.FALSE);
if (order.getIsCargoControl() && !hasConsignee) {
order.setIsLimitUpdateConsignee(Boolean.TRUE);
} else {
order.setIsLimitUpdateConsignee(Boolean.FALSE);
}
}
if (!Objects.equals(createReqVO.getStatus(),
DRAFT.getValue())) {
......@@ -1627,7 +1652,17 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
Date now = new Date();
updateObj.setUpdater(updater);
updateObj.setUpdateTime(now);
if (Objects.nonNull(updateReqVO.getHarvestMethod()) && updateReqVO.getHarvestMethod() == 2) {
updateObj.setCountry(updateReqVO.getCountry());
updateObj.setProvince(updateReqVO.getProvince());
updateObj.setCity(updateReqVO.getCity());
updateObj.setConsigneeAddress(updateReqVO.getConsigneeAddress());
} else {
updateObj.setCountry(0L);
updateObj.setProvince(0L);
updateObj.setCity(0L);
updateObj.setConsigneeAddress("");
}
departureDO.setUpdater(updater);
departureDO.setUpdateTime(now);
departureDO.setDepartureCountryId(logisticsInfoDto.getStartCountryId());
......@@ -2947,6 +2982,15 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeBackVO.setAddress(updateReqVO.getConsigneeAddress());
orderConsigneeBackVO.setHarvestMethod(updateReqVO.getHarvestMethod());
vo.setConsigneeVO(orderConsigneeBackVO);
vo.setCountry(updateReqVO.getCountry());
vo.setProvince(updateReqVO.getProvince());
vo.setCity(updateReqVO.getCity());
vo.setConsigneeAddress(updateReqVO.getConsigneeAddress());
} else {
vo.setCountry(0L);
vo.setProvince(0L);
vo.setCity(0L);
vo.setConsigneeAddress("");
}
applyInfoList.add(infoVO);
}
......@@ -3214,8 +3258,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeDO.setCompanyEn(updateReqVO.getConsigneeCompanyEn());
orderConsigneeDO.setHarvestMethod(updateReqVO.getHarvestMethod()); // 收货方式
if (StringUtils.isNotBlank(updateReqVO.getConsigneeAddress())) {
orderConsigneeDO.setAddress(updateReqVO.getConsigneeAddress());
if (Objects.nonNull(updateReqVO.getHarvestMethod()) && updateReqVO.getHarvestMethod() == 2) {
if (StringUtils.isNotBlank(updateReqVO.getConsigneeAddress())) {
orderConsigneeDO.setAddress(updateReqVO.getConsigneeAddress());
}
} else {
orderConsigneeDO.setAddress("");
}
orderConsigneeDO.setCountry(updateReqVO.getCountry());
orderConsigneeDO.setProvince(updateReqVO.getProvince());
......@@ -3267,12 +3315,16 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeService.saveOrUpdate(orderConsigneeDO);
} else {
// 如果控货订单发货人设置了控货无收货人，则需要删除订单已有收货人
if (Objects.nonNull(orderConsigneeDO)) {
if (Objects.nonNull(orderConsigneeDO) && !hasConsignee) {
orderConsigneeService.removeById(orderConsigneeDO.getId());
orderConsigneeDO = null;
}
// 控货订单没有收货人则不限制修改收货人
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
if (updateObj.getIsCargoControl() && !hasConsignee) {
updateObj.setIsLimitUpdateConsignee(Boolean.TRUE);
} else {
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
}
}
if (!Objects.equals(updateReqVO.getStatus(),
DRAFT.getValue())) {
......@@ -3481,8 +3533,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
throw exception(CONSIGNEE_PHONE_IS_EXTERNAL);
}
orderConsigneeDO.setHarvestMethod(updateReqVO.getHarvestMethod()); // 收货方式
if (StringUtils.isNotBlank(updateReqVO.getConsigneeAddress())) {
orderConsigneeDO.setAddress(updateReqVO.getConsigneeAddress());
if (Objects.nonNull(updateReqVO.getHarvestMethod()) && updateReqVO.getHarvestMethod() == 2) {
if (StringUtils.isNotBlank(updateReqVO.getConsigneeAddress())) {
orderConsigneeDO.setAddress(updateReqVO.getConsigneeAddress());
}
} else {
orderConsigneeDO.setAddress("");
}
orderConsigneeDO.setOrderId(updateObj.getOrderId());
orderConsigneeDO.setUpdater(updater);
......@@ -3526,13 +3582,17 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
} else {
// 如果控货订单发货人设置了控货无收货人，则需要删除订单已有收货人
if (Objects.nonNull(orderConsigneeDO)) {
if (Objects.nonNull(orderConsigneeDO) && !hasConsignee) {
orderConsigneeService.removeById(orderConsigneeDO.getId());
orderConsigneeDO = null;
}
consigneeDO = null;
// 控货订单没有收货人则不限制修改收货人
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
if (updateObj.getIsCargoControl() && !hasConsignee) {
updateObj.setIsLimitUpdateConsignee(Boolean.TRUE);
} else {
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
}
}
if (!Objects.equals(updateReqVO.getStatus(),
DRAFT.getValue())) {
......
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ 2ec88a7c
......@@ -6563,8 +6563,6 @@
from (
select
o.*,
o.release_num,
o.release_ratio,
occ.`name` as cargo_control_name,
occ.dial_code as cargo_control_country_code,
occ.phone as cargo_control_phone,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment