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 index 87ec696..2cf8374 100644 --- a/agileboot-api/src/main/java/com/agileboot/api/controller/ApprovalApiController.java +++ b/agileboot-api/src/main/java/com/agileboot/api/controller/ApprovalApiController.java @@ -5,6 +5,7 @@ import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.domain.shop.approval.ReturnApprovalApplicationService; import com.agileboot.domain.shop.approval.command.AddReturnApprovalCommand; +import com.agileboot.domain.shop.approval.model.ReturnApprovalModel; import com.agileboot.domain.shop.order.OrderApplicationService; import com.agileboot.domain.shop.order.db.ShopOrderGoodsEntity; @@ -50,7 +51,7 @@ public class ApprovalApiController { */ @PostMapping("/submit") @ApiOperation(value = "提交退货审批") - public ResponseDTO submitApproval(@Valid @RequestBody AddReturnApprovalCommand command) { + public ResponseDTO submitApproval(@Valid @RequestBody AddReturnApprovalCommand command) { try { if (null == command.getOrderId()) { return ResponseDTO.fail(new ApiException(ErrorCode.Internal.INTERNAL_ERROR, "订单ID不能为空")); @@ -76,8 +77,8 @@ public class ApprovalApiController { command.setStatus(1); // 执行业务逻辑 - approvalApplicationService.addApproval(command); - return ResponseDTO.ok("审批提交成功"); + ReturnApprovalModel returnApprovalModel = approvalApplicationService.addApproval(command); + return ResponseDTO.ok(returnApprovalModel); } catch (Exception e) { log.error("提交审批失败", e); return ResponseDTO.fail(new ApiException(ErrorCode.Internal.INTERNAL_ERROR, "提交审批失败")); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java index 1486051..8c2b9dd 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java @@ -33,10 +33,11 @@ public class ReturnApprovalApplicationService { return new PageDTO<>(dtoList, page.getTotal()); } - public void addApproval(AddReturnApprovalCommand command) { + public ReturnApprovalModel addApproval(AddReturnApprovalCommand command) { ReturnApprovalModel model = modelFactory.create(); model.loadAddCommand(command); model.insert(); + return model; } public void updateApproval(UpdateReturnApprovalCommand command) { diff --git a/sql/20250328_return_approval.sql b/sql/20250328_return_approval.sql index eb2eb5d..3942fde 100644 --- a/sql/20250328_return_approval.sql +++ b/sql/20250328_return_approval.sql @@ -25,3 +25,19 @@ CREATE TABLE `return_approval` ( CONSTRAINT `fk_return_goods` FOREIGN KEY (`goods_id`) REFERENCES `shop_goods` (`goods_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='商品归还审批表'; +DROP TABLE IF EXISTS `wx_user_info`; + +CREATE TABLE `wx_user_info` ( + `wx_user_id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '微信用户唯一ID', + `openid` VARCHAR(128) NOT NULL COMMENT '微信开放平台唯一标识', + `nickname` VARCHAR(64) NULL COMMENT '用户昵称', + `sex` TINYINT NULL COMMENT '性别(0未知 1男 2女)', + `mobile` VARCHAR(15) NULL COMMENT '手机号码', + `creator_id` BIGINT NULL DEFAULT 0 COMMENT '创建者ID', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater_id` BIGINT NULL DEFAULT 0 COMMENT '更新者ID', + `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '删除标志(0存在 1删除)', + PRIMARY KEY (`wx_user_id`), + UNIQUE KEY `uk_openid` (`openid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='微信用户基本信息表'; \ No newline at end of file