szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop

This commit is contained in:
Owen 2025-01-08 17:31:35 +08:00
parent e9b7e75810 1a86bf07fd
commit 17e37de2b3
3 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersPageReqVO.java
View File

@ -85,6 +85,8 @@ public class OrdersPageReqVO extends PageParam {
@Schema(description = "标旗")
private Long flag;
@Schema(description = "是否加急")
private Long isUrgent;
@Schema(description = "平台创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

1
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java
View File

@ -37,6 +37,7 @@ public interface OrdersMapper extends BaseMapperX<OrdersDO> {
.eqIfPresent(OrdersDO::getRefundStatus, reqVO.getRefundStatus())
.eqIfPresent(OrdersDO::getActiveStatus, reqVO.getActiveStatus())
.eqIfPresent(OrdersDO::getIccid, reqVO.getIccid())
.eqIfPresent(OrdersDO::getIsUrgent, reqVO.getIsUrgent())
.eqIfPresent(OrdersDO::getRealSourceId, reqVO.getRealSourceId())
.eqIfPresent(OrdersDO::getAddressMobile, reqVO.getAddressMobile())
.eqIfPresent(OrdersDO::getTrackingNumber, reqVO.getTrackingNumber())

76
yudao-server/src/main/resources/db/migration/V5.0.13__insert_order_company_to_dict.sql Normal file
View File

@ -0,0 +1,76 @@
-- 创建字典类型
INSERT INTO `system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `updater`, `deleted`)
VALUES ('快递公司', 'haoka_express_company', 0, '', '1', '1', b'0');
-- 插入字典数据
INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `updater`, `deleted`)
VALUES
(1, '申通快递', '1', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(2, '百世汇通', '3', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(3, '顺丰快递', '44', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(4, '圆通快递', '85', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(5, '中通快递', '115', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(6, '全峰快递', '116', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(7, '优速快递', '117', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(8, '邮政EMS', '118', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(9, '天天快递', '119', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(10, '京东配送', '120', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(11, '韵达快递', '121', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(12, '快捷快递', '122', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(13, '国通快递', '124', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(14, '宅急送快递', '129', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(15, '德邦快递', '131', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(16, '邮政快递包裹', '132', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(17, '速尔快递', '155', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(18, '菜鸟物流', '191', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(19, '全一快递', '201', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(20, '百世快递', '204', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(21, '京广速递', '281', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(22, '丹鸟快递', '500', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(23, '无需物流', '1000', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(24, '未知快递', '1001', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(25, '省公司自建物流', '1002', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(26, '省公司自建物流', '10002', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(27, '极兔速递', '1003', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0'),
(28, '线下派送', '1004', 'haoka_express_company', 0, '', '', NULL, '1', '1', b'0');
-- 菜单 SQL
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status, component_name
)
VALUES (
'自动生产发货', '', 2, 0, 3022,
'orders', '', 'haoka/orderProdAuto/index', 0, 'orderProdAuto'
);
SELECT @parentId1 := LAST_INSERT_ID();
-- 按钮 SQL
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'订单查询', 'haoka:orderProdAuto:query', 3, 1, @parentId1,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'订单更新', 'haoka:orderProdAuto:update', 3, 2, @parentId1,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'订单导出', 'haoka:orderProdAuto:export', 3, 3, @parentId1,
'', '', '', 0
);
INSERT INTO system_menu ( name, permission, type, sort, parent_id, path, icon, component, component_name, status)
VALUES ( '订单详情', 'haoka:orderProdAuto:query', 2, 6, 3016, 'orders-deal/detail', 'ep:comment', 'haoka/orderProdAuto/components/OrderDetail.vue', 'OrdersDetail', 0);