diff --git a/agileboot-api/src/main/java/com/agileboot/api/controller/ApprovalApiController.java b/agileboot-api/src/main/java/com/agileboot/api/controller/ApprovalApiController.java new file mode 100644 index 0000000..bceb258 --- /dev/null +++ b/agileboot-api/src/main/java/com/agileboot/api/controller/ApprovalApiController.java @@ -0,0 +1,15 @@ +package com.agileboot.api.controller; + +import com.agileboot.domain.shop.approval.ReturnApprovalApplicationService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/approval") +@CrossOrigin(origins = "*", allowedHeaders = "*") +@RequiredArgsConstructor +public class ApprovalApiController { + private final ReturnApprovalApplicationService approvalApplicationService; +} diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java index ac70468..2cfc844 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java @@ -62,6 +62,9 @@ public class ReturnApprovalDTO { @ExcelColumn(name = "审核说明") private String auditRemark; + @ExcelColumn(name = "审批状态(1待审核 2已通过 3已驳回)") + private Integer status; + @ExcelColumn(name = "审批状态") private String statusStr; } \ No newline at end of file diff --git a/sql/20250328_return_approval.sql b/sql/20250328_return_approval.sql index d35063f..eb2eb5d 100644 --- a/sql/20250328_return_approval.sql +++ b/sql/20250328_return_approval.sql @@ -7,10 +7,10 @@ CREATE TABLE `return_approval` ( `return_quantity` INT NULL COMMENT '归还数量', `goods_price` DECIMAL(15,2) NOT NULL COMMENT '商品单价', `return_amount` DECIMAL(15,2) NULL COMMENT '退还金额', - `return_images` VARCHAR(512) NOT NULL COMMENT '归还图片路径数组', - `audit_images` VARCHAR(512) NULL COMMENT '审核图片路径数组', - `return_remark` VARCHAR(512) NULL COMMENT '归还说明', - `audit_remark` VARCHAR(512) NULL COMMENT '审核说明', + `return_images` VARCHAR(2048) NOT NULL COMMENT '归还图片路径数组', + `audit_images` VARCHAR(2048) NULL COMMENT '审核图片路径数组', + `return_remark` VARCHAR(1024) NULL COMMENT '归还说明', + `audit_remark` VARCHAR(1024) NULL COMMENT '审核说明', `status` TINYINT NOT NULL DEFAULT 1 COMMENT '审批状态(1待审核 2已通过 3已驳回)', `creator_id` BIGINT NOT NULL DEFAULT 0 COMMENT '创建者ID', `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',