BJ_ZTEITS-Developers / parking-cloud-yudao

Commit d08b9530a2b530ba52d19fff3e83fa2cf2181e0e

Authored by puhui999
2 parents cac55457 16956a65

Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 

# Conflicts:
#	sql/mysql/optional/mall.sql
Inline Side-by-side
Showing 97 changed files with 2967 additions and 658 deletions
sql/mysql/optional/mall.sql
  View file @d08b953
... ... @@ -305,14 +305,147 @@ CREATE TABLE `product_favorite` (
305 305 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
306 306 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
307 307 PRIMARY KEY (`id`) USING BTREE
308   -) ENGINE=InnoDB COMMENT='喜欢的商品表';
  308 +) ENGINE=InnoDB COMMENT='商品收藏表';
309 309  
  310 +-- Table structure for trade_delivery_express_template
  311 +-- ----------------------------
  312 +DROP TABLE IF EXISTS `trade_delivery_express_template`;
  313 +CREATE TABLE `trade_delivery_express_template` (
  314 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
  315 + `name` varchar(64) NOT NULL COMMENT '模板名称',
  316 + `charge_mode` tinyint NOT NULL DEFAULT 1 COMMENT '配送计费方式 1:按件 2:按重量 3:按体积',
  317 + `sort` int NOT NULL DEFAULT 0 COMMENT '排序',
  318 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  319 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  320 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  321 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  322 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  323 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  324 + PRIMARY KEY (`id`) USING BTREE
  325 +) ENGINE=InnoDB COMMENT='快递运费模板';
310 326  
311 327 -- ----------------------------
312   --- Records of product_spu
  328 +-- Table structure for trade_delivery_express_template_free
  329 +-- ----------------------------
  330 +DROP TABLE IF EXISTS `trade_delivery_express_template_free`;
  331 +CREATE TABLE `trade_delivery_express_template_free` (
  332 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
  333 + `template_id` bigint NOT NULL COMMENT '配送模板编号, 对应delivery_template表id',
  334 + `area_id` int NOT NULL COMMENT '包邮区域id',
  335 + `free_price` int NOT NULL COMMENT '包邮金额(单位分) 订单总金额>包邮金额才免运费',
  336 + `free_count` int NOT NULL DEFAULT 0 COMMENT '包邮件数,订单总件数>包邮件数才免运费',
  337 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  338 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  339 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  340 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  341 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  342 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  343 + PRIMARY KEY (`id`) USING BTREE
  344 +) ENGINE=InnoDB COMMENT='快递运费模板包邮配置';
  345 +
313 346 -- ----------------------------
314   -BEGIN;
315   -COMMIT;
  347 +-- Table structure for trade_delivery_express_template_charge
  348 +-- ----------------------------
  349 +DROP TABLE IF EXISTS `trade_delivery_express_template_charge`;
  350 +CREATE TABLE `trade_delivery_express_template_charge` (
  351 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
  352 + `template_id` bigint NOT NULL COMMENT '配送模板编号, 对应delivery_template表id',
  353 + `area_id` int NOT NULL COMMENT '配送区域id 1:适用于全国',
  354 + `charge_mode` tinyint NOT NULL COMMENT '配送计费方式 1:按件 2:按重量 3:按体积',
  355 + `start_count` double NOT NULL COMMENT '首件数量(件数,重量，或体积)',
  356 + `start_price` int NOT NULL COMMENT '起步价(单位分)',
  357 + `extra_count` double NOT NULL COMMENT '续件数量(件,重量，或体积)',
  358 + `extra_price` int NOT NULL COMMENT '额外价(单位分)',
  359 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  360 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  361 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  362 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  363 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  364 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  365 + PRIMARY KEY (`id`) USING BTREE
  366 +) ENGINE=InnoDB COMMENT='快递运费模板计费配置';
  367 +
  368 +-- ----------------------------
  369 +-- Table structure for trade_delivery_pick_up_store
  370 +-- ----------------------------
  371 +DROP TABLE IF EXISTS `trade_delivery_pick_up_store`;
  372 +CREATE TABLE `trade_delivery_pick_up_store` (
  373 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
  374 + `name` varchar(64) NOT NULL COMMENT '门店名称',
  375 + `introduction` varchar(256) COMMENT '门店简介',
  376 + `phone` varchar(16) NOT NULL COMMENT '门店手机',
  377 + `area_id` int NOT NULL COMMENT '区域id',
  378 + `detail_address` varchar(256) NOT NULL COMMENT '门店详细地址',
  379 + `logo` varchar(256) NOT NULL COMMENT '门店logo',
  380 + `opening_time` time NOT NULL COMMENT '营业开始时间',
  381 + `closing_time` time NOT NULL COMMENT '营业结束时间',
  382 + `latitude` varchar(128) NOT NULL COMMENT '纬度',
  383 + `longitude` varchar(128) NOT NULL COMMENT '经度',
  384 + `status` tinyint NOT NULL DEFAULT 0 COMMENT '门店状态（0正常 1停用）',
  385 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  386 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  387 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  388 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  389 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  390 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  391 + PRIMARY KEY (`id`) USING BTREE
  392 +) ENGINE=InnoDB COMMENT='自提门店';
  393 +
  394 +-- ----------------------------
  395 +-- Table structure for trade_delivery_pick_up_store_staff
  396 +-- ----------------------------
  397 +DROP TABLE IF EXISTS `trade_delivery_pick_up_store_staff`;
  398 +CREATE TABLE `trade_delivery_pick_up_store_staff` (
  399 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
  400 + store_id bigint NOT NULL COMMENT '自提门店编号',
  401 + `status` tinyint NOT NULL DEFAULT 0 COMMENT '状态（0正常 1停用）',
  402 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  403 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  404 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  405 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  406 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  407 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  408 + PRIMARY KEY (`id`) USING BTREE
  409 +) ENGINE=InnoDB COMMENT='自提门店店员';
  410 +
  411 +-- ----------------------------
  412 +-- Table structure for trade_delivery_pick_up_store_staff
  413 +-- ----------------------------
  414 +DROP TABLE IF EXISTS `trade_delivery_pick_up_store_staff`;
  415 +CREATE TABLE `trade_delivery_pick_up_store_staff` (
  416 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
  417 + `admin_user_id` bigint NOT NULL COMMENT '管理员用户id',
  418 + store_id bigint NOT NULL COMMENT '自提门店编号',
  419 + `status` tinyint NOT NULL DEFAULT 0 COMMENT '状态（0正常 1停用）',
  420 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  421 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  422 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  423 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  424 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  425 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  426 + PRIMARY KEY (`id`) USING BTREE
  427 +) ENGINE=InnoDB COMMENT='自提门店店员';
  428 +
  429 +
  430 +-- ----------------------------
  431 +-- Table structure for trade_delivery_express
  432 +-- ----------------------------
  433 +DROP TABLE IF EXISTS `trade_delivery_express`;
  434 +CREATE TABLE `trade_delivery_express` (
  435 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
  436 + `code` varchar(64) NOT NULL COMMENT '快递公司编号',
  437 + `name` varchar(64) NOT NULL COMMENT '快递公司名称',
  438 + `logo` varchar(256) COMMENT '快递公司logo',
  439 + `sort` int NOT NULL DEFAULT 0 COMMENT '排序',
  440 + `status` tinyint NOT NULL DEFAULT 0 COMMENT '状态（0正常 1停用）',
  441 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  442 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  443 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  444 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  445 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  446 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  447 + PRIMARY KEY (`id`) USING BTREE
  448 +) ENGINE=InnoDB COMMENT='快递公司';
316 449  
317 450 SET FOREIGN_KEY_CHECKS = 1;
318 451  
... ... @@ -347,6 +480,21 @@ INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `
347 480 INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2027, 'Banner创建', 'market:banner:create', 3, 2, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
348 481 INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2028, 'Banner更新', 'market:banner:update', 3, 3, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
349 482 INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2029, 'Banner删除', 'market:banner:delete', 3, 4, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
  483 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2164, '配送管理', '', 1, 0, 2072, 'delivery', '', '', '', 0, b'1', b'1', b'1', '1', '2023-05-18 09:18:02', '1', '2023-05-18 09:48:48', b'0');
  484 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2165, '快递发货', '', 1, 0, 2164, 'express', '', '', '', 0, b'1', b'1', b'1', '1', '2023-05-18 09:22:06', '1', '2023-05-18 09:22:06', b'0');
  485 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2166, '门店自提', '', 1, 1, 2164, 'pick-up-store', '', '', '', 0, b'1', b'1', b'1', '1', '2023-05-18 09:23:14', '1', '2023-05-18 09:23:14', b'0');
  486 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2167, '快递公司', '', 2, 0, 2165, 'express', '', 'mall/trade/delivery/express/index', 'Express', 0, b'1', b'1', b'1', '1', '2023-05-18 09:27:21', '1', '2023-05-18 22:11:14', b'0');
  487 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2168, '快递公司查询', 'trade:delivery:express:query', 3, 1, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', b'0');
  488 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2169, '快递公司创建', 'trade:delivery:express:create', 3, 2, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', b'0');
  489 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2170, '快递公司更新', 'trade:delivery:express:update', 3, 3, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', b'0');
  490 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2171, '快递公司删除', 'trade:delivery:express:delete', 3, 4, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', b'0');
  491 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2172, '快递公司导出', 'trade:delivery:express:export', 3, 5, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', b'0');
  492 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2178, '快递运费模板导出', 'trade:delivery:express-template:export', 3, 5, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', b'0');
  493 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2177, '快递运费模板删除', 'trade:delivery:express-template:delete', 3, 4, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', b'0');
  494 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2176, '快递运费模板更新', 'trade:delivery:express-template:update', 3, 3, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', b'0');
  495 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2175, '快递运费模板创建', 'trade:delivery:express-template:create', 3, 2, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', b'0');
  496 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2174, '快递运费模板查询', 'trade:delivery:express-template:query', 3, 1, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', b'0');
  497 +INSERT INTO `ruoyi-vue-pro`.`system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2173, '运费模版', 'trade:delivery:express-template:query', 2, 1, 2165, 'express-template', '', 'mall/trade/delivery/expressTemplate/index', 'ExpressTemplate', 0, b'1', b'1', b'1', '1', '2023-05-20 06:48:10', '1', '2023-05-20 06:48:29', b'0');
350 498 BEGIN;
351 499  
352 500 BEGIN;
... ... @@ -359,4 +507,14 @@ INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`,
359 507 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, '包', 7, 'product_unit', 0, '', '', '', 1, NOW(), 1, NOW(), b'0');
360 508 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, '双', 8, 'product_unit', 0, '', '', '', 1, NOW(), 1, NOW(), b'0');
361 509 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, '卷', 9, 'product_unit', 0, '', '', '', 1, NOW(), 1, NOW(), b'0');
  510 +COMMIT;
  511 +
  512 +-- ----------------------------
  513 +-- 数字字典，快递计费方式
  514 +-- ----------------------------
  515 +BEGIN;
  516 +INSERT INTO `ruoyi-vue-pro`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (169, '快递计费方式', 'trade_delivery_express_charge_mode', 0, '用于商城交易模块配送管理', '1', '2023-05-21 22:45:03', '1', '2023-05-21 22:45:03', b'0', '1970-01-01 00:00:00');
  517 +INSERT INTO `ruoyi-vue-pro`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1237, 2, '按体积', '3', 'trade_delivery_express_charge_mode', 0, '', '', '', '1', '2023-05-21 22:47:18', '1', '2023-05-21 22:47:18', b'0');
  518 +INSERT INTO `ruoyi-vue-pro`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1236, 1, '按重量', '2', 'trade_delivery_express_charge_mode', 0, '', '', '', '1', '2023-05-21 22:46:58', '1', '2023-05-21 22:46:58', b'0');
  519 +INSERT INTO `ruoyi-vue-pro`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1235, 0, '按件', '1', 'trade_delivery_express_charge_mode', 0, '', '', '', '1', '2023-05-21 22:46:40', '1', '2023-05-21 22:46:40', b'0');
362 520 COMMIT;
363 521 \ No newline at end of file
... ...
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/ServiceErrorCodeRange.java
  View file @d08b953
... ... @@ -33,7 +33,11 @@ public class ServiceErrorCodeRange {
33 33 // 模块 system 错误码区间 [1-002-000-000 ~ 1-003-000-000)
34 34 // 模块 report 错误码区间 [1-003-000-000 ~ 1-004-000-000)
35 35 // 模块 member 错误码区间 [1-004-000-000 ~ 1-005-000-000)
  36 + // 模块 mp 错误码区间 [1-006-000-000 ~ 1-007-000-000)
36 37 // 模块 pay 错误码区间 [1-007-000-000 ~ 1-008-000-000)
  38 + // 模块 product 错误码区间 [1-008-000-000 ~ 1-009-000-000)
37 39 // 模块 bpm 错误码区间 [1-009-000-000 ~ 1-010-000-000)
  40 + // 模块 trade 错误码区间 [1-011-000-000 ~ 1-012-000-000)
  41 + // 模块 promotion 错误码区间 [1-013-000-000 ~ 1-014-000-000)
38 42  
39 43 }
... ...
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
  View file @d08b953
... ... @@ -3,16 +3,16 @@ package cn.iocoder.yudao.module.bpm.enums;
3 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 4  
5 5 /**
6   - * 工作流 错误码枚举类
  6 + * Bpm 错误码枚举类
7 7 *
8   - * 工作流系统，使用 1-009-000-000 段
  8 + * bpm 系统，使用 1-009-000-000 段
9 9 */
10 10 public interface ErrorCodeConstants {
11 11  
12   - // ========== 通用流程处理 模块 1-009-000-000 ==========
  12 + // ========== 通用流程处理 模块 1009000000 ==========
13 13 ErrorCode HIGHLIGHT_IMG_ERROR = new ErrorCode(1009000002, "获取高亮流程图异常");
14 14  
15   - // ========== OA 流程模块 1-009-001-000 ==========
  15 + // ========== OA 流程模块 1009001000 ==========
16 16 ErrorCode OA_LEAVE_NOT_EXISTS = new ErrorCode(1009001001, "请假申请不存在");
17 17 ErrorCode OA_PM_POST_NOT_EXISTS = new ErrorCode(1009001002, "项目经理岗位未设置");
18 18 ErrorCode OA_DEPART_PM_POST_NOT_EXISTS = new ErrorCode(1009001009, "部门的项目经理不存在");
... ... @@ -21,7 +21,7 @@ public interface ErrorCodeConstants {
21 21 ErrorCode OA_HR_POST_NOT_EXISTS = new ErrorCode(1009001006, "HR岗位未设置");
22 22 ErrorCode OA_DAY_LEAVE_ERROR = new ErrorCode(1009001007, "请假天数必须>=1");
23 23  
24   - // ========== 流程模型 1-009-002-000 ==========
  24 + // ========== 流程模型 1009002000 ==========
25 25 ErrorCode MODEL_KEY_EXISTS = new ErrorCode(1009002000, "已经存在流程标识为【{}】的流程");
26 26 ErrorCode MODEL_NOT_EXISTS = new ErrorCode(1009002001, "流程模型不存在");
27 27 ErrorCode MODEL_KEY_VALID = new ErrorCode(1009002002, "流程标识格式不正确，需要以字母或下划线开头，后接任意字母、数字、中划线、下划线、句点！");
... ... @@ -30,34 +30,34 @@ public interface ErrorCodeConstants {
30 30 "原因：用户任务({})未配置分配规则，请点击【修改流程】按钮进行配置");
31 31 ErrorCode MODEL_DEPLOY_FAIL_TASK_INFO_EQUALS = new ErrorCode(1009003005, "流程定义部署失败，原因：信息未发生变化");
32 32  
33   - // ========== 流程定义 1-009-003-000 ==========
  33 + // ========== 流程定义 1009003000 ==========
34 34 ErrorCode PROCESS_DEFINITION_KEY_NOT_MATCH = new ErrorCode(1009003000, "流程定义的标识期望是({})，当前是({})，请修改 BPMN 流程图");
35 35 ErrorCode PROCESS_DEFINITION_NAME_NOT_MATCH = new ErrorCode(1009003001, "流程定义的名字期望是({})，当前是({})，请修改 BPMN 流程图");
36 36 ErrorCode PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1009003002, "流程定义不存在");
37 37 ErrorCode PROCESS_DEFINITION_IS_SUSPENDED = new ErrorCode(1009003003, "流程定义处于挂起状态");
38 38 ErrorCode PROCESS_DEFINITION_BPMN_MODEL_NOT_EXISTS = new ErrorCode(1009003004, "流程定义的模型不存在");
39 39  
40   - // ========== 流程实例 1-009-004-000 ==========
  40 + // ========== 流程实例 1009004000 ==========
41 41 ErrorCode PROCESS_INSTANCE_NOT_EXISTS = new ErrorCode(1009004000, "流程实例不存在");
42 42 ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS = new ErrorCode(1009004001, "流程取消失败，流程不处于运行中");
43 43 ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF = new ErrorCode(1009004002, "流程取消失败，该流程不是你发起的");
44 44  
45   - // ========== 流程任务 1-009-005-000 ==========
  45 + // ========== 流程任务 1009005000 ==========
46 46 ErrorCode TASK_COMPLETE_FAIL_NOT_EXISTS = new ErrorCode(1009005000, "审批任务失败，原因：该任务不处于未审批");
47 47 ErrorCode TASK_COMPLETE_FAIL_ASSIGN_NOT_SELF = new ErrorCode(1009005001, "审批任务失败，原因：该任务的审批人不是你");
48 48  
49   - // ========== 流程任务分配规则 1-009-006-000 ==========
  49 + // ========== 流程任务分配规则 1009006000 ==========
50 50 ErrorCode TASK_ASSIGN_RULE_EXISTS = new ErrorCode(1009006000, "流程({}) 的任务({}) 已经存在分配规则");
51 51 ErrorCode TASK_ASSIGN_RULE_NOT_EXISTS = new ErrorCode(1009006001, "流程任务分配规则不存在");
52 52 ErrorCode TASK_UPDATE_FAIL_NOT_MODEL = new ErrorCode(1009006002, "只有流程模型的任务分配规则，才允许被修改");
53 53 ErrorCode TASK_CREATE_FAIL_NO_CANDIDATE_USER = new ErrorCode(1009006003, "操作失败，原因：找不到任务的审批人！");
54 54 ErrorCode TASK_ASSIGN_SCRIPT_NOT_EXISTS = new ErrorCode(1009006004, "操作失败，原因：任务分配脚本({}) 不存在");
55 55  
56   - // ========== 动态表单模块 1-009-010-000 ==========
  56 + // ========== 动态表单模块 1009010000 ==========
57 57 ErrorCode FORM_NOT_EXISTS = new ErrorCode(1009010000, "动态表单不存在");
58 58 ErrorCode FORM_FIELD_REPEAT = new ErrorCode(1009010001, "表单项({}) 和 ({}) 使用了相同的字段名({})");
59 59  
60   - // ========== 用户组模块 1-009-011-000 ==========
  60 + // ========== 用户组模块 1009011000 ==========
61 61 ErrorCode USER_GROUP_NOT_EXISTS = new ErrorCode(1009011000, "用户组不存在");
62 62 ErrorCode USER_GROUP_IS_DISABLE = new ErrorCode(1009011001, "名字为【{}】的用户组已被禁用");
63 63  
... ...
yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
  View file @d08b953
... ... @@ -50,7 +50,7 @@ public interface ErrorCodeConstants {
50 50 ErrorCode COMMENT_ADDITIONAL_EXISTS = new ErrorCode(1008007003, "商品追加评价已存在");
51 51  
52 52 // ========== 商品 收藏 1008008000 ==========
53   - ErrorCode COLLECTION_EXISTS = new ErrorCode(1008008000, "该商品已经被收藏");
54   - ErrorCode COLLECTION_NOT_EXISTS = new ErrorCode(1008008001, "商品收藏不存在");
  53 + ErrorCode FAVORITE_EXISTS = new ErrorCode(1008008000, "该商品已经被收藏");
  54 + ErrorCode FAVORITE_NOT_EXISTS = new ErrorCode(1008008001, "商品收藏不存在");
55 55  
56 56 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/AppFavoriteController.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.product.controller.app.favorite;
2 2  
3   -import cn.hutool.core.lang.Assert;
  3 +import cn.hutool.core.collection.CollUtil;
4 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
7 7 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteReqVO;
8   -import cn.iocoder.yudao.module.product.service.favorite.ProductFavoriteService;
9 8 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
  9 +import cn.iocoder.yudao.module.product.convert.favorite.ProductFavoriteConvert;
  10 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
  11 +import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
  12 +import cn.iocoder.yudao.module.product.service.favorite.ProductFavoriteService;
  13 +import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
10 14 import io.swagger.v3.oas.annotations.Operation;
11 15 import io.swagger.v3.oas.annotations.tags.Tag;
12 16 import org.springframework.web.bind.annotation.*;
13 17  
14 18 import javax.annotation.Resource;
15 19 import javax.validation.Valid;
  20 +import java.util.List;
16 21 import java.util.Objects;
17 22  
18 23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
19   -import static cn.iocoder.yudao.module.product.enums.favorite.ProductFavoriteTypeEnum.COLLECT;
  24 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
  25 +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
20 26  
21 27 @Tag(name = "用户 APP - 商品收藏")
22 28 @RestController
... ... @@ -25,31 +31,48 @@ public class AppFavoriteController {
25 31  
26 32 @Resource
27 33 private ProductFavoriteService productFavoriteService;
  34 + @Resource
  35 + private ProductSpuService productSpuService;
28 36  
29   - // TODO @jason：创建；create
30   - @PostMapping(value = "/collect")
  37 + @PostMapping(value = "/create")
31 38 @Operation(summary = "商品收藏")
32   - public CommonResult<Boolean> collect(@RequestBody @Valid AppFavoriteReqVO reqVO) {
33   - Assert.isTrue(Objects.equals(COLLECT.getType(), reqVO.getType()), "参数type 不匹配");
34   - return success(productFavoriteService.collect(reqVO));
  39 + //@PreAuthenticated TODO 暂时注释
  40 + public CommonResult<Long> createFavorite(@RequestBody @Valid AppFavoriteReqVO reqVO) {
  41 + return success(productFavoriteService.createFavorite(getLoginUserId(), reqVO));
35 42 }
36 43  
37   - // TODO @jason：创建；delete；使用 @DeleteMapping
38   - @PostMapping(value = "/cancelCollect")
39   - @Operation(summary = "取消商品收藏(通过商品详情)")
40   - public CommonResult<Boolean> cancelCollect(@RequestBody @Valid AppFavoriteReqVO reqVO) {
41   - // TODO @jason：是不是不用校验呀？
42   - Assert.isTrue(Objects.equals(COLLECT.getType(), reqVO.getType()), "参数type 不匹配");
43   - return success(productFavoriteService.cancelCollect(reqVO));
  44 + @DeleteMapping(value = "/delete")
  45 + @Operation(summary = "取消商品收藏")
  46 + public CommonResult<Boolean> deleteFavorite(@RequestBody @Valid AppFavoriteReqVO reqVO) {
  47 + productFavoriteService.deleteFavorite(getLoginUserId(), reqVO);
  48 + return success(Boolean.TRUE);
44 49 }
45 50  
46   - // TODO @jason：page；分页
47   - @GetMapping(value = "/collectList")
48   - @Operation(summary = "商品收藏列表")
49   - public CommonResult<PageResult<AppFavoriteRespVO>> pageCollectList(AppFavoritePageReqVO reqVO) {
50   - return success(productFavoriteService.pageCollectList(reqVO));
  51 + @GetMapping(value = "/page")
  52 + @Operation(summary = "分页获取商品收藏列表")
  53 + public CommonResult<PageResult<AppFavoriteRespVO>> getFavoritePage(AppFavoritePageReqVO reqVO) {
  54 + PageResult<ProductFavoriteDO> favoritePage = productFavoriteService.getFavoritePage(getLoginUserId(), reqVO);
  55 + if (CollUtil.isEmpty(favoritePage.getList())) {
  56 + return success(PageResult.empty());
  57 + }
  58 +
  59 + // 得到商品 spu 信息
  60 + List<ProductFavoriteDO> favorites = favoritePage.getList();
  61 + List<Long> spuIds = convertList(favorites, ProductFavoriteDO::getSpuId);
  62 + List<ProductSpuDO> spus = productSpuService.getSpuList(spuIds);
  63 +
  64 + // 转换 VO 结果
  65 + PageResult<AppFavoriteRespVO> pageResult = new PageResult<>(favoritePage.getTotal());
  66 + pageResult.setList(ProductFavoriteConvert.INSTANCE.convertList(favorites, spus));
  67 + return success(pageResult);
51 68 }
52 69  
53   - // TODO @json：需要在给一个，用户查询某个商品是否收藏；详情页要用
  70 +
  71 + @GetMapping(value = "/exits")
  72 + @Operation(summary = "检查是否收藏过商品")
  73 + public CommonResult<Boolean> isFavoriteExists(AppFavoriteReqVO reqVO) {
  74 + ProductFavoriteDO favoriteDO = productFavoriteService.getFavorite(getLoginUserId(), reqVO);
  75 + return success(Objects.nonNull(favoriteDO));
  76 + }
54 77  
55 78 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteReqVO.java
  View file @d08b953
... ... @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
9 9  
10 10 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
11 11  
12   -@Schema(description = "用户 APP - 商品收藏创建 Request VO")
  12 +@Schema(description = "用户 APP - 商品收藏 Request VO") // 用于收藏、取消收藏、获取收藏
13 13 @Data
14 14 public class AppFavoriteReqVO {
15 15  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteRespVO.java
  View file @d08b953
... ... @@ -2,21 +2,19 @@ package cn.iocoder.yudao.module.product.controller.app.favorite.vo;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
  5 +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
5 6  
6 7 @Schema(description = "用户APP - 商品收藏 Response VO")
7 8 @Data
8 9 public class AppFavoriteRespVO {
9 10  
10   - // TODO @jason：required true 哈
11   - @Schema(description = "编号", example = "1")
  11 + @Schema(description = "编号", requiredMode = REQUIRED, example = "1")
12 12 private Long id;
13 13  
14   - // TODO @jason：required true 哈
15   - @Schema(description = "商品 SPU 编号", example = "29502")
  14 + @Schema(description = "商品 SPU 编号", requiredMode = REQUIRED, example = "29502")
16 15 private Long spuId;
17 16  
18   - // TODO @jason：required true 哈
19   - @Schema(description = "类型", example = "1")
  17 + @Schema(description = "类型", requiredMode = REQUIRED, example = "1")
20 18 private Integer type;
21 19  
22 20 // ========== 商品相关字段 ==========
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/favorite/ProductFavoriteConvert.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.product.convert.favorite;
2 2  
3 3 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteReqVO;
  4 +import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
4 5 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
  6 +import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
5 7 import org.mapstruct.Mapper;
  8 +import org.mapstruct.Mapping;
6 9 import org.mapstruct.factory.Mappers;
7 10  
  11 +import java.util.ArrayList;
  12 +import java.util.List;
  13 +import java.util.Map;
  14 +
  15 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
  16 +
8 17 @Mapper
9 18 public interface ProductFavoriteConvert {
10 19  
11 20 ProductFavoriteConvert INSTANCE = Mappers.getMapper(ProductFavoriteConvert.class);
12 21  
13 22 ProductFavoriteDO convert(Long userId, AppFavoriteReqVO reqVO);
  23 +
  24 + @Mapping(target = "id", source = "favorite.id")
  25 + @Mapping(target = "spuName", source = "spu.name")
  26 + AppFavoriteRespVO convert(ProductSpuDO spu, ProductFavoriteDO favorite);
  27 +
  28 + default List<AppFavoriteRespVO> convertList(List<ProductFavoriteDO> favorites, List<ProductSpuDO> spus) {
  29 + List<AppFavoriteRespVO> resultList = new ArrayList<>(favorites.size());
  30 + Map<Long, ProductSpuDO> spuMap = convertMap(spus, ProductSpuDO::getId);
  31 + for (ProductFavoriteDO favorite : favorites) {
  32 + ProductSpuDO spuDO = spuMap.get(favorite.getSpuId());
  33 + resultList.add(convert(spuDO, favorite));
  34 + }
  35 + return resultList;
  36 + }
  37 +
14 38 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/delivery/DeliveryTemplateDO.java deleted
View file @cac5545
1   -package cn.iocoder.yudao.module.product.dal.dataobject.delivery;
2   -
3   -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4   -import com.baomidou.mybatisplus.annotation.KeySequence;
5   -import com.baomidou.mybatisplus.annotation.TableId;
6   -import com.baomidou.mybatisplus.annotation.TableName;
7   -import lombok.*;
8   -
9   -/**
10   - * 配送模板 SPU DO
11   - *
12   - * @author 芋道源码
13   - */
14   -@TableName("delivery_template")
15   -@KeySequence("delivery_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
16   -@Data
17   -@EqualsAndHashCode(callSuper = true)
18   -@ToString(callSuper = true)
19   -@Builder
20   -@NoArgsConstructor
21   -@AllArgsConstructor
22   -public class DeliveryTemplateDO extends BaseDO {
23   -
24   - /**
25   - * 编号，自增
26   - */
27   - @TableId
28   - private Long id;
29   -
30   -}
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.product.dal.dataobject.favorite;
2 2  
3   -import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 4 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
  5 +import cn.iocoder.yudao.module.product.enums.favorite.ProductFavoriteTypeEnum;
5 6 import com.baomidou.mybatisplus.annotation.KeySequence;
6 7 import com.baomidou.mybatisplus.annotation.TableId;
7 8 import com.baomidou.mybatisplus.annotation.TableName;
8 9 import lombok.*;
9 10  
10 11 /**
11   - * 喜爱商品 DO
  12 + * 商品收藏 DO
12 13 *
13 14 * @author 芋道源码
14 15 */
... ... @@ -20,7 +21,7 @@ import lombok.*;
20 21 @Builder
21 22 @NoArgsConstructor
22 23 @AllArgsConstructor
23   -public class ProductFavoriteDO extends TenantBaseDO { // TODO @jason：如无必要，使用 BaseDO 哈。例如说 tenant_id 在业务里，是否需要使用到
  24 +public class ProductFavoriteDO extends BaseDO {
24 25  
25 26 /**
26 27 * 编号，主键自增
... ... @@ -40,7 +41,9 @@ public class ProductFavoriteDO extends TenantBaseDO { // TODO @jason：如无必
40 41 */
41 42 private Long spuId;
42 43 /**
43   - * 类型 1 收藏；2 点赞 // TODO @jason：不要注释 1 收藏 2 点赞；而是注释好，它对应的枚举类
  44 + * 类型
  45 + *
  46 + * 枚举 {@link ProductFavoriteTypeEnum}
44 47 */
45 48 private Integer type;
46 49  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.product.dal.dataobject.spu;
2 2  
3   -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 3 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
5 4 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
6 5 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
7   -import cn.iocoder.yudao.module.product.dal.dataobject.delivery.DeliveryTemplateDO;
8 6 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
9 7 import cn.iocoder.yudao.module.product.enums.spu.ProductSpuStatusEnum;
10 8 import com.baomidou.mybatisplus.annotation.KeySequence;
... ... @@ -143,7 +141,7 @@ public class ProductSpuDO extends BaseDO {
143 141 /**
144 142 * 物流配置模板编号
145 143 *
146   - * 关联 {@link DeliveryTemplateDO#getId()}
  144 + * 关联 { TradeDeliveryExpressTemplateDO#getId()}
147 145 */
148 146 private Long deliveryTemplateId;
149 147  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/favorite/ProductFavoriteMapper.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.product.dal.mysql.favorite;
2 2  
3   -import cn.hutool.core.lang.Assert;
4 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
5 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 5 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
7 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
8   -import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
9 7 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
10   -import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
11   -import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
12 9 import org.apache.ibatis.annotations.Mapper;
13   -import org.apache.ibatis.annotations.Param;
14 10  
15 11 @Mapper
16 12 public interface ProductFavoriteMapper extends BaseMapperX<ProductFavoriteDO> {
17 13  
18   - default ProductFavoriteDO selectByUserAndSpuAndType(Long userId, Long spuId, Integer type) {
19   - Assert.notNull(userId, "the userId argument must not be null");
20   - Assert.notNull(spuId, "the spuId argument must not be null");
21   - Assert.notNull(type, "the type argument must not be null");
  14 + default ProductFavoriteDO selectByUserAndSpuAndType(Long userId, Long spuId, Integer type) {
22 15 return selectOne(new LambdaQueryWrapperX<ProductFavoriteDO>()
23 16 .eq(ProductFavoriteDO::getUserId, userId)
24 17 .eq(ProductFavoriteDO::getSpuId, spuId)
25 18 .eq(ProductFavoriteDO::getType, type));
26 19 }
27 20  
28   - default PageResult<AppFavoriteRespVO> selectPageByUserAndType(Long userId, Integer type, PageParam pageParam){
29   - Page<AppFavoriteRespVO> page = MyBatisUtils.buildPage(pageParam);
30   - page = selectFavoriteProductList(page, userId, type);
31   - return new PageResult<>(page.getRecords(), page.getTotal());
  21 + default PageResult<ProductFavoriteDO> selectPageByUserAndType(Long userId, Integer type, PageParam pageParam) {
  22 + return selectPage(pageParam, new LambdaQueryWrapper<ProductFavoriteDO>()
  23 + .eq(ProductFavoriteDO::getUserId, userId)
  24 + .eq(ProductFavoriteDO::getType, type)
  25 + .orderByDesc(ProductFavoriteDO::getId));
32 26 }
33 27  
34   - // TODO @jason：内存中拼接哈。这样好兼容更多的 db 类型；
35   - Page<AppFavoriteRespVO> selectFavoriteProductList(Page<AppFavoriteRespVO> page,
36   - @Param("userId") Long userId,
37   - @Param("type") Integer type);
38 28 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/favorite/ProductFavoriteService.java
  View file @d08b953
... ... @@ -4,31 +4,47 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
5 5 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteReqVO;
6 6 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
  7 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
7 8  
8 9 import javax.validation.Valid;
9 10  
10 11 /**
11   - * 喜爱商品 Service 接口
  12 + * 商品收藏 Service 接口
12 13 *
13 14 * @author jason
14 15 */
15 16 public interface ProductFavoriteService {
16 17  
17 18 /**
18   - * 商品收藏
19   - * @param reqVO 请求vo
  19 + * 创建商品收藏
  20 + *
  21 + * @param userId 用户 id
  22 + * @param reqVO 请求 vo
20 23 */
21   - Boolean collect(@Valid AppFavoriteReqVO reqVO);
  24 + Long createFavorite(Long userId, @Valid AppFavoriteReqVO reqVO);
22 25  
23 26 /**
24   - * 取消商品收藏 (通过商品详情页面)
25   - * @param reqVO 请求vo
  27 + * 取消商品收藏
  28 + *
  29 + * @param userId 用户 id
  30 + * @param reqVO 请求 vo
26 31 */
27   - Boolean cancelCollect(@Valid AppFavoriteReqVO reqVO);
  32 + void deleteFavorite(Long userId, @Valid AppFavoriteReqVO reqVO);
28 33  
29 34 /**
30 35 * 分页查询用户收藏列表
  36 + *
  37 + * @param userId 用户 id
31 38 * @param reqVO 请求 vo
32 39 */
33   - PageResult<AppFavoriteRespVO> pageCollectList(@Valid AppFavoritePageReqVO reqVO);
  40 + PageResult<ProductFavoriteDO> getFavoritePage(Long userId, @Valid AppFavoritePageReqVO reqVO);
  41 +
  42 + /**
  43 + * 获取收藏过商品
  44 + *
  45 + * @param userId 用户id
  46 + * @param reqVO 请求 vo
  47 + */
  48 + ProductFavoriteDO getFavorite(Long userId, @Valid AppFavoriteReqVO reqVO);
  49 +
34 50 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/favorite/ProductFavoriteServiceImpl.java
  View file @d08b953
... ... @@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteReq
6 6 import cn.iocoder.yudao.module.product.convert.favorite.ProductFavoriteConvert;
7 7 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
8 8 import cn.iocoder.yudao.module.product.dal.mysql.favorite.ProductFavoriteMapper;
9   -import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
10 9 import org.springframework.stereotype.Service;
11 10 import org.springframework.validation.annotation.Validated;
12 11  
... ... @@ -15,9 +14,8 @@ import javax.validation.Valid;
15 14 import java.util.Objects;
16 15  
17 16 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
18   -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
19   -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.COLLECTION_EXISTS;
20   -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.COLLECTION_NOT_EXISTS;
  17 +import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.FAVORITE_EXISTS;
  18 +import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.FAVORITE_NOT_EXISTS;
21 19  
22 20 /**
23 21 * 商品收藏 Service 实现类
... ... @@ -29,41 +27,40 @@ import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.COLLECTIO
29 27 public class ProductFavoriteServiceImpl implements ProductFavoriteService {
30 28  
31 29 @Resource
32   - private ProductFavoriteMapper mapper;
  30 + private ProductFavoriteMapper productFavoriteMapper;
33 31  
34 32 @Override
35   - public Boolean collect(@Valid AppFavoriteReqVO reqVO) {
36   - // TODO @jason：userId 要从 Controller 传递过来，Service 不能有转台
37   - Long userId = getLoginUserId();
38   - // TODO @jason：代码缩进不对；
39   - ProductFavoriteDO favoriteDO = mapper.selectByUserAndSpuAndType(userId, reqVO.getSpuId(), reqVO.getType());
40   - if (Objects.nonNull(favoriteDO)) {
41   - throw exception(COLLECTION_EXISTS);
  33 + public Long createFavorite(Long userId, @Valid AppFavoriteReqVO reqVO) {
  34 + ProductFavoriteDO favorite = productFavoriteMapper.selectByUserAndSpuAndType(
  35 + userId, reqVO.getSpuId(), reqVO.getType());
  36 + if (Objects.nonNull(favorite)) {
  37 + throw exception(FAVORITE_EXISTS);
42 38 }
43 39  
44   - // TODO @jason：插入只有成功，不用判断 1
45 40 ProductFavoriteDO entity = ProductFavoriteConvert.INSTANCE.convert(userId, reqVO);
46   - int count = mapper.insert(entity);
47   - return count == 1;
  41 + productFavoriteMapper.insert(entity);
  42 + return entity.getId();
48 43 }
49 44  
50 45 @Override
51   - public Boolean cancelCollect(@Valid AppFavoriteReqVO reqVO) {
52   - // TODO @jason：代码缩进不对；
53   - Long loginUserId = getLoginUserId();
54   - ProductFavoriteDO favoriteDO = mapper.selectByUserAndSpuAndType(loginUserId, reqVO.getSpuId(), reqVO.getType());
55   - if (Objects.isNull(favoriteDO)) {
56   - throw exception(COLLECTION_NOT_EXISTS);
  46 + public void deleteFavorite(Long userId, @Valid AppFavoriteReqVO reqVO) {
  47 + ProductFavoriteDO favorite = productFavoriteMapper.selectByUserAndSpuAndType(
  48 + userId, reqVO.getSpuId(), reqVO.getType());
  49 + if (Objects.isNull(favorite)) {
  50 + throw exception(FAVORITE_NOT_EXISTS);
57 51 }
58   - // TODO @jason：插入只有成功，不用判断 1
59   - int count = mapper.deleteById(favoriteDO.getId());
60   - return count == 1;
  52 +
  53 + productFavoriteMapper.deleteById(favorite.getId());
  54 + }
  55 +
  56 + @Override
  57 + public PageResult<ProductFavoriteDO> getFavoritePage(Long userId, @Valid AppFavoritePageReqVO reqVO) {
  58 + return productFavoriteMapper.selectPageByUserAndType(userId, reqVO.getType(), reqVO);
61 59 }
62 60  
63 61 @Override
64   - public PageResult<AppFavoriteRespVO> pageCollectList(@Valid AppFavoritePageReqVO reqVO) {
65   - Long userId = getLoginUserId();
66   - return mapper.selectPageByUserAndType(userId, reqVO.getType(), reqVO);
  62 + public ProductFavoriteDO getFavorite(Long userId, @Valid AppFavoriteReqVO reqVO) {
  63 + return productFavoriteMapper.selectByUserAndSpuAndType(userId, reqVO.getSpuId(), reqVO.getType());
67 64 }
68 65  
69 66 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
  View file @d08b953
... ... @@ -2,8 +2,11 @@ package cn.iocoder.yudao.module.product.service.spu;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.util.ObjectUtil;
  5 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
5 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  7 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
6 8 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  9 +import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
7 10 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
8 11 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
9 12 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
... ... @@ -203,8 +206,16 @@ public class ProductSpuServiceImpl implements ProductSpuService {
203 206  
204 207 @Override
205 208 public PageResult<ProductSpuDO> getSpuPage(AppProductSpuPageReqVO pageReqVO) {
206   - //return productSpuMapper.selectPage(pageReqVO); TODO 有差异接口接受参数类型不对
207   - return null;
  209 + // 查找时，如果查找某个分类编号，则包含它的子分类。因为顶级分类不包含商品
  210 + Set<Long> categoryIds = new HashSet<>();
  211 + if (pageReqVO.getCategoryId() != null && pageReqVO.getCategoryId() > 0) {
  212 + categoryIds.add(pageReqVO.getCategoryId());
  213 + List<ProductCategoryDO> categoryChildren = categoryService.getEnableCategoryList(new ProductCategoryListReqVO()
  214 + .setParentId(pageReqVO.getCategoryId()).setStatus(CommonStatusEnum.ENABLE.getStatus()));
  215 + categoryIds.addAll(CollectionUtils.convertList(categoryChildren, ProductCategoryDO::getId));
  216 + }
  217 + // 分页查询
  218 + return productSpuMapper.selectPage(pageReqVO, categoryIds);
208 219 }
209 220  
210 221 @Override
... ...
yudao-module-mall/yudao-module-product-biz/src/main/resources/mapper/favorite/ProductFavoriteMapper.xml deleted
View file @cac5545
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3   -<mapper namespace="cn.iocoder.yudao.module.product.dal.mysql.favorite.ProductFavoriteMapper">
4   -
5   - <!--
6   - 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
7   - 无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
8   - 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
9   - 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
10   - -->
11   -
12   - <select id="selectFavoriteProductList"
13   - resultType="cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO">
14   - SELECT f.id, f.type, f.spu_id as spuId , p.name as spuName, p.pic_url as picUrl , p.price
15   - FROM product_favorite f
16   - INNER JOIN product_spu p ON f.spu_id = p.id and f.deleted = 0
17   - where f.type = #{type} and f.user_id = #{userId}
18   - ORDER BY f.id DESC
19   -
20   - </select>
21   -
22   -</mapper>
23 0 \ No newline at end of file
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
  View file @d08b953
... ... @@ -3,58 +3,58 @@ package cn.iocoder.yudao.module.promotion.enums;
3 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 4  
5 5 /**
6   - * promotion 错误码枚举类
  6 + * Promotion 错误码枚举类
7 7 *
8   - * market 系统，使用 1-003-000-000 段
  8 + * promotion 系统，使用 1-013-000-000 段
9 9 */
10 10 public interface ErrorCodeConstants {
11 11  
12   - // ========== 促销活动相关 1003001000 ============
13   - ErrorCode DISCOUNT_ACTIVITY_NOT_EXISTS = new ErrorCode(1003001000, "限时折扣活动不存在");
14   - ErrorCode DISCOUNT_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1003006001, "存在商品参加了其它限时折扣活动");
15   - ErrorCode DISCOUNT_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1003006002, "限时折扣活动已关闭，不能修改");
16   - ErrorCode DISCOUNT_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED = new ErrorCode(1003006003, "限时折扣活动未关闭，不能删除");
17   - ErrorCode DISCOUNT_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1003006004, "限时折扣活动已关闭，不能重复关闭");
18   - ErrorCode DISCOUNT_ACTIVITY_CLOSE_FAIL_STATUS_END = new ErrorCode(1003006004, "限时折扣活动已结束，不能关闭");
19   -
20   - // ========== Banner 相关 1003002000 ============
21   - ErrorCode BANNER_NOT_EXISTS = new ErrorCode(1003002000, "Banner 不存在");
22   -
23   - // ========== Coupon 相关 1003003000 ============
24   - ErrorCode COUPON_NO_MATCH_SPU = new ErrorCode(1003003000, "优惠劵没有可使用的商品！");
25   - ErrorCode COUPON_NO_MATCH_MIN_PRICE = new ErrorCode(1003003000, "所结算的商品中未满足使用的金额");
26   -
27   - // ========== 优惠劵模板 1003004000 ==========
28   - ErrorCode COUPON_TEMPLATE_NOT_EXISTS = new ErrorCode(1003004000, "优惠劵模板不存在");
29   - ErrorCode COUPON_TEMPLATE_TOTAL_COUNT_TOO_SMALL = new ErrorCode(1003004001, "发放数量不能小于已领取数量({})");
30   -
31   - // ========== 优惠劵模板 1003005000 ==========
32   - ErrorCode COUPON_NOT_EXISTS = new ErrorCode(1003005000, "优惠券不存在");
33   - ErrorCode COUPON_DELETE_FAIL_USED = new ErrorCode(1003005001, "回收优惠劵失败，优惠劵已被使用");
34   - ErrorCode COUPON_STATUS_NOT_UNUSED = new ErrorCode(1006003003, "优惠劵不处于待使用状态");
35   - ErrorCode COUPON_VALID_TIME_NOT_NOW = new ErrorCode(1006003004, "优惠券不在使用时间范围内");
36   -
37   - // ========== 满减送活动 1003006000 ==========
38   - ErrorCode REWARD_ACTIVITY_NOT_EXISTS = new ErrorCode(1003006000, "满减送活动不存在");
39   - ErrorCode REWARD_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1003006001, "存在商品参加了其它满减送活动");
40   - ErrorCode REWARD_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1003006002, "满减送活动已关闭，不能修改");
41   - ErrorCode REWARD_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED = new ErrorCode(1003006003, "满减送活动未关闭，不能删除");
42   - ErrorCode REWARD_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1003006004, "满减送活动已关闭，不能重复关闭");
43   - ErrorCode REWARD_ACTIVITY_CLOSE_FAIL_STATUS_END = new ErrorCode(1003006004, "满减送活动已结束，不能关闭");
44   -
45   - // ========== Price 相关 1003007000 ============
46   - ErrorCode PRICE_CALCULATE_PAY_PRICE_ILLEGAL = new ErrorCode(1003007000, "支付价格计算异常，原因：价格小于等于 0");
47   -
48   - // ========== 秒杀活动 1003008000 ==========
49   - ErrorCode SECKILL_ACTIVITY_NOT_EXISTS = new ErrorCode(1003008000, "秒杀活动不存在");
50   - ErrorCode SECKILL_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1003008002, "存在商品参加了其它秒杀活动");
51   - ErrorCode SECKILL_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1003008003, "秒杀活动已关闭，不能修改");
52   - ErrorCode SECKILL_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED_OR_END = new ErrorCode(1003008004, "秒杀活动未关闭或未结束，不能删除");
53   - ErrorCode SECKILL_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1003008005, "秒杀活动已关闭，不能重复关闭");
54   - ErrorCode SECKILL_ACTIVITY_CLOSE_FAIL_STATUS_END = new ErrorCode(1003008006, "秒杀活动已结束，不能关闭");
55   -
56   - // ========== 秒杀时段 1003009000 ==========
57   - ErrorCode SECKILL_TIME_NOT_EXISTS = new ErrorCode(1003009000, "秒杀时段不存在");
58   - ErrorCode SECKILL_TIME_CONFLICTS = new ErrorCode(1003009001, "秒杀时段冲突");
  12 + // ========== 促销活动相关 1013001000 ============
  13 + ErrorCode DISCOUNT_ACTIVITY_NOT_EXISTS = new ErrorCode(1013001000, "限时折扣活动不存在");
  14 + ErrorCode DISCOUNT_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1013001001, "存在商品参加了其它限时折扣活动");
  15 + ErrorCode DISCOUNT_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1013001002, "限时折扣活动已关闭，不能修改");
  16 + ErrorCode DISCOUNT_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED = new ErrorCode(1013001003, "限时折扣活动未关闭，不能删除");
  17 + ErrorCode DISCOUNT_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1013001004, "限时折扣活动已关闭，不能重复关闭");
  18 + ErrorCode DISCOUNT_ACTIVITY_CLOSE_FAIL_STATUS_END = new ErrorCode(1013001005, "限时折扣活动已结束，不能关闭");
  19 +
  20 + // ========== Banner 相关 1013002000 ============
  21 + ErrorCode BANNER_NOT_EXISTS = new ErrorCode(1013002000, "Banner 不存在");
  22 +
  23 + // ========== Coupon 相关 1013003000 ============
  24 + ErrorCode COUPON_NO_MATCH_SPU = new ErrorCode(1013003000, "优惠劵没有可使用的商品！");
  25 + ErrorCode COUPON_NO_MATCH_MIN_PRICE = new ErrorCode(1013003001, "所结算的商品中未满足使用的金额");
  26 +
  27 + // ========== 优惠劵模板 1013004000 ==========
  28 + ErrorCode COUPON_TEMPLATE_NOT_EXISTS = new ErrorCode(1013004000, "优惠劵模板不存在");
  29 + ErrorCode COUPON_TEMPLATE_TOTAL_COUNT_TOO_SMALL = new ErrorCode(1013004001, "发放数量不能小于已领取数量({})");
  30 +
  31 + // ========== 优惠劵模板 1013005000 ==========
  32 + ErrorCode COUPON_NOT_EXISTS = new ErrorCode(1013005000, "优惠券不存在");
  33 + ErrorCode COUPON_DELETE_FAIL_USED = new ErrorCode(1013005001, "回收优惠劵失败，优惠劵已被使用");
  34 + ErrorCode COUPON_STATUS_NOT_UNUSED = new ErrorCode(1013005002, "优惠劵不处于待使用状态");
  35 + ErrorCode COUPON_VALID_TIME_NOT_NOW = new ErrorCode(1013005003, "优惠券不在使用时间范围内");
  36 +
  37 + // ========== 满减送活动 1013006000 ==========
  38 + ErrorCode REWARD_ACTIVITY_NOT_EXISTS = new ErrorCode(1013006000, "满减送活动不存在");
  39 + ErrorCode REWARD_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1013006001, "存在商品参加了其它满减送活动");
  40 + ErrorCode REWARD_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1013006002, "满减送活动已关闭，不能修改");
  41 + ErrorCode REWARD_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED = new ErrorCode(1013006003, "满减送活动未关闭，不能删除");
  42 + ErrorCode REWARD_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1013006004, "满减送活动已关闭，不能重复关闭");
  43 + ErrorCode REWARD_ACTIVITY_CLOSE_FAIL_STATUS_END = new ErrorCode(1013006005, "满减送活动已结束，不能关闭");
  44 +
  45 + // ========== Price 相关 1013007000 ============
  46 + ErrorCode PRICE_CALCULATE_PAY_PRICE_ILLEGAL = new ErrorCode(1013007000, "支付价格计算异常，原因：价格小于等于 0");
  47 +
  48 + // ========== 秒杀活动 1013008000 ==========
  49 + ErrorCode SECKILL_ACTIVITY_NOT_EXISTS = new ErrorCode(1013008000, "秒杀活动不存在");
  50 + ErrorCode SECKILL_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1013008002, "存在商品参加了其它秒杀活动");
  51 + ErrorCode SECKILL_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1013008003, "秒杀活动已关闭，不能修改");
  52 + ErrorCode SECKILL_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED_OR_END = new ErrorCode(1013008004, "秒杀活动未关闭或未结束，不能删除");
  53 + ErrorCode SECKILL_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1013008005, "秒杀活动已关闭，不能重复关闭");
  54 + ErrorCode SECKILL_ACTIVITY_CLOSE_FAIL_STATUS_END = new ErrorCode(1013008006, "秒杀活动已结束，不能关闭");
  55 +
  56 + // ========== 秒杀时段 1013009000 ==========
  57 + ErrorCode SECKILL_TIME_NOT_EXISTS = new ErrorCode(1013009000, "秒杀时段不存在");
  58 + ErrorCode SECKILL_TIME_CONFLICTS = new ErrorCode(1013009001, "秒杀时段冲突");
59 59  
60 60 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckilltime/SeckillTimeMapper.java
  View file @d08b953
... ... @@ -10,11 +10,6 @@ import java.time.LocalTime;
10 10 import java.util.Collection;
11 11 import java.util.List;
12 12  
13   -/**
14   - * 秒杀时段 Mapper
15   - *
16   - * @author halfninety
17   - */
18 13 @Mapper
19 14 public interface SeckillTimeMapper extends BaseMapperX<SeckillTimeDO> {
20 15  
... ...
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
  View file @d08b953
... ... @@ -3,15 +3,15 @@ package cn.iocoder.yudao.module.trade.enums;
3 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 4  
5 5 /**
6   - * 交易 错误码枚举类
7   - * 交易系统，使用 1-011-000-000 段
  6 + * Trade 错误码枚举类
  7 + * trade 系统，使用 1-011-000-000 段
8 8 *
9 9 * @author LeeYan9
10 10 * @since 2022-08-26
11 11 */
12 12 public interface ErrorCodeConstants {
13 13  
14   - // ========== Order 模块 1-011-000-000 ==========
  14 + // ========== Order 模块 1011000000 ==========
15 15 ErrorCode ORDER_CREATE_SKU_NOT_FOUND = new ErrorCode(1011000001, "商品 SKU 不存在");
16 16 ErrorCode ORDER_CREATE_SPU_NOT_SALE = new ErrorCode(1011000002, "商品 SPU 不可售卖");
17 17 ErrorCode ORDER_CREATE_SKU_STOCK_NOT_ENOUGH = new ErrorCode(1011000004, "商品 SKU 库存不足");
... ... @@ -28,7 +28,7 @@ public interface ErrorCodeConstants {
28 28 ErrorCode ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED = new ErrorCode(1011000017, "交易订单发货失败，订单不是【待发货】状态");
29 29 ErrorCode ORDER_RECEIVE_FAIL_STATUS_NOT_DELIVERED = new ErrorCode(1011000018, "交易订单收货失败，订单不是【待收货】状态");
30 30  
31   - // ========== After Sale 模块 1-011-000-000 ==========
  31 + // ========== After Sale 模块 1011000100 ==========
32 32 ErrorCode AFTER_SALE_NOT_FOUND = new ErrorCode(1011000100, "售后单不存在");
33 33 ErrorCode AFTER_SALE_CREATE_FAIL_REFUND_PRICE_ERROR = new ErrorCode(1011000101, "申请退款金额错误");
34 34 ErrorCode AFTER_SALE_CREATE_FAIL_ORDER_STATUS_CANCELED = new ErrorCode(1011000102, "订单已关闭，无法申请售后");
... ... @@ -42,7 +42,12 @@ public interface ErrorCodeConstants {
42 42 ErrorCode AFTER_SALE_REFUND_FAIL_STATUS_NOT_WAIT_REFUND = new ErrorCode(1011000110, "退款失败，售后单状态不是【待退款】");
43 43 ErrorCode AFTER_SALE_CANCEL_FAIL_STATUS_NOT_APPLY_OR_AGREE = new ErrorCode(1011000111, "取消售后单失败，售后单状态不是【待审核】或【卖家同意】");
44 44  
45   - // ========== Cart 模块 1-011-001-000 ==========
  45 + // ========== Cart 模块 1011002000 ==========
46 46 ErrorCode CARD_ITEM_NOT_FOUND = new ErrorCode(1011002000, "购物车项不存在");
47 47  
  48 + // ========== 物流配送模块 1011003000 ==========
  49 + ErrorCode DELIVERY_EXPRESS_NOT_EXISTS = new ErrorCode(1011003000, "快递公司不存在");
  50 + ErrorCode EXPRESS_CODE_DUPLICATE = new ErrorCode(1011003001, "已经存在该编码的快递公司");
  51 + ErrorCode EXPRESS_TEMPLATE_NOT_EXISTS = new ErrorCode(1011003002, "运费模板不存在");
  52 + ErrorCode EXPRESS_TEMPLATE_NAME_DUPLICATE = new ErrorCode(1011003002, "已经存在该运费模板名");
48 53 }
... ...
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.enums.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
  4 +import lombok.AllArgsConstructor;
  5 +import lombok.Getter;
  6 +
  7 +import java.util.Arrays;
  8 +
  9 +/**
  10 + * 快递配送计费方式枚举
  11 + *
  12 + * @author jason
  13 + */
  14 +@AllArgsConstructor
  15 +@Getter
  16 +public enum DeliveryExpressChargeModeEnum implements IntArrayValuable {
  17 +
  18 + PIECE(1, "按件"),
  19 + WEIGHT(2,"按重量"),
  20 + VOLUME(3, "按体积");
  21 +
  22 + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DeliveryExpressChargeModeEnum::getType).toArray();
  23 +
  24 + /**
  25 + * 类型
  26 + */
  27 + private final Integer type;
  28 + /**
  29 + * 描述
  30 + */
  31 + private final String desc;
  32 +
  33 + @Override
  34 + public int[] array() {
  35 + return ARRAYS;
  36 + }
  37 +
  38 +}
... ...
yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryTypeEnum.java renamed to yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryTypeEnum.java
  View file @d08b953
1   -package cn.iocoder.yudao.module.product.enums.delivery;
  1 +package cn.iocoder.yudao.module.trade.enums.delivery;
2 2  
3 3 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
4 4 import lombok.AllArgsConstructor;
... ... @@ -15,9 +15,8 @@ import java.util.Arrays;
15 15 @AllArgsConstructor
16 16 public enum DeliveryTypeEnum implements IntArrayValuable {
17 17  
18   - // TODO 芋艿：英文单词，需要再想下；
19 18 EXPRESS(1, "快递发货"),
20   - USER(2, "用户自提"),;
  19 + PICK_UP(2, "用户自提"),;
21 20  
22 21 public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DeliveryTypeEnum::getMode).toArray();
23 22  
... ...
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderItemAfterSaleStatusEnum.java
  View file @d08b953
... ... @@ -17,8 +17,8 @@ import java.util.Arrays;
17 17 public enum TradeOrderItemAfterSaleStatusEnum implements IntArrayValuable {
18 18  
19 19 NONE(0, "未售后"),
20   - APPLY(1, "售后中"),
21   - SUCCESS(2, "已退款");
  20 + APPLY(10, "售后中"),
  21 + SUCCESS(20, "售后成功");
22 22  
23 23 public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderItemAfterSaleStatusEnum::getStatus).toArray();
24 24  
... ... @@ -31,9 +31,6 @@ public enum TradeOrderItemAfterSaleStatusEnum implements IntArrayValuable {
31 31 */
32 32 private final String name;
33 33  
34   - // TODO 芋艿：EXPIRED 已失效不允许申请售后
35   - // TODO 芋艿：PART_AFTER_SALE 部分售后
36   -
37 34 @Override
38 35 public int[] array() {
39 36 return ARRAYS;
... ...
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderAfterSaleStatusEnum.java renamed to yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderRefundStatusEnum.java
  View file @d08b953
... ... @@ -7,19 +7,19 @@ import lombok.RequiredArgsConstructor;
7 7 import java.util.Arrays;
8 8  
9 9 /**
10   - * 交易订单 - 售后状态
  10 + * 交易订单 - 退款状态
11 11 *
12 12 * @author Sin
13 13 */
14 14 @RequiredArgsConstructor
15 15 @Getter
16   -public enum TradeOrderAfterSaleStatusEnum implements IntArrayValuable {
  16 +public enum TradeOrderRefundStatusEnum implements IntArrayValuable {
17 17  
18 18 NONE(0, "未退款"),
19   - PART(1, "部分退款"),
20   - ALL(2, "全部退款");
  19 + PART(10, "部分退款"),
  20 + ALL(20, "全部退款");
21 21  
22   - public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderAfterSaleStatusEnum::getStatus).toArray();
  22 + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderRefundStatusEnum::getStatus).toArray();
23 23  
24 24 /**
25 25 * 状态值
... ...
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
  View file @d08b953
... ... @@ -23,8 +23,6 @@ public enum TradeOrderStatusEnum implements IntArrayValuable {
23 23 COMPLETED(30, "已完成"),
24 24 CANCELED(40, "已取消");
25 25  
26   - // TODO 芋艿： TAKE("待核验")：虚拟订单需要核验商品
27   -
28 26 public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderStatusEnum::getStatus).toArray();
29 27  
30 28 /**
... ...
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderTypeEnum.java
  View file @d08b953
... ... @@ -17,8 +17,11 @@ public enum TradeOrderTypeEnum implements IntArrayValuable {
17 17  
18 18 NORMAL(0, "普通订单"),
19 19 SECKILL(1, "秒杀订单"),
20   - TEAM(2, "拼团订单"),
21   - BARGAIN(3, "砍价订单");
  20 + // TODO 芋艿：如下三个字段，名字需要改下，等后面表设计完成后。
  21 + KANJIA(2, "砍价订单"),
  22 + PINTUAN(3, "拼团订单"),
  23 + YUSHOU(4, "预售订单"),
  24 + ;
22 25  
23 26 public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderTypeEnum::getType).toArray();
24 27  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery;
  2 +
  3 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.*;
  4 +import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressConvert;
  5 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
  6 +import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService;
  7 +import org.springframework.web.bind.annotation.*;
  8 +import javax.annotation.Resource;
  9 +import org.springframework.validation.annotation.Validated;
  10 +import org.springframework.security.access.prepost.PreAuthorize;
  11 +import io.swagger.v3.oas.annotations.tags.Tag;
  12 +import io.swagger.v3.oas.annotations.Parameter;
  13 +import io.swagger.v3.oas.annotations.Operation;
  14 +
  15 +import javax.validation.constraints.*;
  16 +import javax.validation.*;
  17 +import javax.servlet.http.*;
  18 +import java.util.*;
  19 +import java.io.IOException;
  20 +
  21 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  22 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  23 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  24 +
  25 +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
  26 +
  27 +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
  28 +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
  29 +
  30 +@Tag(name = "管理后台 - 快递公司")
  31 +@RestController
  32 +@RequestMapping("/trade/delivery/express")
  33 +@Validated
  34 +public class DeliveryExpressController {
  35 +
  36 + @Resource
  37 + private DeliveryExpressService deliveryExpressService;
  38 +
  39 + @PostMapping("/create")
  40 + @Operation(summary = "创建快递公司")
  41 + @PreAuthorize("@ss.hasPermission('trade:delivery:express:create')")
  42 + public CommonResult<Long> createDeliveryExpress(@Valid @RequestBody DeliveryExpressCreateReqVO createReqVO) {
  43 + return success(deliveryExpressService.createDeliveryExpress(createReqVO));
  44 + }
  45 +
  46 + @PutMapping("/update")
  47 + @Operation(summary = "更新快递公司")
  48 + @PreAuthorize("@ss.hasPermission('trade:delivery:express:update')")
  49 + public CommonResult<Boolean> updateDeliveryExpress(@Valid @RequestBody DeliveryExpressUpdateReqVO updateReqVO) {
  50 + deliveryExpressService.updateDeliveryExpress(updateReqVO);
  51 + return success(true);
  52 + }
  53 +
  54 + @DeleteMapping("/delete")
  55 + @Operation(summary = "删除快递公司")
  56 + @Parameter(name = "id", description = "编号", required = true)
  57 + @PreAuthorize("@ss.hasPermission('trade:delivery:express:delete')")
  58 + public CommonResult<Boolean> deleteDeliveryExpress(@RequestParam("id") Long id) {
  59 + deliveryExpressService.deleteDeliveryExpress(id);
  60 + return success(true);
  61 + }
  62 +
  63 + @GetMapping("/get")
  64 + @Operation(summary = "获得快递公司")
  65 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  66 + @PreAuthorize("@ss.hasPermission('trade:delivery:express:query')")
  67 + public CommonResult<DeliveryExpressRespVO> getDeliveryExpress(@RequestParam("id") Long id) {
  68 + DeliveryExpressDO deliveryExpress = deliveryExpressService.getDeliveryExpress(id);
  69 + return success(DeliveryExpressConvert.INSTANCE.convert(deliveryExpress));
  70 + }
  71 +
  72 + @GetMapping("/page")
  73 + @Operation(summary = "获得快递公司分页")
  74 + @PreAuthorize("@ss.hasPermission('trade:delivery:express:query')")
  75 + public CommonResult<PageResult<DeliveryExpressRespVO>> getDeliveryExpressPage(@Valid DeliveryExpressPageReqVO pageVO) {
  76 + PageResult<DeliveryExpressDO> pageResult = deliveryExpressService.getDeliveryExpressPage(pageVO);
  77 + return success(DeliveryExpressConvert.INSTANCE.convertPage(pageResult));
  78 + }
  79 +
  80 + @GetMapping("/export-excel")
  81 + @Operation(summary = "导出快递公司 Excel")
  82 + @PreAuthorize("@ss.hasPermission('trade:delivery:express:export')")
  83 + @OperateLog(type = EXPORT)
  84 + public void exportDeliveryExpressExcel(@Valid DeliveryExpressExportReqVO exportReqVO,
  85 + HttpServletResponse response) throws IOException {
  86 + List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressList(exportReqVO);
  87 + // 导出 Excel
  88 + List<DeliveryExpressExcelVO> dataList = DeliveryExpressConvert.INSTANCE.convertList02(list);
  89 + ExcelUtils.write(response, "快递公司.xls", "数据", DeliveryExpressExcelVO.class, dataList);
  90 + }
  91 +
  92 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressTemplateController.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery;
  2 +
  3 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.*;
  4 +import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressTemplateConvert;
  5 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
  6 +import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressTemplateService;
  7 +import org.springframework.web.bind.annotation.*;
  8 +import javax.annotation.Resource;
  9 +import org.springframework.validation.annotation.Validated;
  10 +import org.springframework.security.access.prepost.PreAuthorize;
  11 +import io.swagger.v3.oas.annotations.tags.Tag;
  12 +import io.swagger.v3.oas.annotations.Parameter;
  13 +import io.swagger.v3.oas.annotations.Operation;
  14 +
  15 +import javax.validation.*;
  16 +import javax.servlet.http.*;
  17 +import java.util.*;
  18 +import java.io.IOException;
  19 +
  20 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  21 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  22 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  23 +
  24 +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
  25 +
  26 +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
  27 +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
  28 +
  29 +
  30 +@Tag(name = "管理后台 - 快递运费模板")
  31 +@RestController
  32 +@RequestMapping("/trade/delivery/express-template")
  33 +@Validated
  34 +public class DeliveryExpressTemplateController {
  35 +
  36 + @Resource
  37 + private DeliveryExpressTemplateService deliveryExpressTemplateService;
  38 +
  39 + @PostMapping("/create")
  40 + @Operation(summary = "创建快递运费模板")
  41 + @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:create')")
  42 + public CommonResult<Long> createDeliveryExpressTemplate(@Valid @RequestBody DeliveryExpressTemplateCreateReqVO createReqVO) {
  43 + return success(deliveryExpressTemplateService.createDeliveryExpressTemplate(createReqVO));
  44 + }
  45 +
  46 + @PutMapping("/update")
  47 + @Operation(summary = "更新快递运费模板")
  48 + @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:update')")
  49 + public CommonResult<Boolean> updateDeliveryExpressTemplate(@Valid @RequestBody DeliveryExpressTemplateUpdateReqVO updateReqVO) {
  50 + deliveryExpressTemplateService.updateDeliveryExpressTemplate(updateReqVO);
  51 + return success(true);
  52 + }
  53 +
  54 + @DeleteMapping("/delete")
  55 + @Operation(summary = "删除快递运费模板")
  56 + @Parameter(name = "id", description = "编号", required = true)
  57 + @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:delete')")
  58 + public CommonResult<Boolean> deleteDeliveryExpressTemplate(@RequestParam("id") Long id) {
  59 + deliveryExpressTemplateService.deleteDeliveryExpressTemplate(id);
  60 + return success(true);
  61 + }
  62 +
  63 + @GetMapping("/get")
  64 + @Operation(summary = "获得快递运费模板")
  65 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  66 + @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
  67 + public CommonResult<DeliveryExpressTemplateRespVO> getDeliveryExpressTemplate(@RequestParam("id") Long id) {
  68 + return success(deliveryExpressTemplateService.getDeliveryExpressTemplate(id));
  69 + }
  70 +
  71 + @GetMapping("/list")
  72 + @Operation(summary = "获得快递运费模板列表")
  73 + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
  74 + @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
  75 + public CommonResult<List<DeliveryExpressTemplateSimpleRespVO>> getDeliveryExpressTemplateList(@RequestParam("ids") Collection<Long> ids) {
  76 + List<DeliveryExpressTemplateDO> list = deliveryExpressTemplateService.getDeliveryExpressTemplateList(ids);
  77 + return success(DeliveryExpressTemplateConvert.INSTANCE.convertList(list));
  78 + }
  79 +
  80 + @GetMapping("/page")
  81 + @Operation(summary = "获得快递运费模板分页")
  82 + @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
  83 + public CommonResult<PageResult<DeliveryExpressTemplateSimpleRespVO>> getDeliveryExpressTemplatePage(@Valid DeliveryExpressTemplatePageReqVO pageVO) {
  84 + PageResult<DeliveryExpressTemplateDO> pageResult = deliveryExpressTemplateService.getDeliveryExpressTemplatePage(pageVO);
  85 + return success(DeliveryExpressTemplateConvert.INSTANCE.convertPage(pageResult));
  86 + }
  87 +
  88 + @GetMapping("/export-excel")
  89 + @Operation(summary = "导出快递运费模板 Excel")
  90 + @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:export')")
  91 + @OperateLog(type = EXPORT)
  92 + public void exportDeliveryExpressTemplateExcel(@Valid DeliveryExpressTemplateExportReqVO exportReqVO,
  93 + HttpServletResponse response) throws IOException {
  94 + List<DeliveryExpressTemplateDO> list = deliveryExpressTemplateService.getDeliveryExpressTemplateList(exportReqVO);
  95 + // 导出 Excel
  96 + List<DeliveryExpressTemplateExcelVO> datas = DeliveryExpressTemplateConvert.INSTANCE.convertList02(list);
  97 + ExcelUtils.write(response, "快递运费模板.xls", "数据", DeliveryExpressTemplateExcelVO.class, datas);
  98 + }
  99 +
  100 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressBaseVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.util.*;
  6 +import java.time.LocalDateTime;
  7 +import java.time.LocalDateTime;
  8 +import javax.validation.constraints.*;
  9 +
  10 +/**
  11 +* 快递公司 Base VO，提供给添加、修改、详细的子 VO 使用
  12 +* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  13 +*/
  14 +@Data
  15 +public class DeliveryExpressBaseVO {
  16 +
  17 + @Schema(description = "快递公司编号", required = true)
  18 + @NotNull(message = "快递公司编号不能为空")
  19 + private String code;
  20 +
  21 + @Schema(description = "快递公司名称", required = true, example = "李四")
  22 + @NotNull(message = "快递公司名称不能为空")
  23 + private String name;
  24 +
  25 + @Schema(description = "快递公司logo")
  26 + private String logo;
  27 +
  28 + @Schema(description = "排序", required = true)
  29 + @NotNull(message = "排序不能为空")
  30 + private Integer sort;
  31 +
  32 + @Schema(description = "状态（0正常 1停用）", required = true, example = "1")
  33 + @NotNull(message = "状态（0正常 1停用）不能为空")
  34 + private Integer status;
  35 +
  36 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressCreateReqVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import javax.validation.constraints.*;
  7 +
  8 +@Schema(description = "管理后台 - 快递公司创建 Request VO")
  9 +@Data
  10 +@EqualsAndHashCode(callSuper = true)
  11 +@ToString(callSuper = true)
  12 +public class DeliveryExpressCreateReqVO extends DeliveryExpressBaseVO {
  13 +
  14 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressExcelVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import com.alibaba.excel.annotation.ExcelProperty;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +/**
  9 + * 快递公司 Excel VO
  10 + *
  11 + * @author jason
  12 + */
  13 +@Data
  14 +public class DeliveryExpressExcelVO {
  15 +
  16 + @ExcelProperty("编号")
  17 + private Long id;
  18 +
  19 + @ExcelProperty("快递公司编号")
  20 + private String code;
  21 +
  22 + @ExcelProperty("快递公司名称")
  23 + private String name;
  24 +
  25 + @ExcelProperty("快递公司logo")
  26 + private String logo;
  27 +
  28 + @ExcelProperty("排序")
  29 + private Integer sort;
  30 +
  31 + @ExcelProperty("状态（0正常 1停用）")
  32 + private Byte status;
  33 +
  34 + @ExcelProperty("创建时间")
  35 + private LocalDateTime createTime;
  36 +
  37 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressExportReqVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import org.springframework.format.annotation.DateTimeFormat;
  6 +
  7 +import java.time.LocalDateTime;
  8 +
  9 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  10 +
  11 +@Schema(description = "管理后台 - 快递公司 Excel 导出 Request VO")
  12 +@Data
  13 +public class DeliveryExpressExportReqVO {
  14 +
  15 + @Schema(description = "快递公司编号")
  16 + private String code;
  17 +
  18 + @Schema(description = "快递公司名称", example = "李四")
  19 + private String name;
  20 +
  21 + @Schema(description = "状态（0正常 1停用）", example = "1")
  22 + private Integer status;
  23 +
  24 + @Schema(description = "创建时间")
  25 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  26 + private LocalDateTime[] createTime;
  27 +
  28 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressPageReqVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +import java.time.LocalDateTime;
  9 +
  10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  11 +
  12 +@Schema(description = "管理后台 - 快递公司分页 Request VO")
  13 +@Data
  14 +@EqualsAndHashCode(callSuper = true)
  15 +@ToString(callSuper = true)
  16 +public class DeliveryExpressPageReqVO extends PageParam {
  17 +
  18 + @Schema(description = "快递公司编号")
  19 + private String code;
  20 +
  21 + @Schema(description = "快递公司名称", example = "李四")
  22 + private String name;
  23 +
  24 + @Schema(description = "状态（0正常 1停用）", example = "1")
  25 + private Integer status;
  26 +
  27 + @Schema(description = "创建时间")
  28 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  29 + private LocalDateTime[] createTime;
  30 +
  31 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressRespVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.time.LocalDateTime;
  6 +
  7 +@Schema(description = "管理后台 - 快递公司 Response VO")
  8 +@Data
  9 +@EqualsAndHashCode(callSuper = true)
  10 +@ToString(callSuper = true)
  11 +public class DeliveryExpressRespVO extends DeliveryExpressBaseVO {
  12 +
  13 + @Schema(description = "编号", required = true, example = "6592")
  14 + private Long id;
  15 +
  16 + @Schema(description = "创建时间", required = true)
  17 + private LocalDateTime createTime;
  18 +
  19 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressTemplateBaseVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +/**
  9 +* 快递运费模板 Base VO，提供给添加、修改、详细的子 VO 使用
  10 +* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  11 +*/
  12 +@Data
  13 +public class DeliveryExpressTemplateBaseVO {
  14 +
  15 + @Schema(description = "模板名称", required = true, example = "王五")
  16 + @NotNull(message = "模板名称不能为空")
  17 + private String name;
  18 +
  19 + @Schema(description = "配送计费方式 1:按件 2:按重量 3:按体积", required = true)
  20 + @NotNull(message = "配送计费方式 1:按件 2:按重量 3:按体积不能为空")
  21 + private Integer chargeMode;
  22 +
  23 + @Schema(description = "排序", required = true)
  24 + @NotNull(message = "排序不能为空")
  25 + private Integer sort;
  26 +
  27 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressTemplateCreateReqVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +
  7 +import javax.validation.Valid;
  8 +
  9 +@Schema(description = "管理后台 - 快递运费模板创建 Request VO")
  10 +@Data
  11 +@EqualsAndHashCode(callSuper = true)
  12 +@ToString(callSuper = true)
  13 +public class DeliveryExpressTemplateCreateReqVO extends DeliveryExpressTemplateBaseVO {
  14 +
  15 + @Schema(description = "区域运费列表")
  16 + @Valid
  17 + private List<ExpressTemplateChargeBaseVO> templateCharge = Collections.emptyList();
  18 +
  19 + @Schema(description = "包邮区域列表")
  20 + @Valid
  21 + private List<ExpressTemplateFreeBaseVO> templateFree = Collections.emptyList();
  22 +
  23 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressTemplateExcelVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import com.alibaba.excel.annotation.ExcelProperty;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +/**
  9 + * 快递运费模板 Excel VO
  10 + *
  11 + * @author jason
  12 + */
  13 +@Data
  14 +public class DeliveryExpressTemplateExcelVO {
  15 +
  16 + @ExcelProperty("编号，自增")
  17 + private Long id;
  18 +
  19 + @ExcelProperty("模板名称")
  20 + private String name;
  21 +
  22 + @ExcelProperty("配送计费方式 1:按件 2:按重量 3:按体积")
  23 + private Integer chargeMode;
  24 +
  25 + @ExcelProperty("排序")
  26 + private Integer sort;
  27 +
  28 + @ExcelProperty("创建时间")
  29 + private LocalDateTime createTime;
  30 +
  31 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressTemplateExportReqVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  7 +import java.time.LocalDateTime;
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  11 +
  12 +@Schema(description = "管理后台 - 快递运费模板 Excel 导出 Request VO，参数和 DeliveryExpressTemplatePageReqVO 是一致的")
  13 +@Data
  14 +public class DeliveryExpressTemplateExportReqVO {
  15 +
  16 + @Schema(description = "模板名称", example = "王五")
  17 + private String name;
  18 +
  19 + @Schema(description = "配送计费方式 1:按件 2:按重量 3:按体积")
  20 + private Integer chargeMode;
  21 +
  22 + @Schema(description = "创建时间")
  23 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  24 + private LocalDateTime[] createTime;
  25 +
  26 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressTemplatePageReqVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +import java.time.LocalDateTime;
  9 +
  10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  11 +
  12 +@Schema(description = "管理后台 - 快递运费模板分页 Request VO")
  13 +@Data
  14 +@EqualsAndHashCode(callSuper = true)
  15 +@ToString(callSuper = true)
  16 +public class DeliveryExpressTemplatePageReqVO extends PageParam {
  17 +
  18 + @Schema(description = "模板名称", example = "王五")
  19 + private String name;
  20 +
  21 + @Schema(description = "配送计费方式 1:按件 2:按重量 3:按体积")
  22 + private Integer chargeMode;
  23 +
  24 + @Schema(description = "创建时间")
  25 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  26 + private LocalDateTime[] createTime;
  27 +
  28 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressTemplateRespVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import java.util.List;
  9 +
  10 +/**
  11 + * @author jason
  12 + */
  13 +@Schema(description = "管理后台 - 快递运费模板 Response VO")
  14 +@Data
  15 +@EqualsAndHashCode(callSuper = true)
  16 +@ToString(callSuper = true)
  17 +public class DeliveryExpressTemplateRespVO extends DeliveryExpressTemplateBaseVO {
  18 +
  19 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "371")
  20 + private Long id;
  21 +
  22 + @Schema(description = "运费模板运费设置", requiredMode = Schema.RequiredMode.REQUIRED)
  23 + private List<ExpressTemplateChargeBaseVO> templateCharge;
  24 +
  25 + @Schema(description = "运费模板包邮区域", requiredMode = Schema.RequiredMode.REQUIRED)
  26 + private List<ExpressTemplateFreeBaseVO> templateFree;
  27 +
  28 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressTemplateSimpleRespVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.time.LocalDateTime;
  6 +
  7 +@Schema(description = "管理后台 - 快递运费模板 精简 Response VO")
  8 +@Data
  9 +@EqualsAndHashCode(callSuper = true)
  10 +@ToString(callSuper = true)
  11 +public class DeliveryExpressTemplateSimpleRespVO extends DeliveryExpressTemplateBaseVO {
  12 +
  13 + @Schema(description = "编号，自增", required = true, example = "371")
  14 + private Long id;
  15 +
  16 + @Schema(description = "创建时间", required = true)
  17 + private LocalDateTime createTime;
  18 +
  19 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressTemplateUpdateReqVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.util.*;
  6 +import javax.validation.Valid;
  7 +import javax.validation.constraints.*;
  8 +
  9 +@Schema(description = "管理后台 - 快递运费模板更新 Request VO")
  10 +@Data
  11 +@EqualsAndHashCode(callSuper = true)
  12 +@ToString(callSuper = true)
  13 +public class DeliveryExpressTemplateUpdateReqVO extends DeliveryExpressTemplateBaseVO {
  14 +
  15 + @Schema(description = "编号", required = true, example = "371")
  16 + @NotNull(message = "编号不能为空")
  17 + private Long id;
  18 +
  19 + @Schema(description = "区域运费列表")
  20 + @Valid
  21 + private List<ExpressTemplateChargeUpdateVO> templateCharge = Collections.emptyList();
  22 +
  23 + @Schema(description = "包邮区域列表")
  24 + @Valid
  25 + private List<ExpressTemplateFreeUpdateVO> templateFree = Collections.emptyList();
  26 +
  27 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/DeliveryExpressUpdateReqVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.util.*;
  6 +import javax.validation.constraints.*;
  7 +
  8 +@Schema(description = "管理后台 - 快递公司更新 Request VO")
  9 +@Data
  10 +@EqualsAndHashCode(callSuper = true)
  11 +@ToString(callSuper = true)
  12 +public class DeliveryExpressUpdateReqVO extends DeliveryExpressBaseVO {
  13 +
  14 + @Schema(description = "编号", required = true, example = "6592")
  15 + @NotNull(message = "编号不能为空")
  16 + private Long id;
  17 +
  18 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/ExpressTemplateChargeBaseVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +/**
  9 + * 快递运费模板运费设置 Base VO，提供给添加运费模板使用
  10 + *
  11 + * @author jason
  12 + */
  13 +@Data
  14 +public class ExpressTemplateChargeBaseVO {
  15 +
  16 + @Schema(description = "区域编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  17 + @NotNull(message = "区域编号不能为空")
  18 + private Integer areaId;
  19 +
  20 + @Schema(description = "首件数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
  21 + @NotNull(message = "首件数量不能为空")
  22 + private Double startCount;
  23 +
  24 + @Schema(description = "起步价", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
  25 + @NotNull(message = "起步价不能为空")
  26 + private Integer startPrice;
  27 +
  28 + @Schema(description = "续件数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  29 + @NotNull(message = "续件数量不能为空")
  30 + private Double extraCount;
  31 +
  32 + @Schema(description = "额外价", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
  33 + @NotNull(message = "额外价不能为空")
  34 + private Integer extraPrice;
  35 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/ExpressTemplateChargeUpdateVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +/**
  7 + * @author jason
  8 + */
  9 +@Data
  10 +public class ExpressTemplateChargeUpdateVO extends ExpressTemplateChargeBaseVO {
  11 +
  12 + @Schema(description = "编号", example = "6592")
  13 + private Long id;
  14 +
  15 + @Schema(description = "配送模板编号", example = "1")
  16 + private Long templateId;
  17 +
  18 + @Schema(description = "配送计费方式", example = "1")
  19 + private Integer chargeMode;
  20 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/ExpressTemplateFreeBaseVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +/**
  9 + * 快递运费模板包邮 Base VO，提供给添加运费模板使用
  10 + *
  11 + * @author jason
  12 + */
  13 +@Data
  14 +public class ExpressTemplateFreeBaseVO {
  15 +
  16 + @Schema(description = "区域编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  17 + @NotNull(message = "区域编号不能为空")
  18 + private Integer areaId;
  19 +
  20 + @Schema(description = "包邮金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "5000")
  21 + @NotNull(message = "包邮金额不能为空")
  22 + private Integer freePrice;
  23 +
  24 + @Schema(description = "包邮件数", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
  25 + @NotNull(message = "包邮件数不能为空")
  26 + private Integer freeCount;
  27 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/ExpressTemplateFreeUpdateVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +/**
  7 + * 快递运费模板包邮 更新 VO
  8 + *
  9 + * @author jason
  10 + */
  11 +@Data
  12 +public class ExpressTemplateFreeUpdateVO extends ExpressTemplateFreeBaseVO {
  13 +
  14 + @Schema(description = "编号", example = "6592")
  15 + private Long id;
  16 +
  17 + @Schema(description = "配送模板编号", example = "1")
  18 + private Long templateId;
  19 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
  View file @d08b953
... ... @@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6 6 import java.time.LocalDateTime;
7   -import java.util.Date;
8 7  
9 8 /**
10 9 * 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用
... ... @@ -118,9 +117,6 @@ public class TradeOrderBaseVO {
118 117 @Schema(description = "收件人地区编号", required = true, example = "110000")
119 118 private Integer receiverAreaId;
120 119  
121   - @Schema(description = "收件人邮编", required = true, example = "100000")
122   - private Integer receiverPostCode;
123   -
124 120 @Schema(description = "收件人详细地址", required = true, example = "中关村大街 1 号")
125 121 private String receiverDetailAddress;
126 122  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
  View file @d08b953
... ... @@ -40,11 +40,8 @@ public class TradeOrderItemBaseVO {
40 40  
41 41 // ========== 价格 + 支付基本信息 ==========
42 42  
43   - @Schema(description = "商品原价（总）", required = true, example = "100")
44   - private Integer originalPrice;
45   -
46 43 @Schema(description = "商品原价（单）", required = true, example = "100")
47   - private Integer originalUnitPrice;
  44 + private Integer price;
48 45  
49 46 @Schema(description = "商品优惠（总）", required = true, example = "100")
50 47 private Integer discountPrice;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppTradeAfterSaleController.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.trade.controller.app.aftersale;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleCreateReqVO;
5 6 import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleDeliveryReqVO;
  7 +import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSalePageItemRespVO;
  8 +import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
6 9 import cn.iocoder.yudao.module.trade.service.aftersale.TradeAfterSaleService;
7 10 import io.swagger.v3.oas.annotations.Operation;
8 11 import io.swagger.v3.oas.annotations.Parameter;
... ... @@ -12,6 +15,8 @@ import org.springframework.validation.annotation.Validated;
12 15 import org.springframework.web.bind.annotation.*;
13 16  
14 17 import javax.annotation.Resource;
  18 +import java.time.LocalDateTime;
  19 +import java.util.Arrays;
15 20  
16 21 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
17 22 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
... ... @@ -26,6 +31,51 @@ public class AppTradeAfterSaleController {
26 31 @Resource
27 32 private TradeAfterSaleService afterSaleService;
28 33  
  34 + // TODO 芋艿：待实现
  35 + @GetMapping(value = "/page")
  36 + @Operation(summary = "获得售后分页")
  37 + public CommonResult<PageResult<AppTradeAfterSalePageItemRespVO>> getAfterSalePage() {
  38 + AppTradeAfterSalePageItemRespVO vo = new AppTradeAfterSalePageItemRespVO();
  39 + vo.setId(1L);
  40 + vo.setNo("1146347329394184195");
  41 + vo.setStatus(61);
  42 + vo.setWay(10);
  43 + vo.setType(10);
  44 + vo.setApplyReason("不想要了");
  45 + vo.setApplyDescription("这个商品我不喜欢，想退款");
  46 + vo.setApplyPicUrls(Arrays.asList("pic_url_1", "pic_url_2", "pic_url_3"));
  47 +
  48 + // 设置订单相关信息
  49 + vo.setOrderId(2001L);
  50 + vo.setOrderNo("23456789009876");
  51 + vo.setOrderItemId(3001L);
  52 + vo.setSpuId(4001L);
  53 + vo.setSpuName("商品名");
  54 + vo.setSkuId(5001L);
  55 + vo.setProperties(Arrays.asList(
  56 + new AppProductPropertyValueDetailRespVO().setPropertyId(6001L).setPropertyName("颜色").setValueId(7001L).setValueName("红色"),
  57 + new AppProductPropertyValueDetailRespVO().setPropertyId(6002L).setPropertyName("尺寸").setValueId(7002L).setValueName("XL")));
  58 + vo.setPicUrl("https://cdn.pixabay.com/photo/2022/12/06/06/21/lavender-7638368_1280.jpg");
  59 + vo.setCount(2);
  60 +
  61 + // 设置审批相关信息
  62 + vo.setAuditReason("审核通过");
  63 +
  64 + // 设置退款相关信息
  65 + vo.setRefundPrice(1000);
  66 + vo.setRefundTime(LocalDateTime.now());
  67 +
  68 + // 设置退货相关信息
  69 + vo.setLogisticsId(7001L);
  70 + vo.setLogisticsNo("LAGN101010101001");
  71 + vo.setDeliveryTime(LocalDateTime.now());
  72 + vo.setReceiveTime(LocalDateTime.now());
  73 + vo.setReceiveReason("收货正常");
  74 +
  75 + return success(new PageResult<>(Arrays.asList(vo), 1L));
  76 +// return success(afterSaleService.getAfterSalePage(getLoginUserId()));
  77 + }
  78 +
29 79 @PostMapping(value = "/create")
30 80 @Operation(summary = "申请售后")
31 81 public CommonResult<Long> createAfterSale(@RequestBody AppTradeAfterSaleCreateReqVO createReqVO) {
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSalePageItemRespVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.app.aftersale.vo;
  2 +
  3 +import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +
  7 +import java.time.LocalDateTime;
  8 +import java.util.List;
  9 +
  10 +@Schema(description = "用户 App - 交易售后的分页项 Request VO")
  11 +@Data
  12 +public class AppTradeAfterSalePageItemRespVO {
  13 +
  14 + @Schema(description = "售后编号", required = true, example = "1024")
  15 + private Long id;
  16 +
  17 + @Schema(description = "售后流水号", required = true, example = "1146347329394184195")
  18 + private String no;
  19 +
  20 + @Schema(description = "售后状态", required = true, example = "1")
  21 + private Integer status;
  22 +
  23 + @Schema(description = "售后方式", required = true, example = "1")
  24 + private Integer way;
  25 +
  26 + @Schema(description = "售后类型", required = true, example = "1")
  27 + private Integer type;
  28 +
  29 + @Schema(description = "申请原因", required = true, example = "1")
  30 + private String applyReason;
  31 +
  32 + @Schema(description = "补充描述", required = true, example = "1")
  33 + private String applyDescription;
  34 +
  35 + @Schema(description = "补充凭证图片", required = true, example = "1")
  36 + private List<String> applyPicUrls;
  37 +
  38 + // ========== 交易订单相关 ==========
  39 +
  40 + @Schema(description = "交易订单编号", required = true, example = "1")
  41 + private Long orderId;
  42 +
  43 + @Schema(description = "交易订单流水号", required = true, example = "1")
  44 + private String orderNo;
  45 +
  46 + @Schema(description = "交易订单项编号", required = true, example = "1")
  47 + private Long orderItemId;
  48 +
  49 + @Schema(description = "商品 SPU 编号", required = true, example = "1")
  50 + private Long spuId;
  51 +
  52 + @Schema(description = "商品 SPU 名称", required = true, example = "1")
  53 + private String spuName;
  54 +
  55 + @Schema(description = "商品 SKU 编号", required = true, example = "1")
  56 + private Long skuId;
  57 +
  58 + /**
  59 + * 属性数组
  60 + */
  61 + private List<AppProductPropertyValueDetailRespVO> properties;
  62 +
  63 + @Schema(description = "商品图片", required = true, example = "https://www.iocoder.cn/01.jpg")
  64 + private String picUrl;
  65 +
  66 + @Schema(description = "退货商品数量", required = true, example = "1")
  67 + private Integer count;
  68 +
  69 + // ========== 审批相关 ==========
  70 +
  71 + /**
  72 + * 审批备注
  73 + *
  74 + * 注意，只有审批不通过才会填写
  75 + */
  76 + private String auditReason;
  77 +
  78 + // ========== 退款相关 ==========
  79 +
  80 + @Schema(description = "退款金额，单位：分", example = "100")
  81 + private Integer refundPrice;
  82 +
  83 + @Schema(description = "退款时间")
  84 + private LocalDateTime refundTime;
  85 +
  86 + // ========== 退货相关 ==========
  87 +
  88 + @Schema(description = "退货物流公司编号", example = "1")
  89 + private Long logisticsId;
  90 +
  91 + @Schema(description = "退货物流单号", example = "SF123456789")
  92 + private String logisticsNo;
  93 +
  94 + @Schema(description = "退货时间")
  95 + private LocalDateTime deliveryTime;
  96 +
  97 + @Schema(description = "收货时间")
  98 + private LocalDateTime receiveTime;
  99 +
  100 + @Schema(description = "收货备注")
  101 + private String receiveReason;
  102 +
  103 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
  View file @d08b953
1   -### /trade-order/confirm-create-order-info 基于商品，确认创建订单
2   -GET {{appApi}}/trade/order/get-create-info?items[0].skuId=1&items[0].count=1
3   -Authorization: Bearer {{user-access-token}}
  1 +### /trade-order/settlement 获得订单结算信息
  2 +GET {{appApi}}/trade/order/settlement?cartIds=1
  3 +Authorization: Bearer {{appToken}}
4 4 tenant-id: {{appTenentId}}
5 5  
6 6 ### /trade-order/confirm-create-order-info-from-cart 基于购物车，确认创建订单
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
  View file @d08b953
... ... @@ -2,15 +2,18 @@ package cn.iocoder.yudao.module.trade.controller.app.order;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
6 5 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
7 6 import cn.iocoder.yudao.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
8 7 import cn.iocoder.yudao.module.product.api.property.ProductPropertyValueApi;
9 8 import cn.iocoder.yudao.module.product.api.property.dto.ProductPropertyValueDetailRespDTO;
  9 +import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
10 10 import cn.iocoder.yudao.module.trade.controller.app.order.vo.*;
  11 +import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
11 12 import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
12 13 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
13 14 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
  15 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
  16 +import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
14 17 import cn.iocoder.yudao.module.trade.service.order.TradeOrderService;
15 18 import io.swagger.v3.oas.annotations.Operation;
16 19 import io.swagger.v3.oas.annotations.Parameter;
... ... @@ -21,7 +24,11 @@ import org.springframework.web.bind.annotation.*;
21 24  
22 25 import javax.annotation.Resource;
23 26 import javax.servlet.http.HttpServletRequest;
  27 +import javax.validation.Valid;
  28 +import java.util.ArrayList;
  29 +import java.util.HashMap;
24 30 import java.util.List;
  31 +import java.util.Map;
25 32  
26 33 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
27 34 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
... ... @@ -40,12 +47,81 @@ public class AppTradeOrderController {
40 47 @Resource
41 48 private ProductPropertyValueApi productPropertyValueApi;
42 49  
43   - @GetMapping("/get-create-info")
44   - @Operation(summary = "基于商品，确认创建订单")
  50 + @Resource
  51 + private TradeOrderProperties tradeOrderProperties;
  52 +
  53 + @GetMapping("/settlement")
  54 + @Operation(summary = "获得订单结算信息")
45 55 @PreAuthenticated
46   - public CommonResult<AppTradeOrderGetCreateInfoRespVO> getOrderCreateInfo(AppTradeOrderCreateReqVO createReqVO) {
  56 + public CommonResult<AppTradeOrderSettlementRespVO> settlementOrder(
  57 + @Valid AppTradeOrderSettlementReqVO settlementReqVO) {
47 58 // return success(tradeOrderService.getOrderConfirmCreateInfo(UserSecurityContextHolder.getUserId(), skuId, quantity, couponCardId));
48   - return null;
  59 + AppTradeOrderSettlementRespVO settlement = new AppTradeOrderSettlementRespVO();
  60 +
  61 + AppTradeOrderSettlementRespVO.Price price = new AppTradeOrderSettlementRespVO.Price();
  62 + price.setTotalPrice(1000);
  63 + price.setDeliveryPrice(200);
  64 + price.setCouponPrice(100);
  65 + price.setPointPrice(50);
  66 + price.setPayPrice(950);
  67 +
  68 + List<AppTradeOrderSettlementRespVO.Item> skus = new ArrayList<>();
  69 +
  70 + AppTradeOrderSettlementRespVO.Item item1 = new AppTradeOrderSettlementRespVO.Item();
  71 + item1.setCartId(1L);
  72 + item1.setSpuId(2048L);
  73 + item1.setSpuName("Apple iPhone 12");
  74 + item1.setSkuId(1024);
  75 + item1.setPrice(500);
  76 + item1.setPicUrl("https://pro.crmeb.net/uploads/attach/2022/10/12/0c56f9abb80d2775fc1e80dbe4f8826a.jpg");
  77 + item1.setCount(2);
  78 + List<AppProductPropertyValueDetailRespVO> properties1 = new ArrayList<>();
  79 + AppProductPropertyValueDetailRespVO property1 = new AppProductPropertyValueDetailRespVO();
  80 + property1.setPropertyId(1L);
  81 + property1.setPropertyName("尺寸");
  82 + property1.setValueId(2L);
  83 + property1.setValueName("大");
  84 + properties1.add(property1);
  85 + item1.setProperties(properties1);
  86 +
  87 + AppTradeOrderSettlementRespVO.Item item2 = new AppTradeOrderSettlementRespVO.Item();
  88 + item2.setCartId(2L);
  89 + item2.setSpuId(3072L);
  90 + item2.setSpuName("Samsung Galaxy S21");
  91 + item2.setSkuId(2048);
  92 + item2.setPrice(800);
  93 + item2.setPicUrl("https://pro.crmeb.net/uploads/attach/2022/10/12/0c56f9abb80d2775fc1e80dbe4f8826a.jpg");
  94 + item2.setCount(1);
  95 + List<AppProductPropertyValueDetailRespVO> properties2 = new ArrayList<>();
  96 + AppProductPropertyValueDetailRespVO property2 = new AppProductPropertyValueDetailRespVO();
  97 + property2.setPropertyId(10L);
  98 + property2.setPropertyName("颜色");
  99 + property2.setValueId(20L);
  100 + property2.setValueName("白色");
  101 + properties2.add(property2);
  102 + item2.setProperties(properties2);
  103 +
  104 + skus.add(item1);
  105 + skus.add(item2);
  106 +
  107 + settlement.setItems(skus);
  108 + settlement.setPrice(price);
  109 +
  110 + AppTradeOrderSettlementRespVO.Address address = new AppTradeOrderSettlementRespVO.Address();
  111 + address.setId(1L);
  112 + address.setName("John");
  113 + address.setMobile("18888888888");
  114 + address.setProvinceId(1L);
  115 + address.setProvinceName("Beijing");
  116 + address.setCityId(1L);
  117 + address.setCityName("Beijing");
  118 + address.setDistrictId(1L);
  119 + address.setDistrictName("Chaoyang Distripct");
  120 + address.setDetailAddress("No. 10, Xinzhong Street, Chaoyang District");
  121 + address.setDefaulted(true);
  122 + settlement.setAddress(address);
  123 +
  124 + return success(settlement);
49 125 }
50 126  
51 127 @PostMapping("/create")
... ... @@ -53,12 +129,13 @@ public class AppTradeOrderController {
53 129 @PreAuthenticated
54 130 public CommonResult<Long> createOrder(@RequestBody AppTradeOrderCreateReqVO createReqVO,
55 131 HttpServletRequest servletRequest) {
56   - // 获取登录用户、用户 IP 地址
57   - Long loginUserId = getLoginUserId();
58   - String clientIp = ServletUtils.getClientIP(servletRequest);
59   - // 创建交易订单，预支付记录
60   - Long orderId = tradeOrderService.createOrder(loginUserId, clientIp, createReqVO);
61   - return success(orderId);
  132 + return success(1L);
  133 +// // 获取登录用户、用户 IP 地址
  134 +// Long loginUserId = getLoginUserId();
  135 +// String clientIp = ServletUtils.getClientIP(servletRequest);
  136 +// // 创建交易订单，预支付记录
  137 +// Long orderId = tradeOrderService.createOrder(loginUserId, clientIp, createReqVO);
  138 +// return success(orderId);
62 139 }
63 140  
64 141 @PostMapping("/update-paid")
... ... @@ -81,11 +158,12 @@ public class AppTradeOrderController {
81 158 List<ProductPropertyValueDetailRespDTO> propertyValueDetails = productPropertyValueApi
82 159 .getPropertyValueDetailList(TradeOrderConvert.INSTANCE.convertPropertyValueIds(orderItems));
83 160 // 最终组合
84   - return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems, propertyValueDetails));
  161 + return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems,
  162 + propertyValueDetails, tradeOrderProperties));
85 163 }
86 164  
87 165 @GetMapping("/page")
88   - @Operation(summary = "获得订单交易分页")
  166 + @Operation(summary = "获得交易订单分页")
89 167 public CommonResult<PageResult<AppTradeOrderPageItemRespVO>> getOrderPage(AppTradeOrderPageReqVO reqVO) {
90 168 // 查询订单
91 169 PageResult<TradeOrderDO> pageResult = tradeOrderService.getOrderPage(getLoginUserId(), reqVO);
... ... @@ -99,4 +177,38 @@ public class AppTradeOrderController {
99 177 return success(TradeOrderConvert.INSTANCE.convertPage02(pageResult, orderItems, propertyValueDetails));
100 178 }
101 179  
  180 + @GetMapping("/get-count")
  181 + @Operation(summary = "获得交易订单数量")
  182 + public CommonResult<Map<String, Long>> getOrderCount() {
  183 + Map<String, Long> orderCount = new HashMap<>();
  184 + // 全部
  185 + orderCount.put("allCount", tradeOrderService.getOrderCount(getLoginUserId(), null, null));
  186 + // 待付款（未支付）
  187 + orderCount.put("unpaidCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.UNPAID.getStatus(), null));
  188 + // 待发货
  189 + orderCount.put("undeliveredCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.UNDELIVERED.getStatus(), null));
  190 + // 待收货
  191 + orderCount.put("deliveredCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.DELIVERED.getStatus(), null));
  192 + // 待评价
  193 + orderCount.put("uncommentedCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.COMPLETED.getStatus(), false));
  194 + return success(orderCount);
  195 + }
  196 +
  197 + // ========== 订单项 ==========
  198 +
  199 + @GetMapping("/item/get")
  200 + @Operation(summary = "获得交易订单项")
  201 + @Parameter(name = "id", description = "交易订单项编号")
  202 + public CommonResult<AppTradeOrderItemRespVO> getOrderItem(@RequestParam("id") Long id) {
  203 + TradeOrderItemDO item = tradeOrderService.getOrderItem(getLoginUserId(), id);
  204 + return success(TradeOrderConvert.INSTANCE.convert03(item));
  205 + }
  206 +
  207 + // TODO 芋艿：待实现
  208 + @PostMapping("/item/create-comment")
  209 + @Operation(summary = "创建交易订单项的评价")
  210 + public CommonResult<Long> createOrderItemComment() {
  211 + return success(0L);
  212 + }
  213 +
102 214 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
  View file @d08b953
... ... @@ -3,8 +3,6 @@ package cn.iocoder.yudao.module.trade.controller.app.order.vo;
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6   -import javax.validation.Valid;
7   -import javax.validation.constraints.Min;
8 6 import javax.validation.constraints.NotEmpty;
9 7 import javax.validation.constraints.NotNull;
10 8 import java.util.List;
... ... @@ -20,33 +18,13 @@ public class AppTradeOrderCreateReqVO {
20 18 @Schema(description = "优惠劵编号", example = "1024")
21 19 private Long couponId;
22 20  
23   - @Schema(description = "备注", example = "这个是我的订单哟")
24   - private String remark;
25   -
26   - @Schema(description = "是否来自购物车", required = true, example = "true") // true - 来自购物车；false - 立即购买
27   - @NotNull(message = "是否来自购物车不能为空")
28   - private Boolean fromCart;
29   -
30   - /**
31   - * 订单商品项列表
32   - */
33   - @NotEmpty(message = "必须选择购买的商品")
34   - @Valid
35   - private List<Item> items;
  21 + @Schema(description = "购物车项的编号数组", required = true, example = "true")
  22 + @NotEmpty(message = "购物车项不能为空")
  23 + private List<Long> cartIds;
36 24  
37   - @Schema(description = "订单商品项")
38   - @Data
39   - public static class Item {
  25 + // ========== 非 AppTradeOrderSettlementReqVO 字段 ==========
40 26  
41   - @Schema(description = "商品 SKU 编号", required = true, example = "111")
42   - @NotNull(message = "商品 SKU 编号不能为空")
43   - private Long skuId;
44   -
45   - @Schema(description = "商品 SKU 购买数量", required = true, example = "1024")
46   - @NotNull(message = "商品 SKU 购买数量不能为空")
47   - @Min(value = 1, message = "商品 SKU 购买数量必须大于 0")
48   - private Integer count;
49   -
50   - }
  27 + @Schema(description = "备注", example = "这个是我的订单哟")
  28 + private String remark;
51 29  
52 30 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.trade.controller.app.order.vo;
2 2  
3   -import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
  3 +import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6  
... ... @@ -38,14 +38,26 @@ public class AppTradeOrderDetailRespVO {
38 38 @Schema(description = "订单取消时间")
39 39 private LocalDateTime cancelTime;
40 40  
  41 + @Schema(description = "是否评价", required = true, example = "true")
  42 + private Boolean commentStatus;
  43 +
41 44 // ========== 价格 + 支付基本信息 ==========
42 45  
  46 + @Schema(description = "是否已支付", required = true, example = "true")
  47 + private Boolean payed;
  48 +
43 49 @Schema(description = "支付订单编号", required = true, example = "1024")
44 50 private Long payOrderId;
45 51  
46 52 @Schema(description = "付款时间")
47 53 private LocalDateTime payTime;
48 54  
  55 + @Schema(description = "付款超时时间", required = true)
  56 + private LocalDateTime payExpireTime;
  57 +
  58 + @Schema(description = "支付渠道", required = true, example = "wx_lite_pay")
  59 + private String payChannelCode;
  60 +
49 61 @Schema(description = "商品原价（总）", required = true, example = "1000")
50 62 private Integer originalPrice;
51 63  
... ... @@ -66,6 +78,9 @@ public class AppTradeOrderDetailRespVO {
66 78  
67 79 // ========== 收件 + 物流基本信息 ==========
68 80  
  81 + @Schema(description = "配送方式", required = true, example = "1")
  82 + private Integer deliveryType;
  83 +
69 84 @Schema(description = "发货物流单号", example = "1024")
70 85 private String logisticsNo;
71 86  
... ... @@ -87,9 +102,6 @@ public class AppTradeOrderDetailRespVO {
87 102 @Schema(description = "收件人地区名字", required = true, example = "上海 上海市 普陀区")
88 103 private String receiverAreaName;
89 104  
90   - @Schema(description = "收件人邮编", required = true, example = "100000")
91   - private Integer receiverPostCode;
92   -
93 105 @Schema(description = "收件人详细地址", required = true, example = "中关村大街 1 号")
94 106 private String receiverDetailAddress;
95 107  
... ... @@ -109,41 +121,6 @@ public class AppTradeOrderDetailRespVO {
109 121 /**
110 122 * 订单项数组
111 123 */
112   - private List<Item> items;
113   -
114   - @Schema(description = "用户 App - 交易订单的分页项的订单项目")
115   - @Data
116   - public static class Item {
117   -
118   - @Schema(description = "编号", required = true, example = "1")
119   - private Long id;
120   -
121   - @Schema(description = "商品 SPU 编号", required = true, example = "1")
122   - private Long spuId;
123   -
124   - @Schema(description = "商品 SPU 名称", required = true, example = "芋道源码")
125   - private String spuName;
126   -
127   - @Schema(description = "商品 SKU 编号", required = true, example = "1")
128   - private Long skuId;
129   -
130   - @Schema(description = "商品图片", required = true, example = "https://www.iocoder.cn/1.png")
131   - private String picUrl;
132   -
133   - @Schema(description = "购买数量", required = true, example = "1")
134   - private Integer count;
135   -
136   - @Schema(description = "商品原价（总）", required = true, example = "100")
137   - private Integer originalPrice;
138   -
139   - @Schema(description = "商品原价（单）", required = true, example = "100")
140   - private Integer originalUnitPrice;
141   -
142   - /**
143   - * 属性数组
144   - */
145   - private List<AppProductPropertyValueDetailRespVO> properties;
146   -
147   - }
  124 + private List<AppTradeOrderItemRespVO> items;
148 125  
149 126 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java deleted
View file @cac5545
1   -package cn.iocoder.yudao.module.trade.controller.app.order.vo;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.AllArgsConstructor;
5   -import lombok.Data;
6   -
7   -import java.util.List;
8   -
9   -@Schema(description = "用户 App - 订单获得创建信息 Response VO")
10   -@Data
11   -public class AppTradeOrderGetCreateInfoRespVO {
12   -
13   - /**
14   - * 商品分组数组
15   - */
16   - private List<ItemGroup> itemGroups;
17   - /**
18   - * 费用
19   - */
20   - private Fee fee;
21   -
22   -// /**
23   -// * 优惠劵列表 TODO 芋艿，后续改改
24   -// */
25   -// private List<CouponCardAvailableRespDTO> coupons;
26   -
27   - @Schema(description = "商品分组") // 多个商品，参加同一个活动，从而形成分组
28   - @Data
29   - public static class ItemGroup {
30   -
31   -// /**
32   -// * 优惠活动
33   -// */
34   -// private PromotionActivityRespDTO activity; // TODO 芋艿，偷懒
35   - /**
36   - * 商品 SKU 数组
37   - */
38   - private List<Sku> items;
39   -
40   - }
41   -
42   - @Schema(description = "商品 SKU")
43   - @Data
44   - public static class Sku {
45   -
46   - // SKU 自带信息
47   - @Schema(description = "SKU 编号", required = true, example = "1024")
48   - private Integer id;
49   - /**
50   - * SPU 信息
51   - */
52   - private Spu spu;
53   - /**
54   - * 图片地址
55   - */
56   - private String picURL;
57   -// /**
58   -// * 属性数组
59   -// */
60   -// private List<ProductAttrKeyValueRespVO> attrs; // TODO 后面改下
61   - /**
62   - * 价格，单位：分
63   - */
64   - private Integer price;
65   - /**
66   - * 库存数量
67   - */
68   - private Integer stock;
69   -
70   - // 非 SKU 自带信息
71   -
72   - /**
73   - * 购买数量
74   - */
75   - private Integer buyQuantity;
76   -// /**
77   -// * 优惠活动
78   -// */
79   -// private PromotionActivityRespDTO activity; // TODO 芋艿，偷懒
80   - /**
81   - * 原始单价，单位：分。
82   - */
83   - private Integer originPrice;
84   - /**
85   - * 购买单价，单位：分
86   - */
87   - private Integer buyPrice;
88   - /**
89   - * 最终价格，单位：分。
90   - */
91   - private Integer presentPrice;
92   - /**
93   - * 购买总金额，单位：分
94   - *
95   - * 用途类似 {@link #presentTotal}
96   - */
97   - private Integer buyTotal;
98   - /**
99   - * 优惠总金额，单位：分。
100   - */
101   - private Integer discountTotal;
102   - /**
103   - * 最终总金额，单位：分。
104   - *
105   - * 注意，presentPrice * quantity 不一定等于 presentTotal 。
106   - * 因为，存在无法整除的情况。
107   - * 举个例子，presentPrice = 8.33 ，quantity = 3 的情况，presentTotal 有可能是 24.99 ，也可能是 25 。
108   - * 所以，需要存储一个该字段。
109   - */
110   - private Integer presentTotal;
111   -
112   - }
113   -
114   - @Data
115   - public static class Spu {
116   -
117   - /**
118   - * SPU 编号
119   - */
120   - private Integer id;
121   -
122   - // ========== 基本信息 =========
123   - /**
124   - * SPU 名字
125   - */
126   - private String name;
127   - /**
128   - * 分类编号
129   - */
130   - private Integer cid;
131   - /**
132   - * 商品主图地址
133   - *
134   - * 数组，以逗号分隔
135   - *
136   - * 建议尺寸：800*800像素，你可以拖拽图片调整顺序，最多上传15张
137   - */
138   - private List<String> picUrls;
139   -
140   - }
141   -
142   - @Schema(description = "费用（合计）")
143   - @Data
144   - @AllArgsConstructor
145   - public static class Fee {
146   -
147   - @Schema(description = "购买总价", required = true, example = "1024")
148   - private Integer buyPrice;
149   - /**
150   - * 优惠总价
151   - *
152   - * 注意，满多少元包邮，不算在优惠中。
153   - */
154   - private Integer discountTotal;
155   - /**
156   - * 邮费
157   - */
158   - private Integer postageTotal;
159   - /**
160   - * 最终价格
161   - *
162   - * 计算公式 = 总价 - 优惠总价 + 邮费
163   - */
164   - private Integer presentTotal;
165   -
166   - }
167   -
168   -}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.trade.controller.app.order.vo;
2 2  
3   -import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
  3 +import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6  
  7 +import java.util.Date;
7 8 import java.util.List;
8 9  
9 10 @Schema(description = "用户 App - 订单交易的分页项 Response VO")
... ... @@ -16,50 +17,34 @@ public class AppTradeOrderPageItemRespVO {
16 17 @Schema(description = "订单流水号", required = true, example = "1146347329394184195")
17 18 private String no;
18 19  
  20 + @Schema(description = "订单类型", required = true, example = "0")
  21 + private Integer type;
  22 +
19 23 @Schema(description = "订单状态", required = true, example = "1")
20 24 private Integer status;
21 25  
22 26 @Schema(description = "购买的商品数量", required = true, example = "10")
23 27 private Integer productCount;
24 28  
25   - /**
26   - * 订单项数组
27   - */
28   - private List<Item> items;
29   -
30   - @Schema(description = "用户 App - 交易订单的明细的订单项目")
31   - @Data
32   - public static class Item {
33   -
34   - @Schema(description = "编号", required = true, example = "1")
35   - private Long id;
  29 + @Schema(description = "是否评价", required = true, example = "true")
  30 + private Boolean commentStatus;
36 31  
37   - @Schema(description = "商品 SPU 编号", required = true, example = "1")
38   - private Long spuId;
  32 + @Schema(description = "创建时间", required = true)
  33 + private Date createTime;
39 34  
40   - @Schema(description = "商品 SPU 名称", required = true, example = "芋道源码")
41   - private String spuName;
  35 + // ========== 价格 + 支付基本信息 ==========
42 36  
43   - @Schema(description = "商品 SKU 编号", required = true, example = "1")
44   - private Long skuId;
  37 + @Schema(description = "应付金额，单位：分", required = true, example = "1000")
  38 + private Integer payPrice;
45 39  
46   - @Schema(description = "商品图片", required = true, example = "https://www.iocoder.cn/1.png")
47   - private String picUrl;
  40 + // ========== 收件 + 物流基本信息 ==========
48 41  
49   - @Schema(description = "购买数量", required = true, example = "1")
50   - private Integer count;
  42 + @Schema(description = "配送方式", required = true, example = "1")
  43 + private Integer deliveryType;
51 44  
52   - @Schema(description = "商品原价（总）", required = true, example = "100")
53   - private Integer originalPrice;
54   -
55   - @Schema(description = "商品原价（单）", required = true, example = "100")
56   - private Integer originalUnitPrice;
57   -
58   - /**
59   - * 属性数组
60   - */
61   - private List<AppProductPropertyValueDetailRespVO> properties;
62   -
63   - }
  45 + /**
  46 + * 订单项数组
  47 + */
  48 + private List<AppTradeOrderItemRespVO> items;
64 49  
65 50 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java
  View file @d08b953
... ... @@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
6 6 import io.swagger.v3.oas.annotations.media.Schema;
7 7 import lombok.Data;
8 8  
9   -// TODO 芋艿：字段优化
10 9 @Schema(description = "交易订单分页 Request VO")
11 10 @Data
12 11 public class AppTradeOrderPageReqVO extends PageParam {
... ... @@ -15,4 +14,7 @@ public class AppTradeOrderPageReqVO extends PageParam {
15 14 @InEnum(value = TradeOrderStatusEnum.class, message = "订单状态必须是 {value}")
16 15 private Integer status;
17 16  
  17 + @Schema(description = "是否评价", example = "true")
  18 + private Boolean commentStatus;
  19 +
18 20 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.app.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotEmpty;
  7 +import java.util.List;
  8 +
  9 +@Schema(description = "用户 App - 交易订单结算 Request VO")
  10 +@Data
  11 +public class AppTradeOrderSettlementReqVO {
  12 +
  13 + @Schema(description = "收件地址编号", example = "1")
  14 + private Long addressId;
  15 +
  16 + @Schema(description = "优惠劵编号", example = "1024")
  17 + private Long couponId;
  18 +
  19 + @Schema(description = "购物车项的编号数组", required = true, example = "true")
  20 + @NotEmpty(message = "购物车项不能为空")
  21 + private List<Long> cartIds;
  22 +
  23 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.app.order.vo;
  2 +
  3 +import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.AllArgsConstructor;
  6 +import lombok.Data;
  7 +import lombok.NoArgsConstructor;
  8 +
  9 +import java.util.List;
  10 +
  11 +@Schema(description = "用户 App - 交易订单结算信息 Response VO")
  12 +@Data
  13 +public class AppTradeOrderSettlementRespVO {
  14 +
  15 + @Schema(description = "购物项数组", required = true)
  16 + private List<Item> items;
  17 +
  18 + @Schema(description = "费用", required = true)
  19 + private Price price;
  20 +
  21 + @Schema(description = "收件地址", required = true)
  22 + private Address address;
  23 +
  24 + @Schema(description = "购物项")
  25 + @Data
  26 + public static class Item {
  27 +
  28 + // ========== SPU 信息 ==========
  29 +
  30 + @Schema(description = "SPU 编号", required = true, example = "2048")
  31 + private Long spuId;
  32 + @Schema(description = "SPU 名字", required = true, example = "Apple iPhone 12")
  33 + private String spuName;
  34 +
  35 + // ========== SKU 信息 ==========
  36 +
  37 + @Schema(description = "SKU 编号", required = true, example = "1024")
  38 + private Integer skuId;
  39 + @Schema(description = "价格，单位：分", required = true, example = "100")
  40 + private Integer price;
  41 + @Schema(description = "图片地址", required = true, example = "https://www.iocoder.cn/1.png")
  42 + private String picUrl;
  43 +
  44 + @Schema(description = "属性数组", required = true, example = "100")
  45 + private List<AppProductPropertyValueDetailRespVO> properties;
  46 +
  47 + // ========== 购物车信息 ==========
  48 +
  49 + @Schema(description = "购物车编号", required = true, example = "100")
  50 + private Long cartId;
  51 +
  52 + @Schema(description = "购买数量", required = true, example = "1")
  53 + private Integer count;
  54 +
  55 + }
  56 +
  57 + @Schema(description = "费用（合计）")
  58 + @Data
  59 + @NoArgsConstructor
  60 + @AllArgsConstructor
  61 + public static class Price {
  62 +
  63 + @Schema(description = "商品原价（总），单位：分", required = true, example = "500")
  64 + private Integer totalPrice;
  65 +
  66 + @Schema(description = "运费金额，单位：分", required = true, example = "50")
  67 + private Integer deliveryPrice;
  68 +
  69 + @Schema(description = "优惠劵减免金额，单位：分", required = true, example = "100")
  70 + private Integer couponPrice;
  71 +
  72 + @Schema(description = "积分抵扣的金额，单位：分", required = true, example = "50")
  73 + private Integer pointPrice;
  74 +
  75 + @Schema(description = "实际支付金额（总），单位：分", required = true, example = "450")
  76 + private Integer payPrice;
  77 +
  78 + }
  79 +
  80 + @Schema(description = "费用（合计）")
  81 + @Data
  82 + public static class Address {
  83 +
  84 + @Schema(description = "编号", required = true, example = "1")
  85 + private Long id;
  86 +
  87 + @Schema(description = "收件人名称", required = true, example = "小王")
  88 + private String name;
  89 +
  90 + @Schema(description = "手机号", required = true, example = "15601691300")
  91 + private String mobile;
  92 +
  93 + @Schema(description = "省份编号", required = true, example = "1")
  94 + private Long provinceId;
  95 + @Schema(description = "省份名字", required = true, example = "北京")
  96 + private String provinceName;
  97 +
  98 + @Schema(description = "城市编号", required = true, example = "1")
  99 + private Long cityId;
  100 + @Schema(description = "城市名字", required = true, example = "北京")
  101 + private String cityName;
  102 +
  103 + @Schema(description = "地区编号", required = true, example = "1")
  104 + private Long districtId;
  105 + @Schema(description = "地区名字", required = true, example = "朝阳区")
  106 + private String districtName;
  107 +
  108 + @Schema(description = "详细地址", required = true, example = "望京悠乐汇 A 座")
  109 + private String detailAddress;
  110 +
  111 + @Schema(description = "是否默认收件地址", required = true, example = "true")
  112 + private Boolean defaulted;
  113 +
  114 + }
  115 +
  116 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.controller.app.order.vo.item;
  2 +
  3 +import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +
  7 +import java.util.List;
  8 +
  9 +@Schema(description = "用户 App - 订单交易项 Response VO")
  10 +@Data
  11 +public class AppTradeOrderItemRespVO {
  12 +
  13 + @Schema(description = "编号", required = true, example = "1")
  14 + private Long id;
  15 +
  16 + @Schema(description = "商品 SPU 编号", required = true, example = "1")
  17 + private Long spuId;
  18 + @Schema(description = "商品 SPU 名称", required = true, example = "芋道源码")
  19 + private String spuName;
  20 +
  21 + @Schema(description = "商品 SKU 编号", required = true, example = "1")
  22 + private Long skuId;
  23 +
  24 + /**
  25 + * 属性数组
  26 + */
  27 + private List<AppProductPropertyValueDetailRespVO> properties;
  28 +
  29 + @Schema(description = "商品图片", required = true, example = "https://www.iocoder.cn/1.png")
  30 + private String picUrl;
  31 +
  32 + @Schema(description = "购买数量", required = true, example = "1")
  33 + private Integer count;
  34 +
  35 + @Schema(description = "是否评价", required = true, example = "true")
  36 + private Boolean commentStatus;
  37 +
  38 + // ========== 价格 + 支付基本信息 ==========
  39 +
  40 + @Schema(description = "商品原价（单）", required = true, example = "100")
  41 + private Integer price;
  42 +
  43 + // ========== 营销基本信息 ==========
  44 +
  45 + // TODO 芋艿：在捉摸一下
  46 +
  47 + // ========== 售后基本信息 ==========
  48 +
  49 + @Schema(description = "售后状态", required = true, example = "1")
  50 + private Integer afterSaleStatus;
  51 +
  52 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.convert.delivery;
  2 +
  3 +import java.util.*;
  4 +
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +
  7 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressCreateReqVO;
  8 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressExcelVO;
  9 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressRespVO;
  10 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressUpdateReqVO;
  11 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
  12 +import org.mapstruct.Mapper;
  13 +import org.mapstruct.factory.Mappers;
  14 +
  15 +
  16 +/**
  17 + * 快递公司 Convert
  18 + *
  19 + * @author 芋道源码
  20 + */
  21 +@Mapper
  22 +public interface DeliveryExpressConvert {
  23 +
  24 + DeliveryExpressConvert INSTANCE = Mappers.getMapper(DeliveryExpressConvert.class);
  25 +
  26 + DeliveryExpressDO convert(DeliveryExpressCreateReqVO bean);
  27 +
  28 + DeliveryExpressDO convert(DeliveryExpressUpdateReqVO bean);
  29 +
  30 + DeliveryExpressRespVO convert(DeliveryExpressDO bean);
  31 +
  32 + List<DeliveryExpressRespVO> convertList(List<DeliveryExpressDO> list);
  33 +
  34 + PageResult<DeliveryExpressRespVO> convertPage(PageResult<DeliveryExpressDO> page);
  35 +
  36 + List<DeliveryExpressExcelVO> convertList02(List<DeliveryExpressDO> list);
  37 +
  38 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.convert.delivery;
  2 +
  3 +import java.util.*;
  4 +
  5 +import cn.hutool.core.collection.CollUtil;
  6 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  7 +
  8 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.*;
  9 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateChargeDO;
  10 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
  11 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateFreeDO;
  12 +import org.mapstruct.Mapper;
  13 +import org.mapstruct.factory.Mappers;
  14 +
  15 +/**
  16 + * 快递运费模板 Convert
  17 + *
  18 + * @author 芋道源码
  19 + */
  20 +@Mapper
  21 +public interface DeliveryExpressTemplateConvert {
  22 +
  23 + DeliveryExpressTemplateConvert INSTANCE = Mappers.getMapper(DeliveryExpressTemplateConvert.class);
  24 +
  25 + DeliveryExpressTemplateDO convert(DeliveryExpressTemplateCreateReqVO bean);
  26 +
  27 + DeliveryExpressTemplateDO convert(DeliveryExpressTemplateUpdateReqVO bean);
  28 +
  29 + DeliveryExpressTemplateSimpleRespVO convert(DeliveryExpressTemplateDO bean);
  30 +
  31 + DeliveryExpressTemplateRespVO convert2(DeliveryExpressTemplateDO bean);
  32 +
  33 + List<DeliveryExpressTemplateSimpleRespVO> convertList(List<DeliveryExpressTemplateDO> list);
  34 +
  35 + PageResult<DeliveryExpressTemplateSimpleRespVO> convertPage(PageResult<DeliveryExpressTemplateDO> page);
  36 +
  37 + List<DeliveryExpressTemplateExcelVO> convertList02(List<DeliveryExpressTemplateDO> list);
  38 +
  39 + DeliveryExpressTemplateChargeDO convertTemplateCharge(Long templateId, Integer chargeMode, ExpressTemplateChargeBaseVO vo);
  40 +
  41 + DeliveryExpressTemplateChargeDO convertTemplateCharge(ExpressTemplateChargeUpdateVO vo);
  42 +
  43 + DeliveryExpressTemplateFreeDO convertTemplateFree(Long templateId, ExpressTemplateFreeBaseVO vo);
  44 +
  45 + DeliveryExpressTemplateFreeDO convertTemplateFree(ExpressTemplateFreeUpdateVO vo);
  46 +
  47 + List<ExpressTemplateChargeBaseVO> convertTemplateChargeList(List<DeliveryExpressTemplateChargeDO> list);
  48 +
  49 + List<ExpressTemplateFreeBaseVO> convertTemplateFreeList(List<DeliveryExpressTemplateFreeDO> list);
  50 +
  51 + default List<DeliveryExpressTemplateChargeDO> convertTemplateChargeList(Long templateId, Integer chargeMode, List<ExpressTemplateChargeBaseVO> list){
  52 + if(CollUtil.isEmpty(list)){
  53 + return Collections.emptyList();
  54 + }
  55 + List<DeliveryExpressTemplateChargeDO> templateChargeList = new ArrayList<>( list.size() );
  56 + for (ExpressTemplateChargeBaseVO item : list) {
  57 + templateChargeList.add(convertTemplateCharge(templateId, chargeMode, item));
  58 + }
  59 + return templateChargeList;
  60 + }
  61 +
  62 +
  63 +
  64 + default List<DeliveryExpressTemplateFreeDO> convertTemplateFreeList(Long templateId, List<ExpressTemplateFreeBaseVO> list) {
  65 + if (CollUtil.isEmpty(list)) {
  66 + return Collections.emptyList();
  67 + }
  68 + List<DeliveryExpressTemplateFreeDO> templateFreeList = new ArrayList<>(list.size());
  69 + for (ExpressTemplateFreeBaseVO item : list) {
  70 + templateFreeList.add(convertTemplateFree(templateId, item));
  71 + }
  72 + return templateFreeList;
  73 + }
  74 +
  75 + default DeliveryExpressTemplateRespVO convert(DeliveryExpressTemplateDO bean,
  76 + List<DeliveryExpressTemplateChargeDO> chargeList,
  77 + List<DeliveryExpressTemplateFreeDO> freeList){
  78 + DeliveryExpressTemplateRespVO respVO = convert2(bean);
  79 + respVO.setTemplateCharge(convertTemplateChargeList(chargeList));
  80 + respVO.setTemplateFree(convertTemplateFreeList(freeList));
  81 + return respVO;
  82 + }
  83 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @d08b953
... ... @@ -21,6 +21,7 @@ import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductProp
21 21 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
22 22 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderDetailRespVO;
23 23 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderPageItemRespVO;
  24 +import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
24 25 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
25 26 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
26 27 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
... ... @@ -50,7 +51,6 @@ public interface TradeOrderConvert {
50 51 @Mapping(source = "address.name", target = "receiverName"),
51 52 @Mapping(source = "address.mobile", target = "receiverMobile"),
52 53 @Mapping(source = "address.areaId", target = "receiverAreaId"),
53   - @Mapping(source = "address.postCode", target = "receiverPostCode"),
54 54 @Mapping(source = "address.detailAddress", target = "receiverDetailAddress"),
55 55 })
56 56 TradeOrderDO convert(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO,
... ... @@ -192,7 +192,7 @@ public interface TradeOrderConvert {
192 192 if (CollUtil.isEmpty(properties)) {
193 193 continue;
194 194 }
195   - AppTradeOrderPageItemRespVO.Item item = orderVO.getItems().get(i);
  195 + AppTradeOrderItemRespVO item = orderVO.getItems().get(i);
196 196 item.setProperties(new ArrayList<>(properties.size()));
197 197 // 遍历每个 properties，设置到 TradeOrderPageItemRespVO.Item 中
198 198 properties.forEach(property -> {
... ... @@ -212,8 +212,9 @@ public interface TradeOrderConvert {
212 212 AppProductPropertyValueDetailRespVO convert02(ProductPropertyValueDetailRespDTO bean);
213 213  
214 214 default AppTradeOrderDetailRespVO convert02(TradeOrderDO order, List<TradeOrderItemDO> orderItems,
215   - List<ProductPropertyValueDetailRespDTO> propertyValueDetails) {
  215 + List<ProductPropertyValueDetailRespDTO> propertyValueDetails, TradeOrderProperties tradeOrderProperties) {
216 216 AppTradeOrderDetailRespVO orderVO = convert3(order, orderItems);
  217 + orderVO.setPayExpireTime(addTime(tradeOrderProperties.getExpireTime()));
217 218 // 处理商品属性
218 219 Map<Long, ProductPropertyValueDetailRespDTO> propertyValueDetailMap = convertMap(propertyValueDetails, ProductPropertyValueDetailRespDTO::getValueId);
219 220 for (int i = 0; i < orderItems.size(); i++) {
... ... @@ -221,7 +222,7 @@ public interface TradeOrderConvert {
221 222 if (CollUtil.isEmpty(properties)) {
222 223 continue;
223 224 }
224   - AppTradeOrderDetailRespVO.Item item = orderVO.getItems().get(i);
  225 + AppTradeOrderItemRespVO item = orderVO.getItems().get(i);
225 226 item.setProperties(new ArrayList<>(properties.size()));
226 227 // 遍历每个 properties，设置到 TradeOrderPageItemRespVO.Item 中
227 228 properties.forEach(property -> {
... ... @@ -238,4 +239,6 @@ public interface TradeOrderConvert {
238 239 }
239 240 AppTradeOrderDetailRespVO convert3(TradeOrderDO order, List<TradeOrderItemDO> items);
240 241  
  242 + AppTradeOrderItemRespVO convert03(TradeOrderItemDO bean);
  243 +
241 244 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.dataobject.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.Data;
  9 +
  10 +/**
  11 + * 快递公司 DO
  12 + *
  13 + * @author jason
  14 + */
  15 +@TableName(value ="trade_delivery_express")
  16 +@KeySequence("trade_delivery_express_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  17 +@Data
  18 +public class DeliveryExpressDO extends BaseDO {
  19 +
  20 + /**
  21 + * 编号，自增
  22 + */
  23 + @TableId
  24 + private Long id;
  25 +
  26 + /**
  27 + * 快递公司 code
  28 + */
  29 + private String code;
  30 +
  31 + /**
  32 + * 快递公司名称
  33 + */
  34 + private String name;
  35 +
  36 + /**
  37 + * 快递公司 logo
  38 + */
  39 + private String logo;
  40 +
  41 + /**
  42 + * 排序
  43 + */
  44 + private Integer sort;
  45 +
  46 + /**
  47 + * 状态
  48 + *
  49 + * 枚举 {@link CommonStatusEnum}
  50 + */
  51 + private Integer status;
  52 +
  53 + // TODO 芋艿：c 和结算相关的字段，后续在看
  54 + // partnerId 是否需要月结账号
  55 + // partnerKey 是否需要月结密码
  56 + // net 是否需要取件网店
  57 + // account 账号
  58 + // password 网点名称
  59 + // isShow 是否显示
  60 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateChargeDO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.dataobject.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import com.baomidou.mybatisplus.annotation.KeySequence;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import lombok.Data;
  8 +
  9 +/**
  10 + * 快递运费模板计费配置 DO
  11 + *
  12 + * @author jason
  13 + */
  14 +@TableName(value ="trade_delivery_express_template_charge")
  15 +@KeySequence("trade_delivery_express_template_charge_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  16 +@Data
  17 +public class DeliveryExpressTemplateChargeDO extends BaseDO {
  18 +
  19 + /**
  20 + * 编号，自增
  21 + */
  22 + @TableId
  23 + private Long id;
  24 +
  25 + /**
  26 + * 配送模板编号
  27 + *
  28 + * 关联 {@link DeliveryExpressTemplateDO#getId()}
  29 + */
  30 + private Long templateId;
  31 +
  32 + /**
  33 + * 配送区域
  34 + */
  35 + private Integer areaId;
  36 +
  37 + /**
  38 + * 配送计费方式
  39 + *
  40 + * 冗余 {@link DeliveryExpressTemplateDO#getChargeMode()}
  41 + */
  42 + private Integer chargeMode;
  43 +
  44 + /**
  45 + * 首件数量(件数,重量，或体积)
  46 + */
  47 + private Double startCount;
  48 + /**
  49 + * 起步价，单位：分
  50 + */
  51 + private Integer startPrice;
  52 +
  53 + /**
  54 + * 续件数量(件, 重量，或体积)
  55 + */
  56 + private Double extraCount;
  57 + /**
  58 + * 额外价，单位：分
  59 + */
  60 + private Integer extraPrice;
  61 +
  62 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateDO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.dataobject.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryExpressChargeModeEnum;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.*;
  9 +
  10 +/**
  11 + * 快递运费模板 DO
  12 + *
  13 + * @author jason
  14 + */
  15 +@TableName("trade_delivery_express_template")
  16 +@KeySequence("trade_delivery_express_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  17 +@Data
  18 +public class DeliveryExpressTemplateDO extends BaseDO {
  19 +
  20 + /**
  21 + * 编号，自增
  22 + */
  23 + @TableId
  24 + private Long id;
  25 +
  26 + /**
  27 + * 模板名称
  28 + */
  29 + private String name;
  30 +
  31 + /**
  32 + * 配送计费方式
  33 + *
  34 + * 枚举 {@link DeliveryExpressChargeModeEnum}
  35 + */
  36 + private Integer chargeMode;
  37 +
  38 + /**
  39 + * 排序
  40 + */
  41 + private Integer sort;
  42 +
  43 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateFreeDO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.dataobject.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import com.baomidou.mybatisplus.annotation.KeySequence;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import lombok.Data;
  8 +
  9 +/**
  10 + * 快递运费模板包邮配置 DO
  11 + *
  12 + * @author jason
  13 + */
  14 +@TableName(value ="trade_delivery_express_template_free")
  15 +@KeySequence("trade_delivery_express_template_free_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  16 +@Data
  17 +public class DeliveryExpressTemplateFreeDO extends BaseDO {
  18 +
  19 + /**
  20 + * 编号
  21 + */
  22 + @TableId
  23 + private Long id;
  24 +
  25 + /**
  26 + * 配送模板编号
  27 + *
  28 + * 关联 {@link DeliveryExpressTemplateDO#getId()}
  29 + */
  30 + private Long templateId;
  31 +
  32 + /**
  33 + * 包邮区域id
  34 + */
  35 + private Integer areaId;
  36 +
  37 + /**
  38 + * 包邮金额，单位：分
  39 + *
  40 + * 订单总金额 > 包邮金额时，才免运费
  41 + */
  42 + private Integer freePrice;
  43 +
  44 + /**
  45 + * 包邮件数
  46 + *
  47 + * 订单总件数 > 包邮件数时，才免运费
  48 + */
  49 + private Integer freeCount;
  50 +
  51 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreDO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.dataobject.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.Data;
  9 +
  10 +import java.time.LocalTime;
  11 +
  12 +/**
  13 + * 自提门店 DO
  14 + *
  15 + * @author jason
  16 + */
  17 +@TableName(value ="trade_delivery_pick_up_store")
  18 +@KeySequence("trade_delivery_pick_up_store_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  19 +@Data
  20 +public class DeliveryPickUpStoreDO extends BaseDO {
  21 +
  22 + /**
  23 + * 编号，自增
  24 + */
  25 + @TableId
  26 + private Long id;
  27 +
  28 + /**
  29 + * 门店名称
  30 + */
  31 + private String name;
  32 +
  33 + /**
  34 + * 门店简介
  35 + */
  36 + private String introduction;
  37 +
  38 + /**
  39 + * 门店手机
  40 + */
  41 + private String phone;
  42 +
  43 + /**
  44 + * 区域 id
  45 + */
  46 + private Integer areaId;
  47 +
  48 + /**
  49 + * 门店详细地址
  50 + */
  51 + private String detailAddress;
  52 +
  53 + /**
  54 + * 门店 logo
  55 + */
  56 + private String logo;
  57 +
  58 + /**
  59 + * 营业开始时间
  60 + */
  61 + private LocalTime openingTime;
  62 + /**
  63 + * 营业结束时间
  64 + */
  65 + private LocalTime closingTime;
  66 +
  67 + // TODO @Jason：应该是 double？
  68 + /**
  69 + * 纬度
  70 + */
  71 + private String latitude;
  72 + /**
  73 + * 经度
  74 + */
  75 + private String longitude;
  76 +
  77 + /**
  78 + * 门店状态
  79 + *
  80 + * 枚举 {@link CommonStatusEnum}
  81 + */
  82 + private Integer status;
  83 +
  84 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreStaffDO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.dataobject.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.Data;
  9 +
  10 +// TODO @芋艿：后续再详细 review 一轮
  11 +// TODO @芋艿：可能改成 DeliveryPickUpStoreUserDO
  12 +/**
  13 + * 自提门店店员 DO
  14 + *
  15 + * @author jason
  16 + */
  17 +@TableName(value ="trade_delivery_pick_up_store_staff")
  18 +@KeySequence("trade_delivery_pick_up_store_staff_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  19 +@Data
  20 +public class DeliveryPickUpStoreStaffDO extends BaseDO {
  21 +
  22 + /**
  23 + * 编号，自增
  24 + */
  25 + @TableId
  26 + private Long id;
  27 +
  28 + /**
  29 + * 自提门店编号
  30 + *
  31 + * 关联 {@link DeliveryPickUpStoreDO#getId()}
  32 + */
  33 + private Long storeId;
  34 +
  35 + /**
  36 + * 管理员用户id
  37 + *
  38 + * 关联 {AdminUserDO#getId()}
  39 + */
  40 + private Long adminUserId;
  41 +
  42 + /**
  43 + * 状态
  44 + *
  45 + * 枚举 {@link CommonStatusEnum}
  46 + */
  47 + private Integer status;
  48 +
  49 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
  View file @d08b953
... ... @@ -3,8 +3,9 @@ package cn.iocoder.yudao.module.trade.dal.dataobject.order;
3 3 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
4 4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
5 5 import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateRespDTO.OrderItem;
  6 +import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
6 7 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderCancelTypeEnum;
7   -import cn.iocoder.yudao.module.trade.enums.order.TradeOrderAfterSaleStatusEnum;
  8 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
8 9 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderDeliveryStatusEnum;
9 10 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
10 11 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
... ... @@ -94,6 +95,13 @@ public class TradeOrderDO extends BaseDO {
94 95 * 商家备注
95 96 */
96 97 private String remark;
  98 + /**
  99 + * 是否评价
  100 + *
  101 + * true - 已评价
  102 + * false - 未评价
  103 + */
  104 + private Boolean commentStatus;
97 105  
98 106 // ========== 价格 + 支付基本信息 ==========
99 107  
... ... @@ -128,16 +136,17 @@ public class TradeOrderDO extends BaseDO {
128 136 /**
129 137 * 商品原价（总），单位：分
130 138 *
131   - * 基于 {@link TradeOrderItemDO#getOriginalPrice()} 求和
  139 + * totalPrice = {@link TradeOrderItemDO#getPrice()} * {@link TradeOrderItemDO#getCount()} 求和
132 140 *
133 141 * 对应 taobao 的 trade.total_fee 字段
134 142 */
135   - private Integer originalPrice;
  143 + private Integer totalPrice;
  144 + // TODO 芋艿：是不是要删除这个字段？
136 145 /**
137 146 * 订单原价（总），单位：分
138 147 *
139   - * 基于 {@link OrderItem#getPayPrice()} 求和
140   - * 和 {@link #originalPrice} 的差异：去除商品级优惠
  148 + * 1. orderPrice = {@link OrderItem#getPayPrice()} 求和
  149 + * 2. orderPrice = {@link #totalPrice} - 商品级优惠
141 150 */
142 151 private Integer orderPrice;
143 152 /**
... ... @@ -172,6 +181,12 @@ public class TradeOrderDO extends BaseDO {
172 181  
173 182 // ========== 收件 + 物流基本信息 ==========
174 183 /**
  184 + * 配送方式
  185 + *
  186 + * 枚举 {@link DeliveryTypeEnum}
  187 + */
  188 + private Integer deliveryType;
  189 + /**
175 190 * 配置模板的编号
176 191 *
177 192 * 关联 DeliveryTemplateDO 的 id 编号
... ... @@ -213,21 +228,17 @@ public class TradeOrderDO extends BaseDO {
213 228 */
214 229 private Integer receiverAreaId;
215 230 /**
216   - * 收件人邮编
217   - */
218   - private Integer receiverPostCode;
219   - /**
220 231 * 收件人详细地址
221 232 */
222 233 private String receiverDetailAddress;
223 234  
224 235 // ========== 售后基本信息 ==========
225 236 /**
226   - * 收货状态
  237 + * 售后状态
227 238 *
228   - * 枚举 {@link TradeOrderAfterSaleStatusEnum}
  239 + * 枚举 {@link TradeOrderRefundStatusEnum}
229 240 */
230   - private Integer afterSaleStatus;
  241 + private Integer refundStatus;
231 242 /**
232 243 * 退款金额，单位：分
233 244 *
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
  View file @d08b953
... ... @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.trade.dal.dataobject.order;
3 3 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
4 4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
5 5 import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleDO;
  6 +import cn.iocoder.yudao.module.trade.dal.dataobject.cart.TradeCartDO;
6 7 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
7 8 import com.baomidou.mybatisplus.annotation.TableField;
8 9 import com.baomidou.mybatisplus.annotation.TableName;
... ... @@ -42,6 +43,12 @@ public class TradeOrderItemDO extends BaseDO {
42 43 * 关联 {@link TradeOrderDO#getId()}
43 44 */
44 45 private Long orderId;
  46 + /**
  47 + * 购物车项编号
  48 + *
  49 + * 关联 {@link TradeCartDO#getId()}
  50 + */
  51 + private Long cartId;
45 52  
46 53 // ========== 商品基本信息; 冗余较多字段，减少关联查询 ==========
47 54 /**
... ... @@ -77,29 +84,23 @@ public class TradeOrderItemDO extends BaseDO {
77 84 * 购买数量
78 85 */
79 86 private Integer count;
80   -// /**
81   -// * 是否评论 TODO
82   -// *
83   -// * false - 未评论
84   -// * true - 已评论
85   -// */
86   -// private Boolean commented;
87   -
88   - // ========== 价格 + 支付基本信息 ==========
89   -
90 87 /**
91   - * 商品原价（总），单位：分
  88 + * 是否评价
92 89 *
93   - * = {@link #originalUnitPrice} * {@link #getCount()}
  90 + * true - 已评价
  91 + * false - 未评价
94 92 */
95   - private Integer originalPrice;
  93 + private Boolean commentStatus;
  94 +
  95 + // ========== 价格 + 支付基本信息 ==========
  96 +
96 97 /**
97 98 * 商品原价（单），单位：分
98 99 *
99 100 * 对应 ProductSkuDO 的 price 字段
100 101 * 对应 taobao 的 order.price 字段
101 102 */
102   - private Integer originalUnitPrice;
  103 + private Integer price;
103 104 /**
104 105 * 商品优惠（总），单位：分
105 106 *
... ... @@ -109,9 +110,9 @@ public class TradeOrderItemDO extends BaseDO {
109 110 */
110 111 private Integer discountPrice;
111 112 /**
112   - * 子订单实付金额，不算主订单分摊金额，单位：分
  113 + * 子订单实付金额（总），不算主订单分摊金额，单位：分
113 114 *
114   - * = {@link #originalPrice}
  115 + * = {@link #price} * {@link #count}
115 116 * - {@link #discountPrice}
116 117 *
117 118 * 对应 taobao 的 order.payment 字段
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryExpressMapper.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressExportReqVO;
  7 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressPageReqVO;
  8 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
  9 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  10 +import org.apache.ibatis.annotations.Mapper;
  11 +
  12 +import java.util.List;
  13 +
  14 +@Mapper
  15 +public interface DeliveryExpressMapper extends BaseMapperX<DeliveryExpressDO> {
  16 +
  17 + default PageResult<DeliveryExpressDO> selectPage(DeliveryExpressPageReqVO reqVO) {
  18 + return selectPage(reqVO, new LambdaQueryWrapperX<DeliveryExpressDO>()
  19 + .likeIfPresent(DeliveryExpressDO::getCode, reqVO.getCode())
  20 + .likeIfPresent(DeliveryExpressDO::getName, reqVO.getName())
  21 + .eqIfPresent(DeliveryExpressDO::getStatus, reqVO.getStatus())
  22 + .betweenIfPresent(DeliveryExpressDO::getCreateTime, reqVO.getCreateTime())
  23 + .orderByAsc(DeliveryExpressDO::getSort));
  24 + }
  25 +
  26 + default List<DeliveryExpressDO> selectList(DeliveryExpressExportReqVO reqVO) {
  27 + return selectList(new LambdaQueryWrapperX<DeliveryExpressDO>()
  28 + .likeIfPresent(DeliveryExpressDO::getCode, reqVO.getCode())
  29 + .likeIfPresent(DeliveryExpressDO::getName, reqVO.getName())
  30 + .eqIfPresent(DeliveryExpressDO::getStatus, reqVO.getStatus())
  31 + .betweenIfPresent(DeliveryExpressDO::getCreateTime, reqVO.getCreateTime())
  32 + .orderByAsc(DeliveryExpressDO::getSort));
  33 + }
  34 +
  35 + default DeliveryExpressDO selectByCode(String code) {
  36 + return selectOne(new LambdaQueryWrapper<DeliveryExpressDO>()
  37 + .eq(DeliveryExpressDO::getCode, code));
  38 + }
  39 +}
  40 +
  41 +
  42 +
  43 +
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryExpressTemplateChargeMapper.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
  2 +
  3 +
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateChargeDO;
  7 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  8 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  9 +import org.apache.ibatis.annotations.Mapper;
  10 +import org.springframework.stereotype.Repository;
  11 +
  12 +import java.util.List;
  13 +
  14 +@Mapper
  15 +public interface DeliveryExpressTemplateChargeMapper extends BaseMapperX<DeliveryExpressTemplateChargeDO> {
  16 +
  17 + @Repository
  18 + class BatchInsertMapper extends ServiceImpl<DeliveryExpressTemplateChargeMapper, DeliveryExpressTemplateChargeDO> {
  19 + }
  20 +
  21 + default List<DeliveryExpressTemplateChargeDO> selectListByTemplateId(Long templateId){
  22 + return selectList(new LambdaQueryWrapper<DeliveryExpressTemplateChargeDO>()
  23 + .eq(DeliveryExpressTemplateChargeDO::getTemplateId, templateId));
  24 + }
  25 +
  26 + default int deleteByTemplateId(Long templateId){
  27 + return delete(new LambdaQueryWrapper<DeliveryExpressTemplateChargeDO>()
  28 + .eq(DeliveryExpressTemplateChargeDO::getTemplateId, templateId));
  29 + }
  30 +}
  31 +
  32 +
  33 +
  34 +
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryExpressTemplateFreeMapper.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  4 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  5 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateChargeDO;
  6 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateFreeDO;
  7 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  8 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  9 +import org.apache.ibatis.annotations.Mapper;
  10 +import org.springframework.stereotype.Repository;
  11 +
  12 +import java.util.List;
  13 +
  14 +@Mapper
  15 +public interface DeliveryExpressTemplateFreeMapper extends BaseMapperX<DeliveryExpressTemplateFreeDO> {
  16 +
  17 + @Repository
  18 + class BatchInsertMapper extends ServiceImpl<DeliveryExpressTemplateFreeMapper, DeliveryExpressTemplateFreeDO> {
  19 + }
  20 +
  21 + default List<DeliveryExpressTemplateFreeDO> selectListByTemplateId(Long templateId) {
  22 + return selectList(new LambdaQueryWrapper<DeliveryExpressTemplateFreeDO>()
  23 + .eq(DeliveryExpressTemplateFreeDO::getTemplateId, templateId));
  24 + }
  25 +
  26 + default int deleteByTemplateId(Long templateId) {
  27 + return delete(new LambdaQueryWrapper<DeliveryExpressTemplateFreeDO>()
  28 + .eq(DeliveryExpressTemplateFreeDO::getTemplateId, templateId));
  29 + }
  30 +}
  31 +
  32 +
  33 +
  34 +
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryExpressTemplateMapper.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
  2 +
  3 +
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  6 +
  7 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  8 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressTemplateExportReqVO;
  9 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressTemplatePageReqVO;
  10 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
  11 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
  12 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  13 +import org.apache.ibatis.annotations.Mapper;
  14 +
  15 +import java.util.List;
  16 +
  17 +@Mapper
  18 +public interface DeliveryExpressTemplateMapper extends BaseMapperX<DeliveryExpressTemplateDO> {
  19 +
  20 + default PageResult<DeliveryExpressTemplateDO> selectPage(DeliveryExpressTemplatePageReqVO reqVO) {
  21 + return selectPage(reqVO, new LambdaQueryWrapperX<DeliveryExpressTemplateDO>()
  22 + .likeIfPresent(DeliveryExpressTemplateDO::getName, reqVO.getName())
  23 + .eqIfPresent(DeliveryExpressTemplateDO::getChargeMode, reqVO.getChargeMode())
  24 + .betweenIfPresent(DeliveryExpressTemplateDO::getCreateTime, reqVO.getCreateTime())
  25 + .orderByAsc(DeliveryExpressTemplateDO::getSort));
  26 + }
  27 +
  28 + default List<DeliveryExpressTemplateDO> selectList(DeliveryExpressTemplateExportReqVO reqVO) {
  29 + return selectList(new LambdaQueryWrapperX<DeliveryExpressTemplateDO>()
  30 + .likeIfPresent(DeliveryExpressTemplateDO::getName, reqVO.getName())
  31 + .eqIfPresent(DeliveryExpressTemplateDO::getChargeMode, reqVO.getChargeMode())
  32 + .betweenIfPresent(DeliveryExpressTemplateDO::getCreateTime, reqVO.getCreateTime())
  33 + .orderByAsc(DeliveryExpressTemplateDO::getSort));
  34 + }
  35 +
  36 + default DeliveryExpressTemplateDO selectByName(String name) {
  37 + return selectOne(new LambdaQueryWrapper<DeliveryExpressTemplateDO>()
  38 + .eq(DeliveryExpressTemplateDO::getName, name));
  39 + }
  40 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryPickUpStoreMapper.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  4 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
  5 +import org.apache.ibatis.annotations.Mapper;
  6 +
  7 +@Mapper
  8 +public interface DeliveryPickUpStoreMapper extends BaseMapperX<DeliveryPickUpStoreDO> {
  9 +}
  10 +
  11 +
  12 +
  13 +
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryPickUpStoreStaffMapper.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  4 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreStaffDO;
  5 +import org.apache.ibatis.annotations.Mapper;
  6 +
  7 +@Mapper
  8 +public interface DeliveryPickUpStoreStaffMapper extends BaseMapperX<DeliveryPickUpStoreStaffDO> {
  9 +
  10 +}
  11 +
  12 +
  13 +
  14 +
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
  View file @d08b953
... ... @@ -40,7 +40,14 @@ public interface TradeOrderMapper extends BaseMapperX&lt;TradeOrderDO&gt; {
40 40 return selectPage(reqVO, new LambdaQueryWrapperX<TradeOrderDO>()
41 41 .eq(TradeOrderDO::getUserId, userId)
42 42 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
  43 + .eqIfPresent(TradeOrderDO::getCommentStatus, reqVO.getCommentStatus())
43 44 .orderByDesc(TradeOrderDO::getId)); // TODO 芋艿：未来不同的 status，不同的排序
44 45 }
45 46  
  47 + default Long selectCountByUserIdAndStatus(Long userId, Integer status, Boolean commentStatus) {
  48 + return selectCount(new LambdaQueryWrapperX<TradeOrderDO>()
  49 + .eq(TradeOrderDO::getUserId, userId)
  50 + .eqIfPresent(TradeOrderDO::getStatus, status)
  51 + .eqIfPresent(TradeOrderDO::getCommentStatus, commentStatus));
  52 + }
46 53 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.service.delivery;
  2 +
  3 +import java.util.*;
  4 +import javax.validation.*;
  5 +
  6 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  7 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressCreateReqVO;
  8 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressExportReqVO;
  9 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressPageReqVO;
  10 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressUpdateReqVO;
  11 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
  12 +
  13 +/**
  14 + * 快递公司 Service 接口
  15 + *
  16 + * @author jason
  17 + */
  18 +public interface DeliveryExpressService {
  19 +
  20 + /**
  21 + * 创建快递公司
  22 + *
  23 + * @param createReqVO 创建信息
  24 + * @return 编号
  25 + */
  26 + Long createDeliveryExpress(@Valid DeliveryExpressCreateReqVO createReqVO);
  27 +
  28 + /**
  29 + * 更新快递公司
  30 + *
  31 + * @param updateReqVO 更新信息
  32 + */
  33 + void updateDeliveryExpress(@Valid DeliveryExpressUpdateReqVO updateReqVO);
  34 +
  35 + /**
  36 + * 删除快递公司
  37 + *
  38 + * @param id 编号
  39 + */
  40 + void deleteDeliveryExpress(Long id);
  41 +
  42 + /**
  43 + * 获得快递公司
  44 + *
  45 + * @param id 编号
  46 + * @return 快递公司
  47 + */
  48 + DeliveryExpressDO getDeliveryExpress(Long id);
  49 +
  50 + /**
  51 + * 获得快递公司列表
  52 + *
  53 + * @param ids 编号
  54 + * @return 快递公司列表
  55 + */
  56 + List<DeliveryExpressDO> getDeliveryExpressList(Collection<Long> ids);
  57 +
  58 + /**
  59 + * 获得快递公司分页
  60 + *
  61 + * @param pageReqVO 分页查询
  62 + * @return 快递公司分页
  63 + */
  64 + PageResult<DeliveryExpressDO> getDeliveryExpressPage(DeliveryExpressPageReqVO pageReqVO);
  65 +
  66 + /**
  67 + * 获得快递公司列表, 用于 Excel 导出
  68 + *
  69 + * @param exportReqVO 查询条件
  70 + * @return 快递公司列表
  71 + */
  72 + List<DeliveryExpressDO> getDeliveryExpressList(DeliveryExpressExportReqVO exportReqVO);
  73 +
  74 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.service.delivery;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressCreateReqVO;
  5 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressExportReqVO;
  6 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressPageReqVO;
  7 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.DeliveryExpressUpdateReqVO;
  8 +import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressConvert;
  9 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
  10 +import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryExpressMapper;
  11 +import org.springframework.stereotype.Service;
  12 +import javax.annotation.Resource;
  13 +import org.springframework.validation.annotation.Validated;
  14 +
  15 +import java.util.*;
  16 +
  17 +
  18 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  19 +import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
  20 +
  21 +/**
  22 + * 快递公司 Service 实现类
  23 + *
  24 + * @author jason
  25 + */
  26 +@Service
  27 +@Validated
  28 +public class DeliveryExpressServiceImpl implements DeliveryExpressService {
  29 +
  30 + @Resource
  31 + private DeliveryExpressMapper deliveryExpressMapper;
  32 +
  33 + @Override
  34 + public Long createDeliveryExpress(DeliveryExpressCreateReqVO createReqVO) {
  35 + //校验编码是否唯一
  36 + validateExpressCodeUnique(createReqVO.getCode(), null);
  37 + // 插入
  38 + DeliveryExpressDO deliveryExpress = DeliveryExpressConvert.INSTANCE.convert(createReqVO);
  39 + deliveryExpressMapper.insert(deliveryExpress);
  40 + // 返回
  41 + return deliveryExpress.getId();
  42 + }
  43 +
  44 + @Override
  45 + public void updateDeliveryExpress(DeliveryExpressUpdateReqVO updateReqVO) {
  46 + // 校验存在
  47 + validateDeliveryExpressExists(updateReqVO.getId());
  48 + //校验编码是否唯一
  49 + validateExpressCodeUnique(updateReqVO.getCode(), updateReqVO.getId());
  50 + // 更新
  51 + DeliveryExpressDO updateObj = DeliveryExpressConvert.INSTANCE.convert(updateReqVO);
  52 + deliveryExpressMapper.updateById(updateObj);
  53 + }
  54 +
  55 + @Override
  56 + public void deleteDeliveryExpress(Long id) {
  57 + // 校验存在
  58 + validateDeliveryExpressExists(id);
  59 + // 删除
  60 + deliveryExpressMapper.deleteById(id);
  61 + }
  62 +
  63 + private void validateExpressCodeUnique(String code, Long id) {
  64 + DeliveryExpressDO express = deliveryExpressMapper.selectByCode(code);
  65 + if (express == null) {
  66 + return;
  67 + }
  68 + // 如果 id 为空，说明不用比较是否为相同 id 的快递公司
  69 + if (id == null) {
  70 + throw exception(EXPRESS_CODE_DUPLICATE);
  71 + }
  72 + if (!express.getId().equals(id)) {
  73 + throw exception(EXPRESS_CODE_DUPLICATE);
  74 + }
  75 + }
  76 + private void validateDeliveryExpressExists(Long id) {
  77 + if (deliveryExpressMapper.selectById(id) == null) {
  78 + throw exception(DELIVERY_EXPRESS_NOT_EXISTS);
  79 + }
  80 + }
  81 +
  82 + @Override
  83 + public DeliveryExpressDO getDeliveryExpress(Long id) {
  84 + return deliveryExpressMapper.selectById(id);
  85 + }
  86 +
  87 + @Override
  88 + public List<DeliveryExpressDO> getDeliveryExpressList(Collection<Long> ids) {
  89 + return deliveryExpressMapper.selectBatchIds(ids);
  90 + }
  91 +
  92 + @Override
  93 + public PageResult<DeliveryExpressDO> getDeliveryExpressPage(DeliveryExpressPageReqVO pageReqVO) {
  94 + return deliveryExpressMapper.selectPage(pageReqVO);
  95 + }
  96 +
  97 + @Override
  98 + public List<DeliveryExpressDO> getDeliveryExpressList(DeliveryExpressExportReqVO exportReqVO) {
  99 + return deliveryExpressMapper.selectList(exportReqVO);
  100 + }
  101 +
  102 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateService.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.service.delivery;
  2 +
  3 +import java.util.*;
  4 +import javax.validation.*;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.*;
  7 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
  8 +
  9 +/**
  10 + * 快递运费模板 Service 接口
  11 + *
  12 + * @author jason
  13 + */
  14 +public interface DeliveryExpressTemplateService {
  15 +
  16 + /**
  17 + * 创建快递运费模板
  18 + *
  19 + * @param createReqVO 创建信息
  20 + * @return 编号
  21 + */
  22 + Long createDeliveryExpressTemplate(@Valid DeliveryExpressTemplateCreateReqVO createReqVO);
  23 +
  24 + /**
  25 + * 更新快递运费模板
  26 + *
  27 + * @param updateReqVO 更新信息
  28 + */
  29 + void updateDeliveryExpressTemplate(@Valid DeliveryExpressTemplateUpdateReqVO updateReqVO);
  30 +
  31 + /**
  32 + * 删除快递运费模板
  33 + *
  34 + * @param id 编号
  35 + */
  36 + void deleteDeliveryExpressTemplate(Long id);
  37 +
  38 + /**
  39 + * 获得快递运费模板
  40 + *
  41 + * @param id 编号
  42 + * @return 快递运费模板详情
  43 + */
  44 + DeliveryExpressTemplateRespVO getDeliveryExpressTemplate(Long id);
  45 +
  46 + /**
  47 + * 获得快递运费模板列表
  48 + *
  49 + * @param ids 编号
  50 + * @return 快递运费模板列表
  51 + */
  52 + List<DeliveryExpressTemplateDO> getDeliveryExpressTemplateList(Collection<Long> ids);
  53 +
  54 + /**
  55 + * 获得快递运费模板分页
  56 + *
  57 + * @param pageReqVO 分页查询
  58 + * @return 快递运费模板分页
  59 + */
  60 + PageResult<DeliveryExpressTemplateDO> getDeliveryExpressTemplatePage(DeliveryExpressTemplatePageReqVO pageReqVO);
  61 +
  62 + /**
  63 + * 获得快递运费模板列表, 用于 Excel 导出
  64 + *
  65 + * @param exportReqVO 查询条件
  66 + * @return 快递运费模板列表
  67 + */
  68 + List<DeliveryExpressTemplateDO> getDeliveryExpressTemplateList(DeliveryExpressTemplateExportReqVO exportReqVO);
  69 +
  70 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateServiceImpl.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.trade.service.delivery;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  6 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.*;
  7 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateChargeDO;
  8 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
  9 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateFreeDO;
  10 +import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryExpressTemplateChargeMapper;
  11 +import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryExpressTemplateFreeMapper;
  12 +import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryExpressTemplateMapper;
  13 +import org.springframework.stereotype.Service;
  14 +import org.springframework.transaction.annotation.Transactional;
  15 +import org.springframework.validation.annotation.Validated;
  16 +
  17 +import javax.annotation.Resource;
  18 +import java.util.*;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  21 +import static cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressTemplateConvert.INSTANCE;
  22 +import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
  23 +
  24 +/**
  25 + * 快递运费模板 Service 实现类
  26 + *
  27 + * @author jason
  28 + */
  29 +@Service
  30 +@Validated
  31 +public class DeliveryExpressTemplateServiceImpl implements DeliveryExpressTemplateService {
  32 +
  33 + @Resource
  34 + private DeliveryExpressTemplateMapper expressTemplateMapper;
  35 + @Resource
  36 + private DeliveryExpressTemplateChargeMapper expressTemplateChargeMapper;
  37 + @Resource
  38 + private DeliveryExpressTemplateFreeMapper expressTemplateFreeMapper;
  39 + @Resource
  40 + private DeliveryExpressTemplateChargeMapper.BatchInsertMapper expressTemplateChargeBatchMapper;
  41 + @Resource
  42 + private DeliveryExpressTemplateFreeMapper.BatchInsertMapper expressTemplateFreeBatchMapper;
  43 +
  44 + @Override
  45 + @Transactional(rollbackFor = Exception.class)
  46 + public Long createDeliveryExpressTemplate(DeliveryExpressTemplateCreateReqVO createReqVO) {
  47 + //校验模板名是否唯一
  48 + validateTemplateNameUnique(createReqVO.getName(), null);
  49 + // 插入
  50 + DeliveryExpressTemplateDO deliveryExpressTemplate = INSTANCE.convert(createReqVO);
  51 + expressTemplateMapper.insert(deliveryExpressTemplate);
  52 + //插入运费模板计费表
  53 + if(CollUtil.isNotEmpty(createReqVO.getTemplateCharge())) {
  54 + expressTemplateChargeBatchMapper.saveBatch(
  55 + INSTANCE.convertTemplateChargeList(deliveryExpressTemplate.getId(), createReqVO.getChargeMode(), createReqVO.getTemplateCharge())
  56 + );
  57 + }
  58 + //插入运费模板包邮表
  59 + if(CollUtil.isNotEmpty(createReqVO.getTemplateFree())) {
  60 + expressTemplateFreeBatchMapper.saveBatch(
  61 + INSTANCE.convertTemplateFreeList(deliveryExpressTemplate.getId(), createReqVO.getTemplateFree())
  62 + );
  63 + }
  64 + return deliveryExpressTemplate.getId();
  65 + }
  66 +
  67 + @Override
  68 + @Transactional(rollbackFor = Exception.class)
  69 + public void updateDeliveryExpressTemplate(DeliveryExpressTemplateUpdateReqVO updateReqVO) {
  70 + // 校验存在
  71 + validateDeliveryExpressTemplateExists(updateReqVO.getId());
  72 + //校验模板名是否唯一
  73 + validateTemplateNameUnique(updateReqVO.getName(), updateReqVO.getId());
  74 +
  75 + //更新运费从表
  76 + updateExpressTemplateCharge(updateReqVO);
  77 + //更新包邮从表
  78 + updateExpressTemplateFree(updateReqVO);
  79 + //更新模板主表
  80 + DeliveryExpressTemplateDO updateObj = INSTANCE.convert(updateReqVO);
  81 + expressTemplateMapper.updateById(updateObj);
  82 + }
  83 +
  84 + private void updateExpressTemplateFree(DeliveryExpressTemplateUpdateReqVO updateReqVO) {
  85 + List<DeliveryExpressTemplateFreeDO> oldFreeList = expressTemplateFreeMapper.selectListByTemplateId(updateReqVO.getId());
  86 + List<ExpressTemplateFreeUpdateVO> newFreeList = updateReqVO.getTemplateFree();
  87 + //新增包邮区域列表
  88 + List<DeliveryExpressTemplateFreeDO> addFreeList = new ArrayList<>(newFreeList.size());
  89 + //更新包邮区域列表
  90 + List<DeliveryExpressTemplateFreeDO> updateFreeList = new ArrayList<>(newFreeList.size());
  91 + for (ExpressTemplateFreeUpdateVO item : newFreeList) {
  92 + if (Objects.nonNull(item.getId())) {
  93 + updateFreeList.add(INSTANCE.convertTemplateFree(item));
  94 + }else{
  95 + item.setTemplateId(updateReqVO.getId());
  96 + addFreeList.add(INSTANCE.convertTemplateFree(item));
  97 + }
  98 + }
  99 + //删除的包邮区域id
  100 + Set<Long> deleteFreeIds = CollectionUtils.convertSet(oldFreeList, DeliveryExpressTemplateFreeDO::getId);
  101 + deleteFreeIds.removeAll(CollectionUtils.convertSet(updateFreeList, DeliveryExpressTemplateFreeDO::getId));
  102 + //新增
  103 + if (CollUtil.isNotEmpty(addFreeList)) {
  104 + expressTemplateFreeBatchMapper.saveBatch(addFreeList);
  105 + }
  106 + //修改
  107 + if (CollUtil.isNotEmpty(updateFreeList)) {
  108 + expressTemplateFreeBatchMapper.saveOrUpdateBatch(updateFreeList);
  109 + }
  110 + //删除
  111 + if (CollUtil.isNotEmpty(deleteFreeIds)) {
  112 + expressTemplateFreeMapper.deleteBatchIds(deleteFreeIds);
  113 + }
  114 + }
  115 +
  116 + private void updateExpressTemplateCharge(DeliveryExpressTemplateUpdateReqVO updateReqVO) {
  117 + List<DeliveryExpressTemplateChargeDO> oldChargeList = expressTemplateChargeMapper.selectListByTemplateId(updateReqVO.getId());
  118 + List<ExpressTemplateChargeUpdateVO> newChargeList = updateReqVO.getTemplateCharge();
  119 + //新增运费区域列表
  120 + List<DeliveryExpressTemplateChargeDO> addList = new ArrayList<>(newChargeList.size());
  121 + //更新运费区域列表
  122 + List<DeliveryExpressTemplateChargeDO> updateList = new ArrayList<>(newChargeList.size());
  123 + for (ExpressTemplateChargeUpdateVO item : newChargeList) {
  124 + if (Objects.nonNull(item.getId())) {
  125 + //计费模式以主表为准
  126 + item.setChargeMode(updateReqVO.getChargeMode());
  127 + updateList.add(INSTANCE.convertTemplateCharge(item));
  128 + }else{
  129 + item.setTemplateId(updateReqVO.getId());
  130 + item.setChargeMode(updateReqVO.getChargeMode());
  131 + addList.add(INSTANCE.convertTemplateCharge(item));
  132 + }
  133 + }
  134 + //删除的运费区域id
  135 + Set<Long> deleteChargeIds = CollectionUtils.convertSet(oldChargeList, DeliveryExpressTemplateChargeDO::getId);
  136 + deleteChargeIds.removeAll(CollectionUtils.convertSet(updateList, DeliveryExpressTemplateChargeDO::getId));
  137 + //新增
  138 + if (CollUtil.isNotEmpty(addList)) {
  139 + expressTemplateChargeBatchMapper.saveBatch(addList);
  140 + }
  141 + //修改
  142 + if (CollUtil.isNotEmpty(updateList)) {
  143 + expressTemplateChargeBatchMapper.saveOrUpdateBatch(updateList);
  144 + }
  145 + //删除
  146 + if (CollUtil.isNotEmpty(deleteChargeIds)) {
  147 + expressTemplateChargeMapper.deleteBatchIds(deleteChargeIds);
  148 + }
  149 + }
  150 +
  151 + @Override
  152 + @Transactional(rollbackFor = Exception.class)
  153 + public void deleteDeliveryExpressTemplate(Long id) {
  154 + // 校验存在
  155 + validateDeliveryExpressTemplateExists(id);
  156 + // 删除主表
  157 + expressTemplateMapper.deleteById(id);
  158 + // 删除运费从表
  159 + expressTemplateChargeMapper.deleteByTemplateId(id);
  160 + // 删除包邮从表
  161 + expressTemplateFreeMapper.deleteByTemplateId(id);
  162 + }
  163 +
  164 + /**
  165 + * 校验运费模板名是否唯一
  166 + * @param name 模板名称
  167 + * @param id 运费模板编号, 可以为null
  168 + */
  169 + private void validateTemplateNameUnique(String name, Long id) {
  170 + DeliveryExpressTemplateDO template = expressTemplateMapper.selectByName(name);
  171 + if (template == null) {
  172 + return;
  173 + }
  174 + // 如果 id 为空
  175 + if (id == null) {
  176 + throw exception(EXPRESS_TEMPLATE_NAME_DUPLICATE);
  177 + }
  178 + if (!template.getId().equals(id)) {
  179 + throw exception(EXPRESS_TEMPLATE_NAME_DUPLICATE);
  180 + }
  181 + }
  182 +
  183 + private void validateDeliveryExpressTemplateExists(Long id) {
  184 + if (expressTemplateMapper.selectById(id) == null) {
  185 + throw exception(EXPRESS_TEMPLATE_NOT_EXISTS);
  186 + }
  187 + }
  188 +
  189 + @Override
  190 + public DeliveryExpressTemplateRespVO getDeliveryExpressTemplate(Long id) {
  191 + List<DeliveryExpressTemplateChargeDO> chargeList = expressTemplateChargeMapper.selectListByTemplateId(id);
  192 + List<DeliveryExpressTemplateFreeDO> freeList = expressTemplateFreeMapper.selectListByTemplateId(id);
  193 + DeliveryExpressTemplateDO template = expressTemplateMapper.selectById(id);
  194 + return INSTANCE.convert(template, chargeList,freeList);
  195 + }
  196 +
  197 + @Override
  198 + public List<DeliveryExpressTemplateDO> getDeliveryExpressTemplateList(Collection<Long> ids) {
  199 + return expressTemplateMapper.selectBatchIds(ids);
  200 + }
  201 +
  202 + @Override
  203 + public PageResult<DeliveryExpressTemplateDO> getDeliveryExpressTemplatePage(DeliveryExpressTemplatePageReqVO pageReqVO) {
  204 + return expressTemplateMapper.selectPage(pageReqVO);
  205 + }
  206 +
  207 + @Override
  208 + public List<DeliveryExpressTemplateDO> getDeliveryExpressTemplateList(DeliveryExpressTemplateExportReqVO exportReqVO) {
  209 + return expressTemplateMapper.selectList(exportReqVO);
  210 + }
  211 +
  212 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderService.java
  View file @d08b953
... ... @@ -91,6 +91,16 @@ public interface TradeOrderService {
91 91 */
92 92 PageResult<TradeOrderDO> getOrderPage(Long userId, AppTradeOrderPageReqVO reqVO);
93 93  
  94 + /**
  95 + * 【会员】获得交易订单数量
  96 + *
  97 + * @param userId 用户编号
  98 + * @param status 订单状态。如果为空，则不进行筛选
  99 + * @param commonStatus 评价状态。如果为空，则不进行筛选
  100 + * @return 订单数量
  101 + */
  102 + Long getOrderCount(Long userId, Integer status, Boolean commonStatus);
  103 +
94 104 // =================== Order Item ===================
95 105  
96 106 /**
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
  View file @d08b953
... ... @@ -30,7 +30,6 @@ import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateRespDTO;
30 30 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
31 31 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
32 32 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
33   -import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO.Item;
34 33 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderPageReqVO;
35 34 import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
36 35 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
... ... @@ -49,7 +48,8 @@ import java.time.LocalDateTime;
49 48 import java.util.*;
50 49  
51 50 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
52   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
  51 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  52 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue;
53 53 import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.PAY_ORDER_NOT_FOUND;
54 54 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
55 55  
... ... @@ -92,7 +92,8 @@ public class TradeOrderServiceImpl implements TradeOrderService {
92 92 @Transactional(rollbackFor = Exception.class)
93 93 public Long createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO) {
94 94 // 商品 SKU 检查：可售状态、库存
95   - List<ProductSkuRespDTO> skus = validateSkuSaleable(createReqVO.getItems());
  95 +// List<ProductSkuRespDTO> skus = validateSkuSaleable(createReqVO.getItems()); // TODO 芋艿，临时关闭。
  96 + List<ProductSkuRespDTO> skus = null;
96 97 // 商品 SPU 检查：可售状态
97 98 List<ProductSpuRespDTO> spus = validateSpuSaleable(convertSet(skus, ProductSkuRespDTO::getSpuId));
98 99 // 用户收件地址的校验
... ... @@ -112,28 +113,28 @@ public class TradeOrderServiceImpl implements TradeOrderService {
112 113 return tradeOrderDO.getId();
113 114 }
114 115  
115   - /**
116   - * 校验商品 SKU 是否可出售
117   - *
118   - * @param items 商品 SKU
119   - * @return 商品 SKU 数组
120   - */
121   - private List<ProductSkuRespDTO> validateSkuSaleable(List<Item> items) {
122   - List<ProductSkuRespDTO> skus = productSkuApi.getSkuList(convertSet(items, Item::getSkuId));
123   - // SKU 不存在
124   - if (items.size() != skus.size()) {
125   - throw exception(ORDER_CREATE_SKU_NOT_FOUND);
126   - }
127   - // 校验库存不足
128   - Map<Long, ProductSkuRespDTO> skuMap = convertMap(skus, ProductSkuRespDTO::getId);
129   - items.forEach(item -> {
130   - ProductSkuRespDTO sku = skuMap.get(item.getSkuId());
131   - if (item.getCount() > sku.getStock()) {
132   - throw exception(ErrorCodeConstants.ORDER_CREATE_SKU_STOCK_NOT_ENOUGH);
133   - }
134   - });
135   - return skus;
136   - }
  116 +// /**
  117 +// * 校验商品 SKU 是否可出售
  118 +// *
  119 +// * @param items 商品 SKU
  120 +// * @return 商品 SKU 数组
  121 +// */
  122 +// private List<ProductSkuRespDTO> validateSkuSaleable(List<Item> items) {
  123 +// List<ProductSkuRespDTO> skus = productSkuApi.getSkuList(convertSet(items, Item::getSkuId));
  124 +// // SKU 不存在
  125 +// if (items.size() != skus.size()) {
  126 +// throw exception(ORDER_CREATE_SKU_NOT_FOUND);
  127 +// }
  128 +// // 校验库存不足
  129 +// Map<Long, ProductSkuRespDTO> skuMap = convertMap(skus, ProductSkuRespDTO::getId);
  130 +// items.forEach(item -> {
  131 +// ProductSkuRespDTO sku = skuMap.get(item.getSkuId());
  132 +// if (item.getCount() > sku.getStock()) {
  133 +// throw exception(ErrorCodeConstants.ORDER_CREATE_SKU_STOCK_NOT_ENOUGH);
  134 +// }
  135 +// });
  136 +// return skus;
  137 +// }
137 138  
138 139 /**
139 140 * 校验商品 SPU 是否可出售
... ... @@ -177,12 +178,12 @@ public class TradeOrderServiceImpl implements TradeOrderService {
177 178 tradeOrderDO.setNo(IdUtil.getSnowflakeNextId() + ""); // TODO @LeeYan9: 思考下, 怎么生成好点哈; 这个是会展示给用户的;
178 179 tradeOrderDO.setStatus(TradeOrderStatusEnum.UNPAID.getStatus());
179 180 tradeOrderDO.setType(TradeOrderTypeEnum.NORMAL.getType());
180   - tradeOrderDO.setAfterSaleStatus(TradeOrderAfterSaleStatusEnum.NONE.getStatus());
  181 + tradeOrderDO.setRefundStatus(TradeOrderRefundStatusEnum.NONE.getStatus());
181 182 tradeOrderDO.setProductCount(getSumValue(order.getItems(), PriceCalculateRespDTO.OrderItem::getCount, Integer::sum));
182 183 tradeOrderDO.setTerminal(TerminalEnum.H5.getTerminal()); // todo 数据来源?
183 184 tradeOrderDO.setAdjustPrice(0).setPayed(false); // 支付信息
184 185 tradeOrderDO.setDeliveryStatus(TradeOrderDeliveryStatusEnum.UNDELIVERED.getStatus()); // 物流信息
185   - tradeOrderDO.setAfterSaleStatus(TradeOrderAfterSaleStatusEnum.NONE.getStatus()).setRefundPrice(0); // 退款信息
  186 + tradeOrderDO.setRefundStatus(TradeOrderRefundStatusEnum.NONE.getStatus()).setRefundPrice(0); // 退款信息
186 187 tradeOrderMapper.insert(tradeOrderDO);
187 188 return tradeOrderDO;
188 189 }
... ... @@ -450,6 +451,11 @@ public class TradeOrderServiceImpl implements TradeOrderService {
450 451 return tradeOrderMapper.selectPage(reqVO, userId);
451 452 }
452 453  
  454 + @Override
  455 + public Long getOrderCount(Long userId, Integer status, Boolean commentStatus) {
  456 + return tradeOrderMapper.selectCountByUserIdAndStatus(userId, status, commentStatus);
  457 + }
  458 +
453 459 // =================== Order Item ===================
454 460  
455 461 @Override
... ... @@ -485,7 +491,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
485 491 Integer orderRefundPrice = order.getRefundPrice() + refundPrice;
486 492 if (isAllOrderItemAfterSaleSuccess(order.getId())) { // 如果都售后成功，则需要取消订单
487 493 tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId())
488   - .setAfterSaleStatus(TradeOrderAfterSaleStatusEnum.ALL.getStatus()).setRefundPrice(orderRefundPrice)
  494 + .setRefundStatus(TradeOrderRefundStatusEnum.ALL.getStatus()).setRefundPrice(orderRefundPrice)
489 495 .setCancelType(TradeOrderCancelTypeEnum.AFTER_SALE_CLOSE.getType()).setCancelTime(LocalDateTime.now()));
490 496  
491 497 // TODO 芋艿：记录订单日志
... ... @@ -493,7 +499,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
493 499 // TODO 芋艿：站内信？
494 500 } else { // 如果部分售后，则更新退款金额
495 501 tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId())
496   - .setAfterSaleStatus(TradeOrderAfterSaleStatusEnum.PART.getStatus()).setRefundPrice(orderRefundPrice));
  502 + .setRefundStatus(TradeOrderRefundStatusEnum.PART.getStatus()).setRefundPrice(orderRefundPrice));
497 503 }
498 504  
499 505 // TODO 芋艿：未来如果有分佣，需要更新相关分佣订单为已失效
... ... @@ -506,6 +512,9 @@ public class TradeOrderServiceImpl implements TradeOrderService {
506 512  
507 513 @Override
508 514 public List<TradeOrderItemDO> getOrderItemListByOrderId(Collection<Long> orderIds) {
  515 + if (CollUtil.isEmpty(orderIds)) {
  516 + return Collections.emptyList();
  517 + }
509 518 return tradeOrderItemMapper.selectListByOrderId(orderIds);
510 519 }
511 520  
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.trade.service.order;
2 2  
3   -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 3 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
5 4 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
6 5 import cn.iocoder.yudao.module.member.api.address.AddressApi;
... ... @@ -93,10 +92,12 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
93 92 // 准备参数
94 93 Long userId = 100L;
95 94 String userIp = "127.0.0.1";
96   - AppTradeOrderCreateReqVO reqVO = new AppTradeOrderCreateReqVO()
97   - .setAddressId(10L).setCouponId(101L).setRemark("我是备注").setFromCart(true)
98   - .setItems(Arrays.asList(new AppTradeOrderCreateReqVO.Item().setSkuId(1L).setCount(3),
99   - new AppTradeOrderCreateReqVO.Item().setSkuId(2L).setCount(4)));
  95 +// AppTradeOrderCreateReqVO reqVO = new AppTradeOrderCreateReqVO()
  96 +// .setAddressId(10L).setCouponId(101L).setRemark("我是备注").setFromCart(true)
  97 +// .setItems(Arrays.asList(new AppTradeOrderCreateReqVO.Item().setSkuId(1L).setCount(3),
  98 +// new AppTradeOrderCreateReqVO.Item().setSkuId(2L).setCount(4)));
  99 + AppTradeOrderCreateReqVO reqVO = null;
  100 + // TODO 芋艿：重新高下
100 101 // mock 方法（商品 SKU 检查）
101 102 ProductSkuRespDTO sku01 = randomPojo(ProductSkuRespDTO.class, o -> o.setId(1L).setSpuId(11L)
102 103 .setPrice(50).setStock(100)
... ... @@ -168,7 +169,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
168 169 assertNull(tradeOrderDO.getRemark());
169 170 assertFalse(tradeOrderDO.getPayed());
170 171 assertNull(tradeOrderDO.getPayTime());
171   - assertEquals(tradeOrderDO.getOriginalPrice(), 230);
  172 + assertEquals(tradeOrderDO.getTotalPrice(), 230);
172 173 assertEquals(tradeOrderDO.getOrderPrice(), 100);
173 174 assertEquals(tradeOrderDO.getDiscountPrice(), 0);
174 175 assertEquals(tradeOrderDO.getAdjustPrice(), 0);
... ... @@ -183,9 +184,8 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
183 184 assertEquals(tradeOrderDO.getReceiverName(), "芋艿");
184 185 assertEquals(tradeOrderDO.getReceiverMobile(), "15601691300");
185 186 assertEquals(tradeOrderDO.getReceiverAreaId(), 3306);
186   - assertEquals(tradeOrderDO.getReceiverPostCode(), 85757);
187 187 assertEquals(tradeOrderDO.getReceiverDetailAddress(), "土豆村");
188   - assertEquals(tradeOrderDO.getAfterSaleStatus(), TradeOrderAfterSaleStatusEnum.NONE.getStatus());
  188 + assertEquals(tradeOrderDO.getRefundStatus(), TradeOrderRefundStatusEnum.NONE.getStatus());
189 189 assertEquals(tradeOrderDO.getRefundPrice(), 0);
190 190 assertEquals(tradeOrderDO.getCouponPrice(), 30);
191 191 assertEquals(tradeOrderDO.getPointPrice(), 10);
... ... @@ -204,8 +204,8 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
204 204 //assertEquals(tradeOrderItemDO01.getSpuName(), sku01.getSpuName()); TODO 找不到spuName
205 205 assertEquals(tradeOrderItemDO01.getPicUrl(), sku01.getPicUrl());
206 206 assertEquals(tradeOrderItemDO01.getCount(), 3);
207   - assertEquals(tradeOrderItemDO01.getOriginalPrice(), 150);
208   - assertEquals(tradeOrderItemDO01.getOriginalUnitPrice(), 50);
  207 +// assertEquals(tradeOrderItemDO01.getOriginalPrice(), 150);
  208 + assertEquals(tradeOrderItemDO01.getPrice(), 50);
209 209 assertEquals(tradeOrderItemDO01.getDiscountPrice(), 20);
210 210 assertEquals(tradeOrderItemDO01.getPayPrice(), 130);
211 211 assertEquals(tradeOrderItemDO01.getOrderPartPrice(), 7);
... ... @@ -224,8 +224,8 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
224 224 //assertEquals(tradeOrderItemDO02.getSpuName(), sku02.getSpuName()); TODO 找不到spuName
225 225 assertEquals(tradeOrderItemDO02.getPicUrl(), sku02.getPicUrl());
226 226 assertEquals(tradeOrderItemDO02.getCount(), 4);
227   - assertEquals(tradeOrderItemDO02.getOriginalPrice(), 80);
228   - assertEquals(tradeOrderItemDO02.getOriginalUnitPrice(), 20);
  227 +// assertEquals(tradeOrderItemDO02.getOriginalPrice(), 80);
  228 + assertEquals(tradeOrderItemDO02.getPrice(), 20);
229 229 assertEquals(tradeOrderItemDO02.getDiscountPrice(), 40);
230 230 assertEquals(tradeOrderItemDO02.getPayPrice(), 40);
231 231 assertEquals(tradeOrderItemDO02.getOrderPartPrice(), 15);
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.member.controller.app.address.vo;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.Data;
4 5  
5   -import javax.validation.constraints.NotEmpty;
6 6 import javax.validation.constraints.NotNull;
7 7  
  8 +// TODO 芋艿：example 缺失
8 9 /**
9 10 * 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用
10 11 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
... ... @@ -24,10 +25,6 @@ public class AppAddressBaseVO {
24 25 @NotNull(message = "地区编号不能为空")
25 26 private Long areaId;
26 27  
27   - @Schema(description = "邮编", required = true)
28   - @NotEmpty(message = "邮编不能为空")
29   - private String postCode;
30   -
31 28 @Schema(description = "收件详细地址", required = true)
32 29 @NotNull(message = "收件详细地址不能为空")
33 30 private String detailAddress;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
  View file @d08b953
... ... @@ -41,10 +41,6 @@ public class AddressDO extends BaseDO {
41 41 */
42 42 private Long areaId;
43 43 /**
44   - * 邮编
45   - */
46   - private String postCode;
47   - /**
48 44 * 收件详细地址
49 45 */
50 46 private String detailAddress;
... ...
yudao-module-mp/yudao-module-mp-api/src/main/java/cn/iocoder/yudao/module/mp/enums/ErrorCodeConstants.java
  View file @d08b953
... ... @@ -12,7 +12,7 @@ public interface ErrorCodeConstants {
12 12 // ========== 公众号账号 1006000000============
13 13 ErrorCode ACCOUNT_NOT_EXISTS = new ErrorCode(1006000000, "公众号账号不存在");
14 14 ErrorCode ACCOUNT_GENERATE_QR_CODE_FAIL = new ErrorCode(1006000001, "生成公众号二维码失败，原因：{}");
15   - ErrorCode ACCOUNT_CLEAR_QUOTA_FAIL = new ErrorCode(1006000001, "清空公众号的 API 配额失败，原因：{}");
  15 + ErrorCode ACCOUNT_CLEAR_QUOTA_FAIL = new ErrorCode(1006000002, "清空公众号的 API 配额失败，原因：{}");
16 16  
17 17 // ========== 公众号统计 1006001000============
18 18 ErrorCode STATISTICS_GET_USER_SUMMARY_FAIL = new ErrorCode(1006001000, "获取粉丝增减数据失败，原因：{}");
... ... @@ -23,9 +23,9 @@ public interface ErrorCodeConstants {
23 23 // ========== 公众号标签 1006002000============
24 24 ErrorCode TAG_NOT_EXISTS = new ErrorCode(1006002000, "标签不存在");
25 25 ErrorCode TAG_CREATE_FAIL = new ErrorCode(1006002001, "创建标签失败，原因：{}");
26   - ErrorCode TAG_UPDATE_FAIL = new ErrorCode(1006002001, "更新标签失败，原因：{}");
27   - ErrorCode TAG_DELETE_FAIL = new ErrorCode(1006002001, "删除标签失败，原因：{}");
28   - ErrorCode TAG_GET_FAIL = new ErrorCode(1006002001, "获得标签失败，原因：{}");
  26 + ErrorCode TAG_UPDATE_FAIL = new ErrorCode(1006002002, "更新标签失败，原因：{}");
  27 + ErrorCode TAG_DELETE_FAIL = new ErrorCode(1006002003, "删除标签失败，原因：{}");
  28 + ErrorCode TAG_GET_FAIL = new ErrorCode(1006002004, "获得标签失败，原因：{}");
29 29  
30 30 // ========== 公众号粉丝 1006003000============
31 31 ErrorCode USER_NOT_EXISTS = new ErrorCode(1006003000, "粉丝不存在");
... ... @@ -43,13 +43,13 @@ public interface ErrorCodeConstants {
43 43 // ========== 公众号发布能力 1006006000============
44 44 ErrorCode FREE_PUBLISH_LIST_FAIL = new ErrorCode(1006006000, "获得已成功发布列表失败，原因：{}");
45 45 ErrorCode FREE_PUBLISH_SUBMIT_FAIL = new ErrorCode(1006006001, "提交发布失败，原因：{}");
46   - ErrorCode FREE_PUBLISH_DELETE_FAIL = new ErrorCode(1006006001, "删除发布失败，原因：{}");
  46 + ErrorCode FREE_PUBLISH_DELETE_FAIL = new ErrorCode(1006006002, "删除发布失败，原因：{}");
47 47  
48 48 // ========== 公众号草稿 1006007000============
49 49 ErrorCode DRAFT_LIST_FAIL = new ErrorCode(1006007000, "获得草稿列表失败，原因：{}");
50 50 ErrorCode DRAFT_CREATE_FAIL = new ErrorCode(1006007001, "创建草稿失败，原因：{}");
51 51 ErrorCode DRAFT_UPDATE_FAIL = new ErrorCode(1006007002, "更新草稿失败，原因：{}");
52   - ErrorCode DRAFT_DELETE_FAIL = new ErrorCode(1006007002, "删除草稿失败，原因：{}");
  52 + ErrorCode DRAFT_DELETE_FAIL = new ErrorCode(1006007003, "删除草稿失败，原因：{}");
53 53  
54 54 // ========== 公众号菜单 1006008000============
55 55 ErrorCode MENU_SAVE_FAIL = new ErrorCode(1006008000, "创建菜单失败，原因：{}");
... ...
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
  View file @d08b953
... ... @@ -10,16 +10,12 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
10 10 */
11 11 public interface ErrorCodeConstants {
12 12  
13   - /**
14   - * ========== APP 模块 1-007-000-000 ==========
15   - */
  13 + // ========== APP 模块 1007000000 ==========
16 14 ErrorCode PAY_APP_NOT_FOUND = new ErrorCode(1007000000, "App 不存在");
17 15 ErrorCode PAY_APP_IS_DISABLE = new ErrorCode(1007000002, "App 已经被禁用");
18 16 ErrorCode PAY_APP_EXIST_TRANSACTION_ORDER_CANT_DELETE = new ErrorCode(1007000003, "支付应用存在交易中的订单,无法删除");
19 17  
20   - /**
21   - * ========== CHANNEL 模块 1-007-001-000 ==========
22   - */
  18 + // ========== CHANNEL 模块 1007001000 ==========
23 19 ErrorCode PAY_CHANNEL_NOT_FOUND = new ErrorCode(1007001000, "支付渠道的配置不存在");
24 20 ErrorCode PAY_CHANNEL_IS_DISABLE = new ErrorCode(1007001001, "支付渠道已经禁用");
25 21 ErrorCode PAY_CHANNEL_CLIENT_NOT_FOUND = new ErrorCode(1007001002, "支付渠道的客户端不存在");
... ... @@ -30,44 +26,39 @@ public interface ErrorCodeConstants {
30 26 ErrorCode CHANNEL_WECHAT_VERSION_3_CERT_KEY_IS_NULL = new ErrorCode(1007001008,"微信渠道v3版本中apiclient_cert.pem不可为空");
31 27 ErrorCode PAY_CHANNEL_NOTIFY_VERIFY_FAILED = new ErrorCode(1007001009, "渠道通知校验失败");
32 28  
33   - // ========== ORDER 模块 1-007-002-000 ==========
34   -
  29 + // ========== ORDER 模块 1007002000 ==========
35 30 ErrorCode PAY_ORDER_NOT_FOUND = new ErrorCode(1007002000, "支付订单不存在");
36 31 ErrorCode PAY_ORDER_STATUS_IS_NOT_WAITING = new ErrorCode(1007002001, "支付订单不处于待支付");
37 32 ErrorCode PAY_ORDER_STATUS_IS_NOT_SUCCESS = new ErrorCode(1007002002, "支付订单不处于已支付");
38 33 ErrorCode PAY_ORDER_ERROR_USER = new ErrorCode(1007002003, "支付订单用户不正确");
39 34  
40   - /**
41   - * ========== ORDER 模块(拓展单) 1-007-003-000 ==========
42   - */
  35 + // ========== ORDER 模块(拓展单) 1007003000 ==========
43 36 ErrorCode PAY_ORDER_EXTENSION_NOT_FOUND = new ErrorCode(1007003000, "支付交易拓展单不存在");
44 37 ErrorCode PAY_ORDER_EXTENSION_STATUS_IS_NOT_WAITING = new ErrorCode(1007003001, "支付交易拓展单不处于待支付");
45 38 ErrorCode PAY_ORDER_EXTENSION_STATUS_IS_NOT_SUCCESS = new ErrorCode(1007003002, "支付订单不处于已支付");
46 39  
47   - // ========== 支付模块(退款) 1-007-006-000 ==========
  40 + // ========== 支付模块(退款) 1007006000 ==========
48 41 ErrorCode PAY_REFUND_AMOUNT_EXCEED = new ErrorCode(1007006000, "退款金额超过订单可退款金额");
49 42 ErrorCode PAY_REFUND_ALL_REFUNDED = new ErrorCode(1007006001, "订单已经全额退款");
50 43 ErrorCode PAY_REFUND_CHN_ORDER_NO_IS_NULL = new ErrorCode(1007006002, "该订单的渠道订单为空");
51 44 ErrorCode PAY_REFUND_SUCCEED = new ErrorCode(1007006003, "已经退款成功");
52 45 ErrorCode PAY_REFUND_NOT_FOUND = new ErrorCode(1007006004, "支付退款单不存在");
53 46  
54   - /**
55   - * ========== 支付商户信息 1-007-004-000 ==========
56   - */
  47 + // ========== 支付商户信息 1007004000 ==========
57 48 ErrorCode PAY_MERCHANT_NOT_EXISTS = new ErrorCode(1007004000, "支付商户信息不存在");
58 49 ErrorCode PAY_MERCHANT_EXIST_APP_CANT_DELETE = new ErrorCode(1007004001, "支付商户存在支付应用,无法删除");
59 50  
60   - // ========== 示例订单 1-007-900-000 ==========
61   - ErrorCode PAY_DEMO_ORDER_NOT_FOUND = new ErrorCode(100790000, "示例订单不存在");
62   - ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(100790001, "示例订单更新支付状态失败，订单不是【未支付】状态");
63   - ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR = new ErrorCode(100790002, "示例订单更新支付状态失败，支付单编号不匹配");
64   - ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS = new ErrorCode(100790003, "示例订单更新支付状态失败，支付单状态不是【支付成功】状态");
65   - ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH = new ErrorCode(100790004, "示例订单更新支付状态失败，支付单金额不匹配");
66   - ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_NOT_PAID = new ErrorCode(100790005, "发起退款失败，示例订单未支付");
67   - ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUNDED = new ErrorCode(100790006, "发起退款失败，示例订单已退款");
68   - ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUND_NOT_FOUND = new ErrorCode(100790007, "发起退款失败，退款订单不存在");
69   - ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUND_NOT_SUCCESS = new ErrorCode(100790008, "发起退款失败，退款订单未退款成功");
70   - ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUND_ORDER_ID_ERROR = new ErrorCode(100790008, "发起退款失败，退款单编号不匹配");
71   - ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUND_PRICE_NOT_MATCH = new ErrorCode(100790004, "发起退款失败，退款单金额不匹配");
  51 + // ========== 示例订单 1007900000 ==========
  52 + ErrorCode PAY_DEMO_ORDER_NOT_FOUND = new ErrorCode(1007900000, "示例订单不存在");
  53 + ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1007900001, "示例订单更新支付状态失败，订单不是【未支付】状态");
  54 + ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR = new ErrorCode(1007900002, "示例订单更新支付状态失败，支付单编号不匹配");
  55 + ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS = new ErrorCode(1007900003, "示例订单更新支付状态失败，支付单状态不是【支付成功】状态");
  56 + ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH = new ErrorCode(1007900004, "示例订单更新支付状态失败，支付单金额不匹配");
  57 + ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_NOT_PAID = new ErrorCode(1007900005, "发起退款失败，示例订单未支付");
  58 + ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUNDED = new ErrorCode(1007900006, "发起退款失败，示例订单已退款");
  59 + ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUND_NOT_FOUND = new ErrorCode(1007900007, "发起退款失败，退款订单不存在");
  60 + ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUND_NOT_SUCCESS = new ErrorCode(1007900008, "发起退款失败，退款订单未退款成功");
  61 + ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUND_ORDER_ID_ERROR = new ErrorCode(1007900009, "发起退款失败，退款单编号不匹配");
  62 + ErrorCode PAY_DEMO_ORDER_REFUND_FAIL_REFUND_PRICE_NOT_MATCH = new ErrorCode(1007900010, "发起退款失败，退款单金额不匹配");
72 63  
73 64 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderBaseVO.java
  View file @d08b953
... ... @@ -55,6 +55,10 @@ public class PayOrderBaseVO {
55 55 @NotNull(message = "支付金额，单位：分不能为空")
56 56 private Long amount;
57 57  
  58 + @Schema(description = "支付金额，单位：分", required = true)
  59 + @NotNull(message = "支付金额，单位：分不能为空")
  60 + private Long price;
  61 +
58 62 @Schema(description = "渠道手续费，单位：百分比")
59 63 private Double channelFeeRate;
60 64  
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.pay.controller.app.order;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.module.pay.controller.admin.order.vo.PayOrderRespVO;
4 5 import cn.iocoder.yudao.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
5 6 import cn.iocoder.yudao.module.pay.controller.app.order.vo.AppPayOrderSubmitReqVO;
6 7 import cn.iocoder.yudao.module.pay.controller.app.order.vo.AppPayOrderSubmitRespVO;
7 8 import cn.iocoder.yudao.module.pay.convert.order.PayOrderConvert;
8 9 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
9 10 import io.swagger.v3.oas.annotations.Operation;
  11 +import io.swagger.v3.oas.annotations.Parameter;
10 12 import io.swagger.v3.oas.annotations.tags.Tag;
11 13 import lombok.extern.slf4j.Slf4j;
12 14 import org.springframework.validation.annotation.Validated;
13   -import org.springframework.web.bind.annotation.PostMapping;
14   -import org.springframework.web.bind.annotation.RequestBody;
15   -import org.springframework.web.bind.annotation.RequestMapping;
16   -import org.springframework.web.bind.annotation.RestController;
  15 +import org.springframework.web.bind.annotation.*;
17 16  
18 17 import javax.annotation.Resource;
19 18  
... ... @@ -28,12 +27,20 @@ import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getCli
28 27 public class AppPayOrderController {
29 28  
30 29 @Resource
31   - private PayOrderService orderService;
  30 + private PayOrderService payOrderService;
  31 +
  32 + // TODO 芋艿：临时 demo，技术打样。
  33 + @GetMapping("/get")
  34 + @Operation(summary = "获得支付订单")
  35 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  36 + public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id) {
  37 + return success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrder(id)));
  38 + }
32 39  
33 40 @PostMapping("/submit")
34 41 @Operation(summary = "提交支付订单")
35 42 public CommonResult<AppPayOrderSubmitRespVO> submitPayOrder(@RequestBody AppPayOrderSubmitReqVO reqVO) {
36   - PayOrderSubmitRespVO respVO = orderService.submitPayOrder(reqVO, getClientIP());
  43 + PayOrderSubmitRespVO respVO = payOrderService.submitPayOrder(reqVO, getClientIP());
37 44 return success(PayOrderConvert.INSTANCE.convert3(respVO));
38 45 }
39 46  
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/order/PayOrderConvert.java
  View file @d08b953
... ... @@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedRespD
6 6 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
7 7 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderRespDTO;
8 8 import cn.iocoder.yudao.module.pay.controller.admin.order.vo.*;
9   -import cn.iocoder.yudao.module.pay.controller.app.order.vo.AppPayOrderSubmitReqVO;
10 9 import cn.iocoder.yudao.module.pay.controller.app.order.vo.AppPayOrderSubmitRespVO;
11 10 import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderDO;
12 11 import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderExtensionDO;
... ... @@ -28,6 +27,7 @@ public interface PayOrderConvert {
28 27  
29 28 PayOrderConvert INSTANCE = Mappers.getMapper(PayOrderConvert.class);
30 29  
  30 + @Mapping(source = "amount", target = "price")
31 31 PayOrderRespVO convert(PayOrderDO bean);
32 32  
33 33 PayOrderRespDTO convert2(PayOrderDO order);
... ...
yudao-module-report/yudao-module-report-api/src/main/java/cn/iocoder/yudao/module/report/enums/ErrorCodeConstants.java
  View file @d08b953
... ... @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
5 5 /**
6 6 * Report 错误码枚举类
7 7 *
8   - * system 系统，使用 1-003-000-000 段
  8 + * report 系统，使用 1-003-000-000 段
9 9 */
10 10 public interface ErrorCodeConstants {
11 11  
... ...
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
  View file @d08b953
... ... @@ -152,7 +152,7 @@ public interface ErrorCodeConstants {
152 152  
153 153 // ========== 邮件发送 1002025000 ==========
154 154 ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002025000, "模板参数({})缺失");
155   - ErrorCode MAIL_SEND_MAIL_NOT_EXISTS = new ErrorCode(1002025000, "邮箱不存在");
  155 + ErrorCode MAIL_SEND_MAIL_NOT_EXISTS = new ErrorCode(1002025001, "邮箱不存在");
156 156  
157 157 // ========== 站内信模版 1002026000 ==========
158 158 ErrorCode NOTIFY_TEMPLATE_NOT_EXISTS = new ErrorCode(1002026000, "站内信模版不存在");
... ... @@ -161,6 +161,6 @@ public interface ErrorCodeConstants {
161 161 // ========== 站内信模版 1002027000 ==========
162 162  
163 163 // ========== 站内信发送 1002028000 ==========
164   - ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002025000, "模板参数({})缺失");
  164 + ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002028000, "模板参数({})缺失");
165 165  
166 166 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.java
  View file @d08b953
... ... @@ -6,17 +6,18 @@ import cn.iocoder.yudao.framework.ip.core.Area;
6 6 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
7 7 import cn.iocoder.yudao.framework.ip.core.utils.IPUtils;
8 8 import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeRespVO;
  9 +import cn.iocoder.yudao.module.system.controller.admin.ip.vo.LazyAreaNodeRespVO;
9 10 import cn.iocoder.yudao.module.system.convert.ip.AreaConvert;
10 11 import io.swagger.v3.oas.annotations.Operation;
11 12 import io.swagger.v3.oas.annotations.Parameter;
12 13 import io.swagger.v3.oas.annotations.tags.Tag;
13 14 import org.springframework.validation.annotation.Validated;
14   -import org.springframework.web.bind.annotation.GetMapping;
15   -import org.springframework.web.bind.annotation.RequestMapping;
16   -import org.springframework.web.bind.annotation.RequestParam;
17   -import org.springframework.web.bind.annotation.RestController;
  15 +import org.springframework.web.bind.annotation.*;
18 16  
  17 +import java.util.ArrayList;
  18 +import java.util.Arrays;
19 19 import java.util.List;
  20 +import java.util.Set;
20 21  
21 22 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
22 23  
... ... @@ -34,6 +35,24 @@ public class AreaController {
34 35 return success(AreaConvert.INSTANCE.convertList(area.getChildren()));
35 36 }
36 37  
  38 + @GetMapping("/getChildrenArea")
  39 + @Operation(summary = "获得地区的下级区域")
  40 + public CommonResult<List<LazyAreaNodeRespVO>> getChildrenArea(Integer id) {
  41 + Area area = AreaUtils.getArea(id);
  42 + Assert.notNull(area, String.format("获取不到 id : %d的区域", id));
  43 + return success(AreaConvert.INSTANCE.convertList2(area.getChildren()));
  44 + }
  45 +
  46 + @PostMapping("/list")
  47 + @Operation(summary = "通过区域ids获得地区列表")
  48 + public CommonResult<List<LazyAreaNodeRespVO>> list(@RequestBody Set<Integer> areaIds) {
  49 + List<Area> areaList = new ArrayList<>(areaIds.size());
  50 + for (Integer areaId : areaIds) {
  51 + areaList.add(AreaUtils.getArea(areaId));
  52 + }
  53 + return success(AreaConvert.INSTANCE.convertList2(areaList));
  54 + }
  55 +
37 56 @GetMapping("/get-by-ip")
38 57 @Operation(summary = "获得 IP 对应的地区名")
39 58 @Parameter(name = "ip", description = "IP", required = true)
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/vo/LazyAreaNodeRespVO.java 0 → 100644
  View file @d08b953
  1 +package cn.iocoder.yudao.module.system.controller.admin.ip.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +/**
  7 + * @author jason
  8 + */
  9 +@Schema(description = "管理后台 - 懒加载地区节点 Response VO")
  10 +@Data
  11 +public class LazyAreaNodeRespVO {
  12 +
  13 + @Schema(description = "编号", required = true, example = "110000")
  14 + private Integer id;
  15 +
  16 + @Schema(description = "名字", required = true, example = "北京")
  17 + private String name;
  18 +
  19 + @Schema(description = "是否叶子节点", required = true, example = "false")
  20 + private Boolean leaf = Boolean.FALSE;
  21 +}
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/ip/AreaConvert.java
  View file @d08b953
1 1 package cn.iocoder.yudao.module.system.convert.ip;
2 2  
3 3 import cn.iocoder.yudao.framework.ip.core.Area;
  4 +import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum;
4 5 import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeRespVO;
  6 +import cn.iocoder.yudao.module.system.controller.admin.ip.vo.LazyAreaNodeRespVO;
5 7 import org.mapstruct.Mapper;
  8 +import org.mapstruct.Mapping;
  9 +import org.mapstruct.Named;
6 10 import org.mapstruct.factory.Mappers;
  11 +import org.springframework.context.annotation.Lazy;
7 12  
8 13 import java.util.List;
  14 +import java.util.Objects;
9 15  
10 16 @Mapper
11 17 public interface AreaConvert {
... ... @@ -14,4 +20,12 @@ public interface AreaConvert {
14 20  
15 21 List<AreaNodeRespVO> convertList(List<Area> list);
16 22  
  23 + List<LazyAreaNodeRespVO> convertList2(List<Area> list);
  24 +
  25 + @Mapping(source = "type", target = "leaf")
  26 + LazyAreaNodeRespVO convert(Area area);
  27 +
  28 + default Boolean convertAreaType(Integer type){
  29 + return Objects.equals(AreaTypeEnum.DISTRICT.getType(),type);
  30 + }
17 31 }
... ...