售后订单

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/Order.java

@@ -104,6 +104,10 @@ public class Order extends BaseTimeEntity {
      * 应付价格
      */
     private BigDecimal totalPrice;
+    /**
+     * 护工ID
+     */
+    private Long workerId;
     /**
      * 订单取消方式(10用户取消,20平台取消,30未支付自动取消)
      */

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/bo/OrderBo.java

@@ -117,6 +117,11 @@ public class OrderBo extends BaseEntity {
      */
     @ApiModelProperty(value = "应付价格", required = true)
     private BigDecimal totalPrice;
+    /**
+     * 护工ID
+     */
+    @ApiModelProperty(value = "护工ID", required = true)
+    private Long workerId;
 
     /**
      * 开始日期(查询用)

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/vo/OrderVo.java

@@ -183,6 +183,11 @@ public class OrderVo {
     @ExcelProperty(value = "应付金额", order = 15)
     @ApiModelProperty("应付价格")
     private BigDecimal totalPrice;
+    /**
+     * 护工ID
+     */
+    @ApiModelProperty("护工ID")
+    private Long workerId;
 
     /**
      * 订单取消方式(10用户取消,20平台取消,30未支付自动取消)

ruoyi-info/src/main/java/com/ruoyi/info/order/service/impl/OrderServiceImpl.java

@@ -108,6 +108,7 @@ public class OrderServiceImpl implements IOrderService {
         lqw.eq(bo.getOrderNum() != null, Order::getOrderNum, bo.getOrderNum());
         lqw.eq(bo.getSellingPrice() != null, Order::getSellingPrice, bo.getSellingPrice());
         lqw.eq(bo.getTotalPrice() != null, Order::getTotalPrice, bo.getTotalPrice());
+        lqw.eq(bo.getWorkerId() != null, Order::getWorkerId, bo.getWorkerId());
         //日期
         buildTime(bo);
         lqw.ge(bo.getStartTime() != null, Order::getCreateTime, bo.getStartTime());

ruoyi-info/src/main/resources/mapper/order/OrderMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderNum" column="order_num"/>
         <result property="sellingPrice" column="selling_price"/>
         <result property="totalPrice" column="total_price"/>
+        <result property="workerId" column="worker_id"/>
         <result property="cancellationMethod" column="cancellation_method"/>
         <result property="cancellationTime" column="cancellation_time"/>
         <result property="cancellationReason" column="cancellation_reason"/>

script/sql/baifc-0928.sql

@@ -90,3 +90,61 @@ CREATE TABLE `tb_teacher_department_rel`
     `update_by`              varchar(64)           DEFAULT '' COMMENT '更新者',
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='管理老师管理科室关联表';
+
+DROP TABLE IF EXISTS `tb_order_refund`;
+CREATE TABLE `tb_order_refund`  (
+    `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `order_id` bigint(0) NOT NULL DEFAULT 0 COMMENT '订单ID',
+    `refund_reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款原因',
+    `refund_quantity` int(0) NOT NULL COMMENT '退款数量',
+    `refund_amount` decimal(10, 2) NOT NULL COMMENT '退款金额',
+    `refund_way` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款方式',
+    `refund_desc` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款说明',
+    `refund_status` tinyint(0) NOT NULL COMMENT '退款状态',
+    `actual_refund_amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '实退金额',
+    `operation_reason` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作原因',
+    `operation_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
+    `operator_id` bigint(0) NULL DEFAULT NULL COMMENT '操作人',
+    `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+    `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX `inx_order_id`(`order_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '售后订单' ROW_FORMAT = Dynamic;
+
+DROP TABLE IF EXISTS `tb_order_reviews`;
+CREATE TABLE `tb_order_reviews`  (
+     `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+     `order_id` bigint(0) NOT NULL DEFAULT 0 COMMENT '订单ID',
+     `user_id` bigint(0) NOT NULL DEFAULT 0 COMMENT 'C端用户ID',
+     `service_attitude` tinyint(0) NULL DEFAULT NULL COMMENT '服务态度（0-5星级）',
+     `dress_appearance` tinyint(0) NULL DEFAULT NULL COMMENT '着装仪态（0-5星级）',
+     `communication_ability` tinyint(0) NULL DEFAULT NULL COMMENT '沟通能力（0-5星级）',
+     `content` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '内容',
+     `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+     `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+     PRIMARY KEY (`id`) USING BTREE,
+     INDEX `inx_order_id`(`order_id`) USING BTREE,
+     INDEX `inx_user_id`(`user_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单评价' ROW_FORMAT = Dynamic;
+
+DROP TABLE IF EXISTS `tb_order_worker_change_record`;
+CREATE TABLE `tb_order_worker_change_record`  (
+      `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+      `order_id` bigint(0) NOT NULL DEFAULT 0 COMMENT '订单ID',
+      `worker_id` bigint(0) NOT NULL COMMENT '护工ID',
+      `worker_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '护工姓名',
+      `worker_phone_number` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '护工手机号',
+      `sex` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '性别 1-男 2-女',
+      `operating_teacher_id` bigint(0) NOT NULL COMMENT '操作老师主键',
+      `worker_start_time` datetime(0) NULL DEFAULT NULL COMMENT '护工开始时间',
+      `worker_end_time` datetime(0) NULL DEFAULT NULL COMMENT '护工结束时间',
+      `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+      `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+      PRIMARY KEY (`id`) USING BTREE,
+      INDEX `inx_order_id`(`order_id`) USING BTREE,
+      INDEX `inx_worker_id`(`worker_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单更换分配护工记录' ROW_FORMAT = Dynamic;
+
+ALTER TABLE `tb_order`
+    ADD COLUMN `worker_id` bigint NULL COMMENT '护工ID' AFTER `total_price`,
+ADD INDEX `inx_worker_id`(`worker_id`);