feat(审批): 修改addApproval方法返回审批模型

修改ReturnApprovalApplicationService中的addApproval方法，使其返回创建的ReturnApprovalModel对象，以便在提交审批时能够获取并返回审批模型信息。同时，更新了ApprovalApiController中的submitApproval方法，使其返回审批模型而不是简单的成功消息。

此外，新增了微信用户基本信息表（wx_user_info）的SQL脚本，用于存储微信用户的相关信息。

agileboot-admin/src/main/java/com/agileboot/admin/controller/shop/ReturnApprovalController.java

@@ -0,0 +1,68 @@
+package com.agileboot.admin.controller.shop;
+
+import com.agileboot.admin.customize.aop.accessLog.AccessLog;
+import com.agileboot.common.core.base.BaseController;
+import com.agileboot.common.core.dto.ResponseDTO;
+import com.agileboot.common.core.page.PageDTO;
+import com.agileboot.common.enums.common.BusinessTypeEnum;
+import com.agileboot.domain.common.command.BulkOperationCommand;
+import com.agileboot.domain.shop.approval.ReturnApprovalApplicationService;
+import com.agileboot.domain.shop.approval.command.AddReturnApprovalCommand;
+import com.agileboot.domain.shop.approval.command.UpdateReturnApprovalCommand;
+import com.agileboot.domain.shop.approval.db.ReturnApprovalEntity;
+import com.agileboot.domain.shop.approval.dto.ReturnApprovalDTO;
+import com.agileboot.domain.shop.approval.query.SearchReturnApprovalQuery;
+import io.swagger.v3.oas.annotations.Operation;
+import java.util.List;
+import javax.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/shop/returnApproval")
+@RequiredArgsConstructor
+@Validated
+public class ReturnApprovalController extends BaseController {
+
+    private final ReturnApprovalApplicationService approvalApplicationService;
+
+    @Operation(summary = "退货审批列表")
+    @GetMapping
+    public ResponseDTO<PageDTO<ReturnApprovalDTO>> list(SearchReturnApprovalQuery<ReturnApprovalEntity> query) {
+        PageDTO<ReturnApprovalDTO> page = approvalApplicationService.getApprovalList(query);
+        return ResponseDTO.ok(page);
+    }
+
+    @Operation(summary = "新增退货审批")
+    @AccessLog(title = "退货审批管理", businessType = BusinessTypeEnum.ADD)
+    @PostMapping
+    public ResponseDTO<Void> add(@Validated @RequestBody AddReturnApprovalCommand command) {
+        approvalApplicationService.addApproval(command);
+        return ResponseDTO.ok();
+    }
+
+    @Operation(summary = "修改退货审批")
+    @AccessLog(title = "退货审批管理", businessType = BusinessTypeEnum.MODIFY)
+    @PutMapping("/{approvalId}")
+    public ResponseDTO<Void> edit(@PathVariable Long approvalId, @Validated @RequestBody UpdateReturnApprovalCommand command) {
+        command.setApprovalId(approvalId);
+        approvalApplicationService.updateApproval(command);
+        return ResponseDTO.ok();
+    }
+
+    @Operation(summary = "删除退货审批")
+    @AccessLog(title = "退货审批管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{approvalIds}")
+    public ResponseDTO<Void> remove(@PathVariable @NotNull List<Long> approvalIds) {
+        approvalApplicationService.deleteApproval(new BulkOperationCommand<>(approvalIds));
+        return ResponseDTO.ok();
+    }
+}

agileboot-api/src/main/java/com/agileboot/api/controller/ApprovalApiController.java

@@ -0,0 +1,87 @@
+package com.agileboot.api.controller;
+
+import com.agileboot.common.core.dto.ResponseDTO;
+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;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * 审批请求控制器
+ * <p>
+ * 处理与审批相关的HTTP请求，包括退货审批的提交等操作
+ * </p>
+ */
+@RestController
+@RequestMapping("/api/approval")
+@CrossOrigin(origins = "*", allowedHeaders = "*")
+@RequiredArgsConstructor
+@Slf4j
+@Api(tags = "审批接口")
+public class ApprovalApiController {
+    
+    /** 退货审批应用服务，用于处理审批相关业务逻辑 */
+    private final ReturnApprovalApplicationService approvalApplicationService;
+    
+    /** 订单应用服务，用于处理订单相关查询操作 */
+    private final OrderApplicationService orderApplicationService;
+
+    /**
+     * 提交退货审批申请
+     * 
+     * @param command 包含审批信息的命令对象，需要包含订单ID、商品ID、退货数量及图片
+     * @return 包含操作结果的响应对象
+     * @throws ApiException 当参数校验失败或业务逻辑出错时抛出
+     */
+    @PostMapping("/submit")
+    @ApiOperation(value = "提交退货审批")
+    public ResponseDTO<ReturnApprovalModel> submitApproval(@Valid @RequestBody AddReturnApprovalCommand command) {
+        try {
+            if (null == command.getOrderId()) {
+                return ResponseDTO.fail(new ApiException(ErrorCode.Internal.INTERNAL_ERROR, "订单ID不能为空"));
+            }
+            if (null == command.getGoodsId()) {
+                return ResponseDTO.fail(new ApiException(ErrorCode.Internal.INTERNAL_ERROR, "商品ID不能为空"));
+            }
+            if (null == command.getReturnQuantity()) {
+                return ResponseDTO.fail(new ApiException(ErrorCode.Internal.INTERNAL_ERROR, "归还数量不能为空"));
+            }
+            if (StringUtils.isBlank(command.getReturnImages())) {
+                return ResponseDTO.fail(new ApiException(ErrorCode.Internal.INTERNAL_ERROR, "归还图片不能为空"));
+            }
+
+            // 查询订单商品信息
+            ShopOrderGoodsEntity orderGoods = orderApplicationService.getOrderGoodsByOrderIdAndGoodsId(command.getOrderId(), command.getGoodsId());
+            if (null == orderGoods) {
+                return ResponseDTO.fail(new ApiException(ErrorCode.Internal.INTERNAL_ERROR, "订单商品不存在"));
+            }
+            
+            // 设置商品价格并初始化审批状态
+            command.setGoodsPrice(orderGoods.getPrice());
+            command.setStatus(1);
+
+            // 执行业务逻辑
+            ReturnApprovalModel returnApprovalModel = approvalApplicationService.addApproval(command);
+            return ResponseDTO.ok(returnApprovalModel);
+        } catch (Exception e) {
+            log.error("提交审批失败", e);
+            return ResponseDTO.fail(new ApiException(ErrorCode.Internal.INTERNAL_ERROR, "提交审批失败"));
+        }
+    }
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java

@@ -0,0 +1,55 @@
+package com.agileboot.domain.shop.approval;
+
+import com.agileboot.common.core.page.PageDTO;
+import com.agileboot.domain.common.command.BulkOperationCommand;
+import com.agileboot.domain.shop.approval.command.AddReturnApprovalCommand;
+import com.agileboot.domain.shop.approval.command.UpdateReturnApprovalCommand;
+import com.agileboot.domain.shop.approval.db.ReturnApprovalEntity;
+import com.agileboot.domain.shop.approval.db.ReturnApprovalService;
+import com.agileboot.domain.shop.approval.dto.ReturnApprovalDTO;
+import com.agileboot.domain.shop.approval.model.ReturnApprovalModel;
+import com.agileboot.domain.shop.approval.model.ReturnApprovalModelFactory;
+import com.agileboot.domain.shop.approval.query.SearchReturnApprovalQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class ReturnApprovalApplicationService {
+
+    private final ReturnApprovalService approvalService;
+    private final ReturnApprovalModelFactory modelFactory;
+
+    public PageDTO<ReturnApprovalDTO> getApprovalList(SearchReturnApprovalQuery<ReturnApprovalEntity> query) {
+        Page<ReturnApprovalEntity> page = approvalService.getApprovalList(query);
+        List<ReturnApprovalDTO> dtoList = page.getRecords().stream()
+            .map(ReturnApprovalDTO::new)
+            .collect(Collectors.toList());
+        return new PageDTO<>(dtoList, page.getTotal());
+    }
+
+    public ReturnApprovalModel addApproval(AddReturnApprovalCommand command) {
+        ReturnApprovalModel model = modelFactory.create();
+        model.loadAddCommand(command);
+        model.insert();
+        return model;
+    }
+
+    public void updateApproval(UpdateReturnApprovalCommand command) {
+        ReturnApprovalModel model = modelFactory.loadById(command.getApprovalId());
+        model.loadUpdateCommand(command);
+        model.updateById();
+    }
+
+    public void deleteApproval(BulkOperationCommand<Long> command) {
+        for (Long approvalId : command.getIds()) {
+            ReturnApprovalModel model = modelFactory.loadById(approvalId);
+            model.deleteById();
+        }
+    }
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/command/AddReturnApprovalCommand.java

@@ -0,0 +1,11 @@
+package com.agileboot.domain.shop.approval.command;
+
+import com.agileboot.domain.shop.approval.db.ReturnApprovalEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AddReturnApprovalCommand extends ReturnApprovalEntity {
+
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/command/UpdateReturnApprovalCommand.java

@@ -0,0 +1,16 @@
+package com.agileboot.domain.shop.approval.command;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.PositiveOrZero;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class UpdateReturnApprovalCommand extends AddReturnApprovalCommand {
+
+    @NotNull
+    @PositiveOrZero
+    private Long approvalId;
+
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalEntity.java

@@ -0,0 +1,81 @@
+package com.agileboot.domain.shop.approval.db;
+
+import com.agileboot.common.core.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 商品归还审批表
+ * </p>
+ *
+ * @author valarchie
+ * @since 2025-04-03
+ */
+@Getter
+@Setter
+@TableName("return_approval")
+@ApiModel(value = "ReturnApprovalEntity对象", description = "商品归还审批表")
+public class ReturnApprovalEntity extends BaseEntity<ReturnApprovalEntity> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("审批编号")
+    @TableId(value = "approval_id", type = IdType.AUTO)
+    private Long approvalId;
+
+    @ApiModelProperty("关联订单ID")
+    @TableField("order_id")
+    private Long orderId;
+
+    @ApiModelProperty("关联商品ID")
+    @TableField("goods_id")
+    private Long goodsId;
+
+    @ApiModelProperty("归还数量")
+    @TableField("return_quantity")
+    private Integer returnQuantity;
+
+    @ApiModelProperty("商品单价")
+    @TableField("goods_price")
+    private BigDecimal goodsPrice;
+
+    @ApiModelProperty("退还金额")
+    @TableField("return_amount")
+    private BigDecimal returnAmount;
+
+    @ApiModelProperty("归还图片路径数组")
+    @TableField("return_images")
+    private String returnImages;
+
+    @ApiModelProperty("审核图片路径数组")
+    @TableField("audit_images")
+    private String auditImages;
+
+    @ApiModelProperty("归还说明")
+    @TableField("return_remark")
+    private String returnRemark;
+
+    @ApiModelProperty("审核说明")
+    @TableField("audit_remark")
+    private String auditRemark;
+
+    @ApiModelProperty("审批状态(1待审核 2已通过 3已驳回)")
+    @TableField("`status`")
+    private Integer status;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.approvalId;
+    }
+
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalMapper.java

@@ -0,0 +1,43 @@
+package com.agileboot.domain.shop.approval.db;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 商品归还审批表 Mapper 接口
+ * </p>
+ *
+ * @author valarchie
+ * @since 2025-04-03
+ */
+public interface ReturnApprovalMapper extends BaseMapper<ReturnApprovalEntity> {
+    @Select("SELECT approval_id, order_id, goods_id, return_quantity, goods_price, return_amount, return_images, audit_images, return_remark, audit_remark, status " +
+        "FROM return_approval " +
+        "${ew.customSqlSegment}")
+    Page<ReturnApprovalEntity> getApprovalList(
+        Page<ReturnApprovalEntity> page,
+        @Param(Constants.WRAPPER) Wrapper<ReturnApprovalEntity> queryWrapper
+    );
+
+    @Select("SELECT * " +
+        "FROM return_approval " +
+        "WHERE status = #{status} " +
+        "ORDER BY create_time DESC " +
+        "LIMIT 1")
+    ReturnApprovalEntity selectFirstByStatus(@Param("status") Integer status);
+
+    @Select("SELECT * " +
+        "FROM return_approval " +
+        "WHERE status = #{status} " +
+        "ORDER BY create_time DESC")
+    List<ReturnApprovalEntity> selectAllByStatus(@Param("status") Integer status);
+
+    @Select("SELECT * FROM return_approval WHERE order_id = #{orderId} LIMIT 1")
+    ReturnApprovalEntity selectByOrderId(@Param("orderId") Long orderId);
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalService.java

@@ -0,0 +1,24 @@
+package com.agileboot.domain.shop.approval.db;
+
+import com.agileboot.common.core.page.AbstractPageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商品归还审批表 服务类
+ * </p>
+ *
+ * @author valarchie
+ * @since 2025-04-03
+ */
+public interface ReturnApprovalService extends IService<ReturnApprovalEntity> {
+
+    Page<ReturnApprovalEntity> getApprovalList(AbstractPageQuery<ReturnApprovalEntity> query);
+    
+    List<ReturnApprovalEntity> selectAll();
+    
+    ReturnApprovalEntity getByOrderId(Long orderId);
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalServiceImpl.java

@@ -0,0 +1,41 @@
+package com.agileboot.domain.shop.approval.db;
+
+import com.agileboot.common.core.page.AbstractPageQuery;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商品归还审批表 服务实现类
+ * </p>
+ *
+ * @author valarchie
+ * @since 2025-04-03
+ */
+@Service
+public class ReturnApprovalServiceImpl extends ServiceImpl<ReturnApprovalMapper, ReturnApprovalEntity> implements ReturnApprovalService {
+
+    @Override
+    public Page<ReturnApprovalEntity> getApprovalList(AbstractPageQuery<ReturnApprovalEntity> query) {
+        return this.page(query.toPage(), query.toQueryWrapper());
+    }
+
+    @Override
+    public List<ReturnApprovalEntity> selectAll() {
+        LambdaQueryWrapper<ReturnApprovalEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByDesc(ReturnApprovalEntity::getCreateTime);
+        return this.list(wrapper);
+    }
+
+    @Override
+    public ReturnApprovalEntity getByOrderId(Long orderId) {
+        LambdaQueryWrapper<ReturnApprovalEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ReturnApprovalEntity::getOrderId, orderId)
+               .last("LIMIT 1");
+        return this.getOne(wrapper);
+    }
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java

@@ -0,0 +1,70 @@
+package com.agileboot.domain.shop.approval.dto;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.agileboot.common.annotation.ExcelColumn;
+import com.agileboot.common.annotation.ExcelSheet;
+import com.agileboot.domain.common.cache.CacheCenter;
+import com.agileboot.domain.shop.approval.db.ReturnApprovalEntity;
+import com.agileboot.domain.system.user.db.SysUserEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ExcelSheet(name = "商品归还审批列表")
+@Data
+public class ReturnApprovalDTO {
+
+    public ReturnApprovalDTO(ReturnApprovalEntity entity) {
+        if (entity != null) {
+            BeanUtil.copyProperties(entity, this);
+            
+            this.statusStr = convertStatus(entity.getStatus());
+        }
+    }
+
+    private String convertStatus(Integer status) {
+        if (status == null) return "-";
+        switch (status) {
+            case 1: return "待审核";
+            case 2: return "已通过";
+            case 3: return "已驳回";
+            default: return "未知状态";
+        }
+    }
+
+    @ExcelColumn(name = "审批编号")
+    private Long approvalId;
+
+    @ExcelColumn(name = "关联订单ID")
+    private Long orderId;
+
+    @ExcelColumn(name = "关联商品ID")
+    private Long goodsId;
+
+    @ExcelColumn(name = "归还数量")
+    private Integer returnQuantity;
+
+    @ExcelColumn(name = "商品单价")
+    private BigDecimal goodsPrice;
+
+    @ExcelColumn(name = "退还金额")
+    private BigDecimal returnAmount;
+
+    @ExcelColumn(name = "归还图片")
+    private String returnImages;
+
+    @ExcelColumn(name = "审核图片")
+    private String auditImages;
+
+    @ExcelColumn(name = "归还说明")
+    private String returnRemark;
+
+    @ExcelColumn(name = "审核说明")
+    private String auditRemark;
+
+    @ExcelColumn(name = "审批状态(1待审核 2已通过 3已驳回)")
+    private Integer status;
+
+    @ExcelColumn(name = "审批状态")
+    private String statusStr;
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/model/ReturnApprovalModel.java

@@ -0,0 +1,39 @@
+package com.agileboot.domain.shop.approval.model;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.agileboot.domain.shop.approval.command.AddReturnApprovalCommand;
+import com.agileboot.domain.shop.approval.command.UpdateReturnApprovalCommand;
+import com.agileboot.domain.shop.approval.db.ReturnApprovalEntity;
+import com.agileboot.domain.shop.approval.db.ReturnApprovalService;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ReturnApprovalModel extends ReturnApprovalEntity {
+
+    private ReturnApprovalService approvalService;
+
+    public ReturnApprovalModel(ReturnApprovalEntity entity, ReturnApprovalService approvalService) {
+        this(approvalService);
+        if (entity != null) {
+            BeanUtil.copyProperties(entity, this);
+        }
+    }
+
+    public ReturnApprovalModel(ReturnApprovalService approvalService) {
+        this.approvalService = approvalService;
+    }
+
+    public void loadAddCommand(AddReturnApprovalCommand command) {
+        if (command != null) {
+            BeanUtil.copyProperties(command, this, "approvalId");
+        }
+    }
+
+    public void loadUpdateCommand(UpdateReturnApprovalCommand command) {
+        if (command != null) {
+            loadAddCommand(command);
+        }
+    }
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/model/ReturnApprovalModelFactory.java

@@ -0,0 +1,27 @@
+package com.agileboot.domain.shop.approval.model;
+
+import com.agileboot.common.exception.ApiException;
+import com.agileboot.common.exception.error.ErrorCode;
+import com.agileboot.domain.shop.approval.db.ReturnApprovalEntity;
+import com.agileboot.domain.shop.approval.db.ReturnApprovalService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class ReturnApprovalModelFactory {
+
+    private final ReturnApprovalService approvalService;
+
+    public ReturnApprovalModel loadById(Long approvalId) {
+        ReturnApprovalEntity entity = approvalService.getById(approvalId);
+        if (entity == null) {
+            throw new ApiException(ErrorCode.Business.COMMON_OBJECT_NOT_FOUND, approvalId, "审批");
+        }
+        return new ReturnApprovalModel(entity, approvalService);
+    }
+
+    public ReturnApprovalModel create() {
+        return new ReturnApprovalModel(approvalService);
+    }
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java

@@ -0,0 +1,40 @@
+package com.agileboot.domain.shop.approval.query;
+
+import cn.hutool.core.util.StrUtil;
+import com.agileboot.common.core.page.AbstractPageQuery;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SearchReturnApprovalQuery<T> extends AbstractPageQuery<T> {
+
+    private Long approvalId;
+    private Long orderId;
+    private Long goodsId;
+    private Integer status;
+    private String returnRemark;
+    private String auditRemark;
+    private Date startTime;
+    private Date endTime;
+
+    @Override
+    public QueryWrapper<T> addQueryCondition() {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+
+        queryWrapper
+            .eq(approvalId != null, "approval_id", approvalId)
+            .eq(orderId != null, "order_id", orderId)
+            .eq(goodsId != null, "goods_id", goodsId)
+            .eq(status != null, "status", status)
+            .like(StrUtil.isNotEmpty(returnRemark), "return_remark", returnRemark)
+            .like(StrUtil.isNotEmpty(auditRemark), "audit_remark", auditRemark)
+            .between(startTime != null && endTime != null, "create_time", startTime, endTime);
+
+        this.timeRangeColumn = "create_time";
+
+        return queryWrapper;
+    }
+}

agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java

@@ -37,6 +37,8 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
+import org.checkerframework.checker.units.qual.s;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -301,4 +303,8 @@ public class OrderApplicationService {
 
         return new GetOrdersByOpenIdDTO(orderList, orderGoods, goods);
     }
+
+    public ShopOrderGoodsEntity getOrderGoodsByOrderIdAndGoodsId(Long orderId, Long goodsId) {
+        return orderGoodsService.getByOrderIdAndGoodsId(orderId, goodsId);
+    }
 }

agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderGoodsMapper.java

@@ -1,5 +1,8 @@
 package com.agileboot.domain.shop.order.db;
 
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -12,4 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ShopOrderGoodsMapper extends BaseMapper<ShopOrderGoodsEntity> {
 
+    @Select("SELECT * FROM shop_order_goods WHERE order_id = #{orderId} AND goods_id = #{goodsId} LIMIT 1")
+    ShopOrderGoodsEntity selectByOrderIdAndGoodsId(@Param("orderId") Long orderId, @Param("goodsId") Long goodsId);
+
 }

agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderGoodsService.java

@@ -11,5 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2025-03-10
  */
 public interface ShopOrderGoodsService extends IService<ShopOrderGoodsEntity> {
-
+    ShopOrderGoodsEntity getByOrderIdAndGoodsId(Long orderId, Long goodsId);
 }

agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderGoodsServiceImpl.java

@@ -14,4 +14,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class ShopOrderGoodsServiceImpl extends ServiceImpl<ShopOrderGoodsMapper, ShopOrderGoodsEntity> implements ShopOrderGoodsService {
 
+    @Override
+    public ShopOrderGoodsEntity getByOrderIdAndGoodsId(Long orderId, Long goodsId) {
+        return baseMapper.selectByOrderIdAndGoodsId(orderId, goodsId);
+    }
+
 }

agileboot-domain/src/main/resources/mapper/shop/ReturnApprovalMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.agileboot.domain.shop.approval.db.ReturnApprovalMapper">
+
+</mapper>

agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/mybatisplus/CodeGenerator.java

@@ -61,7 +61,7 @@ public class CodeGenerator {
             //生成的类 放在orm子模块下的/target/generated-code目录底下
             .module("/agileboot-orm/target/generated-code")
             .parentPackage("com.agileboot")
-            .tableName("sys_user_qy_user")
+            .tableName("return_approval")
             // 决定是否继承基类
             .isExtendsFromBaseEntity(true)
             .build();

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 '创建时间',
@@ -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='微信用户基本信息表';