Merge remote-tracking branch 'origin/develop' into develop

yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersRespVO.java

@@ -259,4 +259,25 @@ public class OrdersRespVO {
     @ExcelProperty("平台创建时间")
     private LocalDateTime createTime;
 
+    /**
+     * 订单联系状态码 1未联系 2未接通 3同意 4不同意 5后续跟进 6 有资源再联系
+     */
+    @Schema(description = "订单联系状态码")
+    private Long callStatus;
+    /**
+     * 身份证人像面
+     */
+    @Schema(description = "身份证人像面")
+    private String font;
+    /**
+     * 身份证国徽面
+     */
+    @Schema(description = "身份证国徽面")
+    private String backend;
+    /**
+     * 身份证人脸
+     */
+    @Schema(description = "身份证人脸")
+    private String face;
+
 }

yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersSaveReqVO.java

@@ -187,5 +187,13 @@ public class OrdersSaveReqVO {
 
     @Schema(description = "加密详细地址")
     private String encryptAddress;
+    @Schema(description = "身份证人像面")
+    private String font;
+    @Schema(description = "身份证国徽面")
+    private String backend;
+    @Schema(description = "身份证人脸")
+    private String face;
+    @Schema(description = "订单联系状态码")
+    private Long callStatus;
 
 }

yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/orders/OrdersDO.java

@@ -275,5 +275,21 @@ public class OrdersDO extends BaseDO {
      * 加密详细地址
      */
     private String encryptAddress;
+    /**
+     * 订单联系状态码 1未联系 2未接通 3同意 4不同意 5后续跟进 6 有资源再联系
+     */
+    private Long callStatus;
+    /**
+     * 身份证人像面
+     */
+    private String font;
+    /**
+     * 身份证国徽面
+     */
+    private String backend;
+    /**
+     * 身份证人脸
+     */
+    private String face;
 
 }

yudao-server/src/main/resources/db/migration/V5.0.10__order_prod_insert_api_menu.sql

@@ -0,0 +1,48 @@
+-- 菜单 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status, component_name
+)
+VALUES (
+           '生产管理', '', 1, 3, 0,
+           '/orders', '', '', 0, ''
+       );
+-- 按钮父菜单ID
+-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
+SELECT @parentId := LAST_INSERT_ID();
+
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status, component_name
+)
+VALUES (
+    '订单审核', '', 2, 0, @parentId,
+    'orders', '', 'haoka/orderAudit/index', 0, 'orderAudit'
+);
+
+SELECT @parentId1 := LAST_INSERT_ID();
+-- 按钮 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '订单查询', 'haoka:orderAudit:query', 3, 1, @parentId1,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '订单更新', 'haoka:orderAudit:update', 3, 2, @parentId1,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '订单导出', 'haoka:orderAudit:export', 3, 3, @parentId1,
+    '', '', '', 0
+);

yudao-server/src/main/resources/db/migration/V5.0.8__order_update_table.sql

@@ -0,0 +1,6 @@
+ALTER TABLE haoka_orders ADD call_status bigint(20) NULL COMMENT '订单联系状态码';
+-- 1未联系 2未接通 3同意 4不同意 5后续跟进 6 有资源再联系
+
+ALTER TABLE haoka_orders ADD font varchar(255) NULL COMMENT '身份证人像面';
+ALTER TABLE haoka_orders ADD backend varchar(255) NULL COMMENT '身份证国徽面';
+ALTER TABLE haoka_orders ADD face varchar(255) NULL COMMENT '身份证人脸';

yudao-server/src/main/resources/db/migration/V5.0.9__order_track_insert_api_menu.sql

@@ -0,0 +1,39 @@
+-- 菜单 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status, component_name
+)
+VALUES (
+    '订单跟踪', '', 2, 0, 2912,
+    'orders', '', 'haoka/orderTrack/index', 0, 'Orders'
+);
+
+-- 按钮父菜单ID
+-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '订单查询', 'haoka:orderTrack:query', 3, 1, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '订单更新', 'haoka:orderTrack:update', 3, 3, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '订单导出', 'haoka:orderTrack:export', 3, 5, @parentId,
+    '', '', '', 0
+);