liujie
2025-12-09 0f364ddb7716e8d3429e1ddca29f56cc85ce364c
后台
3个文件已添加
14个文件已修改
442 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageOrderController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRefundApplicationController.java 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/dto/RefundAuditDto.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TPhysicalGoodsOrderMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TRefundApplicationMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TBigGiftPackageOrder.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TPhysicalGoodsOrder.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TRefundApplication.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TPhysicalGoodsOrderService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TRefundApplicationService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPhysicalGoodsOrderServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRefundApplicationServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/vo/TRefundApplicationVo.java 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TPhysicalGoodsOrderMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TRefundApplicationMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageOrderController.java
@@ -90,6 +90,15 @@
                tBigGiftPackageOrder.setPartnerName(lastUser.getName());
            }
        }
        Integer bigGiftPackageId = tBigGiftPackageOrder.getBigGiftPackageId();
        TBigGiftPackage tBigGiftPackage = tBigGiftPackageService.getById(bigGiftPackageId);
        tBigGiftPackageOrder.setBigGiftPackageName(tBigGiftPackage.getName());
        tBigGiftPackageOrder.setBigGiftPackageCover(tBigGiftPackage.getCoverImage());
        tBigGiftPackageOrder.setBigGiftPackagePrice(tBigGiftPackage.getTotalPrice());
        tBigGiftPackageOrder.setBigGiftPackageIntro(tBigGiftPackage.getIntroduction());
        // 销量
        long count = tBigGiftPackageOrderService.count(new LambdaQueryWrapper<TBigGiftPackageOrder>().eq(TBigGiftPackageOrder::getBigGiftPackageId, bigGiftPackageId).ne(TBigGiftPackageOrder::getStatus, 5));
        tBigGiftPackageOrder.setBigGiftPackageSales((int)count);
        Integer companyId = appUser.getCompanyId();
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java
New file
@@ -0,0 +1,88 @@
package com.ruoyi.web.controller.api;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TPhysicalGoods;
import com.ruoyi.system.model.TPhysicalGoodsOrder;
import com.ruoyi.system.query.BigGiftPackageQuery;
import com.ruoyi.system.service.TPhysicalGoodsOrderService;
import com.ruoyi.system.service.TPhysicalGoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;
/**
 * <p>
 * 实物商品订单 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-12-08
 */
@RestController
@RequestMapping("/t-physical-goods-order")
@Api(tags = "(嘉视达)实物商品订单")
public class TPhysicalGoodsOrderController {
    private final TPhysicalGoodsOrderService tPhysicalGoodsOrderService;
    private final TPhysicalGoodsService tPhysicalGoodsService;
    public TPhysicalGoodsOrderController(TPhysicalGoodsOrderService tPhysicalGoodsOrderService, TPhysicalGoodsService tPhysicalGoodsService) {
        this.tPhysicalGoodsOrderService = tPhysicalGoodsOrderService;
        this.tPhysicalGoodsService = tPhysicalGoodsService;
    }
    @ApiOperation(value = "实物商品订单列表")
    @PostMapping(value = "/pageList")
    public R<Page<TPhysicalGoodsOrder>> pageList(@RequestBody BigGiftPackageQuery query) {
        Page<TPhysicalGoodsOrder> page = tPhysicalGoodsOrderService.pageList(query);
        return R.ok(page);
    }
    @ApiOperation(value = "实物商品订单详情")
    @GetMapping(value = "/detail/{id}")
    public R<TPhysicalGoodsOrder> detail(@PathVariable("id") Long id) {
        TPhysicalGoodsOrder order = tPhysicalGoodsOrderService.getById(id);
        TPhysicalGoods goods = tPhysicalGoodsService.getById(order.getPhysicalGoodsId());
        order.setPhysicalGoodsName(goods.getName());
        order.setPhysicalGoodsCover(goods.getCoverImage());
        order.setPhysicalGoodsPrice(goods.getTotalPrice());
        order.setPhysicalGoodsIntro(goods.getIntroduction());
        return R.ok(order);
    }
    @ApiOperation(value = "实物商品订单编辑")
    @PostMapping(value = "/edit")
    @Log(title = "实物商品订单-编辑", businessType = BusinessType.UPDATE)
    public R<String> edit(@RequestBody TPhysicalGoodsOrder order) {
        TPhysicalGoodsOrder goodsOrder = tPhysicalGoodsOrderService.getById(order.getId());
        if(goodsOrder.getStatus()!=1){
            return R.fail("待付款状态才可以编辑");
        }
        goodsOrder.setOrderPrice(order.getOrderPrice());
        boolean b = tPhysicalGoodsOrderService.updateById(goodsOrder);
        return R.ok("操作成功");
    }
    @ApiOperation(value = "实物商品订单删除")
    @DeleteMapping(value = "/delete/{id}")
    @Log(title = "实物商品订单-删除", businessType = BusinessType.DELETE)
    public R<String> delete(@PathVariable("id") Integer id) {
        TPhysicalGoodsOrder order = tPhysicalGoodsOrderService.getById(id);
        order.setDelFlag(1);
        boolean b = tPhysicalGoodsOrderService.updateById(order);
        return R.ok("操作成功");
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRefundApplicationController.java
@@ -1,19 +1,28 @@
package com.ruoyi.web.controller.api;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.RefundAuditDto;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TBigGiftPackage;
import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.ruoyi.system.model.TRefundApplication;
import com.ruoyi.system.query.BigGiftPackageQuery;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TBigGiftPackageOrderService;
import com.ruoyi.system.service.TBigGiftPackageService;
import com.ruoyi.system.service.TRefundApplicationService;
import com.ruoyi.system.vo.TRefundApplicationVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
/**
 * <p>
@@ -29,19 +38,95 @@
public class TRefundApplicationController {
    private final TRefundApplicationService tRefundApplicationService;
    private final TokenService tokenService;
    private final TBigGiftPackageOrderService tBigGiftPackageOrderService;
    private final TAppUserService tAppUserService;
    private final TBigGiftPackageService tBigGiftPackageService;
    public TRefundApplicationController(TRefundApplicationService tRefundApplicationService, TokenService tokenService) {
    public TRefundApplicationController(TRefundApplicationService tRefundApplicationService, TokenService tokenService, TBigGiftPackageOrderService tBigGiftPackageOrderService, TAppUserService tAppUserService, TBigGiftPackageService tBigGiftPackageService) {
        this.tRefundApplicationService = tRefundApplicationService;
        this.tokenService = tokenService;
        this.tBigGiftPackageOrderService = tBigGiftPackageOrderService;
        this.tAppUserService = tAppUserService;
        this.tBigGiftPackageService = tBigGiftPackageService;
    }
    @ApiOperation(value = "退款申请列表")
    @PostMapping(value = "/pageList")
    public R<Page<TBigGiftPackageOrder>> pageList(@RequestBody BigGiftPackageQuery query) {
        return null;
    @PostMapping(value = "/pageRefundList")
    public R<Page<TBigGiftPackageOrder>> pageRefundList(@RequestBody BigGiftPackageQuery query) {
        Page<TBigGiftPackageOrder> page = tRefundApplicationService.pageRefundList(query);
        return R.ok(page);
    }
    @ApiOperation(value = "退款申请详情")
    @GetMapping(value = "/refundDetail/{id}")
    public R<TRefundApplicationVo> refundDetail(@PathVariable Integer id) {
        TRefundApplication refundApplication = tRefundApplicationService.getById(id);
        TRefundApplicationVo vo = new TRefundApplicationVo();
        vo.setId(refundApplication.getId());
        vo.setBigGiftPackageOrderId(refundApplication.getBigGiftPackageOrderId());
        // 订单信息
        TBigGiftPackageOrder order = tBigGiftPackageOrderService.getById(refundApplication.getBigGiftPackageOrderId());
        vo.setCode(order.getCode());
        vo.setCreateTime(order.getCreateTime());
        vo.setOrderPrice(order.getOrderPrice());
        // 用户信息
        TAppUser appUser = tAppUserService.getById(order.getAppUserId());
        vo.setUserName(appUser.getName());
        vo.setPhone(appUser.getPhone());
        // 商品信息
        TBigGiftPackage tBigGiftPackage = tBigGiftPackageService.getById(order.getBigGiftPackageId());
        vo.setBigGiftPackageName(tBigGiftPackage.getName());
        vo.setBigGiftPackageCover(tBigGiftPackage.getCoverImage());
        vo.setBigGiftPackagePrice(tBigGiftPackage.getTotalPrice());
        vo.setBigGiftPackageIntro(tBigGiftPackage.getIntroduction());
        // 销量
        long count = tBigGiftPackageOrderService.count(new LambdaQueryWrapper<TBigGiftPackageOrder>().eq(TBigGiftPackageOrder::getBigGiftPackageId, order.getBigGiftPackageId()).ne(TBigGiftPackageOrder::getStatus, 5));
        vo.setBigGiftPackageSales((int)count);
        // 支付信息
        vo.setStatus(order.getStatus());
        vo.setOrderAmount(order.getOrderPrice());
        vo.setFinalPayment(order.getFinalPayment());
        vo.setPaidTime(order.getFinalPaymentTime());
        vo.setRemark(order.getRemark());
        // 退款信息
        vo.setRefundReason(refundApplication.getRefundReason());
        vo.setVoucherPicture(refundApplication.getVoucherPicture());
        vo.setRefundStatus(refundApplication.getStatus());
        // 审核信息
        vo.setAuditRemark(refundApplication.getAuditRemark());
        vo.setAuditTime(refundApplication.getAuditTime());
        return R.ok(vo);
    }
    @ApiOperation(value = "退款申请审核")
    @PostMapping(value = "/refundAudit")
    @Log(title = "退款申请-审核", businessType = BusinessType.UPDATE)
    public R<String> refundAudit(@RequestBody RefundAuditDto dto) {
        TRefundApplication refundApplication = tRefundApplicationService.getById(dto.getId());
        refundApplication.setStatus(dto.getAuditStatus());
        refundApplication.setAuditTime(LocalDateTime.now());
        refundApplication.setAuditRemark(dto.getAuditRemark());
        Long userId = tokenService.getLoginUser().getUserId();
        refundApplication.setAuditUserId(userId);
        boolean b = tRefundApplicationService.updateById(refundApplication);
        if (b && dto.getAuditStatus()==2) {
            Integer bigGiftPackageOrderId = refundApplication.getBigGiftPackageOrderId();
            TBigGiftPackageOrder tBigGiftPackageOrder = tBigGiftPackageOrderService.getById(bigGiftPackageOrderId);
            tBigGiftPackageOrder.setStatus(5);
            tBigGiftPackageOrderService.updateById(tBigGiftPackageOrder);
        }
        return R.ok("操作成功");
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -113,9 +113,9 @@
        // 用ApiInfoBuilder进行定制
        return new ApiInfoBuilder()
                // 设置标题
                .title("标题:移动社区管理系统_接口文档")
                .title("标题:嘉视达管理系统_接口文档")
                // 描述
                .description("移动社区接口文档")
                .description("嘉视达接口文档")
                // 作者信息
                .contact(new Contact(ruoyiConfig.getName(), null, null))
                // 版本
ruoyi-system/src/main/java/com/ruoyi/system/dto/RefundAuditDto.java
New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("退款审核参数Dto")
public class RefundAuditDto {
    @ApiModelProperty(value = "id")
    private Integer id;
    @ApiModelProperty(value = "审核状态2=审核通过,3=审核驳回")
    private Integer auditStatus;
    @ApiModelProperty(value = "审核原因")
    private String auditRemark;
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TPhysicalGoodsOrderMapper.java
@@ -1,7 +1,10 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.system.model.TPhysicalGoodsOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.query.BigGiftPackageQuery;
import org.apache.ibatis.annotations.Param;
/**
 * <p>
@@ -13,4 +16,6 @@
 */
public interface TPhysicalGoodsOrderMapper extends BaseMapper<TPhysicalGoodsOrder> {
    Page<TPhysicalGoodsOrder> pageList(@Param("page") Page<TPhysicalGoodsOrder> page, @Param("query") BigGiftPackageQuery query);
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TRefundApplicationMapper.java
@@ -1,7 +1,11 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.ruoyi.system.model.TRefundApplication;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.query.BigGiftPackageQuery;
import org.apache.ibatis.annotations.Param;
/**
 * <p>
@@ -13,4 +17,6 @@
 */
public interface TRefundApplicationMapper extends BaseMapper<TRefundApplication> {
    Page<TBigGiftPackageOrder> pageRefundList(@Param("page") Page<TBigGiftPackageOrder> page, @Param("query") BigGiftPackageQuery query);
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TBigGiftPackageOrder.java
@@ -118,6 +118,8 @@
    @ApiModelProperty(value = "用户手机号")
    @TableField(exist = false)
    private String phone;
@@ -138,6 +140,34 @@
    @TableField(exist = false)
    private String companyName;
    @ApiModelProperty(value = "商品名称")
    @TableField(exist = false)
    private String bigGiftPackageName;
    @ApiModelProperty(value = "审核状态1=待审核,2=审核通过,3=审核驳回")
    @TableField(exist = false)
    private Integer auditStatus;
    @ApiModelProperty(value = "商品封面")
    @TableField(exist = false)
    private String bigGiftPackageCover;
    @ApiModelProperty(value = "商品价格")
    @TableField(exist = false)
    private BigDecimal bigGiftPackagePrice;
    @ApiModelProperty(value = "商品简介")
    @TableField(exist = false)
    private String bigGiftPackageIntro;
    @ApiModelProperty(value = "商品销量")
    @TableField(exist = false)
    private Integer bigGiftPackageSales;
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TPhysicalGoodsOrder.java
@@ -93,4 +93,29 @@
    private String remark;
    @ApiModelProperty(value = "下单用户")
    @TableField(exist = false)
    private String userName;
    @ApiModelProperty(value = "下单用户手机号")
    @TableField(exist = false)
    private String phone;
    @ApiModelProperty(value = "商品名称")
    @TableField(exist = false)
    private String physicalGoodsName;
    @ApiModelProperty(value = "商品封面")
    @TableField(exist = false)
    private String physicalGoodsCover;
    @ApiModelProperty(value = "商品价格")
    @TableField(exist = false)
    private BigDecimal physicalGoodsPrice;
    @ApiModelProperty(value = "商品简介")
    @TableField(exist = false)
    private String physicalGoodsIntro;
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TRefundApplication.java
@@ -57,7 +57,7 @@
    @ApiModelProperty(value = "审核人id")
    @TableField("audit_user_id")
    private Integer auditUserId;
    private Long auditUserId;
    @ApiModelProperty(value = "审核时间")
    @TableField("audit_time")
ruoyi-system/src/main/java/com/ruoyi/system/service/TPhysicalGoodsOrderService.java
@@ -1,7 +1,9 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.system.model.TPhysicalGoodsOrder;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.query.BigGiftPackageQuery;
/**
 * <p>
@@ -13,4 +15,7 @@
 */
public interface TPhysicalGoodsOrderService extends IService<TPhysicalGoodsOrder> {
    Page<TPhysicalGoodsOrder> pageList(BigGiftPackageQuery query);
}
ruoyi-system/src/main/java/com/ruoyi/system/service/TRefundApplicationService.java
@@ -1,7 +1,10 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.ruoyi.system.model.TRefundApplication;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.query.BigGiftPackageQuery;
/**
 * <p>
@@ -13,4 +16,9 @@
 */
public interface TRefundApplicationService extends IService<TRefundApplication> {
    Page<TBigGiftPackageOrder> pageRefundList(BigGiftPackageQuery query);
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPhysicalGoodsOrderServiceImpl.java
@@ -1,7 +1,9 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.system.model.TPhysicalGoodsOrder;
import com.ruoyi.system.mapper.TPhysicalGoodsOrderMapper;
import com.ruoyi.system.query.BigGiftPackageQuery;
import com.ruoyi.system.service.TPhysicalGoodsOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -17,4 +19,9 @@
@Service
public class TPhysicalGoodsOrderServiceImpl extends ServiceImpl<TPhysicalGoodsOrderMapper, TPhysicalGoodsOrder> implements TPhysicalGoodsOrderService {
    @Override
    public Page<TPhysicalGoodsOrder> pageList(BigGiftPackageQuery query) {
        Page<TPhysicalGoodsOrder> page = new Page<>(query.getPageNum(), query.getPageSize());
        return this.baseMapper.pageList(page,query);
    }
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRefundApplicationServiceImpl.java
@@ -1,7 +1,10 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.ruoyi.system.model.TRefundApplication;
import com.ruoyi.system.mapper.TRefundApplicationMapper;
import com.ruoyi.system.query.BigGiftPackageQuery;
import com.ruoyi.system.service.TRefundApplicationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -17,4 +20,9 @@
@Service
public class TRefundApplicationServiceImpl extends ServiceImpl<TRefundApplicationMapper, TRefundApplication> implements TRefundApplicationService {
    @Override
    public Page<TBigGiftPackageOrder> pageRefundList(BigGiftPackageQuery query) {
        Page<TBigGiftPackageOrder> page = new Page<>(query.getPageNum(), query.getPageSize());
        return this.baseMapper.pageRefundList(page, query);
    }
}
ruoyi-system/src/main/java/com/ruoyi/system/vo/TRefundApplicationVo.java
New file
@@ -0,0 +1,106 @@
package com.ruoyi.system.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
 * <p>
 * 退款申请
 * </p>
 *
 * @author xiaochen
 * @since 2025-12-08
 */
@Data
@ApiModel(value="TRefundApplication对象", description="退款申请详情Vo")
public class TRefundApplicationVo implements Serializable {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value = "主键")
    private Integer id;
    @ApiModelProperty(value = "大礼包订单id")
    private Integer bigGiftPackageOrderId;
    @ApiModelProperty(value = "订单编号")
    private String code;
    @ApiModelProperty(value = "下单时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;
    @ApiModelProperty(value = "订单价格")
    private BigDecimal orderPrice;
    @ApiModelProperty(value = "用户昵称")
    private String userName;
    @ApiModelProperty(value = "用户手机号")
    private String phone;
    @ApiModelProperty(value = "商品名称")
    private String bigGiftPackageName;
    @ApiModelProperty(value = "商品封面")
    private String bigGiftPackageCover;
    @ApiModelProperty(value = "商品价格")
    private BigDecimal bigGiftPackagePrice;
    @ApiModelProperty(value = "商品简介")
    private String bigGiftPackageIntro;
    @ApiModelProperty(value = "商品销量")
    private Integer bigGiftPackageSales;
    @ApiModelProperty(value = "订单状态1=待付款,2=已付订金,3=完成支付,4=确认收货,5=已退款")
    private Integer status;
    @ApiModelProperty(value = "订单金额")
    private BigDecimal orderAmount;
    @ApiModelProperty(value = "已付尾款")
    private BigDecimal finalPayment;
    @ApiModelProperty(value = "尾款支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime paidTime;
    @ApiModelProperty(value = "备注")
    private String remark;
    @ApiModelProperty(value = "退款申请原因")
    private String refundReason;
    @ApiModelProperty(value = "退款凭证图片")
    private String voucherPicture;
    @ApiModelProperty(value = "退款状态1=待审核,2=审核通过,3=审核驳回")
    private Integer refundStatus;
    @ApiModelProperty(value = "审核原因")
    private String auditRemark;
    @ApiModelProperty(value = "审核时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime auditTime;
}
ruoyi-system/src/main/resources/mapper/system/TPhysicalGoodsOrderMapper.xml
@@ -27,4 +27,16 @@
        id, code, company_id, app_user_id, create_time, physical_goods_id, physical_goods, order_price, payment_price, status, delivery_time, payment_time, payment_method, payment_serial_number, del_flag, remark
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TPhysicalGoodsOrder">
        select t1.id,t1.code,t1.create_time as createTime,t1.order_price,t1.payment_price,t1.status,t1.del_flag,t1.remark,t2.name as userName,t2.phone,t3.name as physicalGoodsName
        from t_physical_goods_order t1
        left join t_app_user t2 on t1.app_user_id = t2.id
        left join t_physical_goods t3 on t1.physical_goods_id = t3.id
        where t1.del_flag = 0
        <if test="query.name != null and query.name != ''">
            and t3.name like concat('%',#{query.name},'%')
        </if>
        order by t1.create_time desc
    </select>
</mapper>
ruoyi-system/src/main/resources/mapper/system/TRefundApplicationMapper.xml
@@ -20,5 +20,15 @@
    <sql id="Base_Column_List">
        id, big_gift_package_order_id, applicant_user_id, applicant_time, refund_reason, voucher_picture, status, audit_user_id, audit_time, audit_remark
    </sql>
    <select id="pageRefundList" resultType="com.ruoyi.system.model.TBigGiftPackageOrder">
        select t1.id,t2.code,t2.create_time,t3.name userName,t3.phone,t2.order_price,t4.name bigGiftPackageName,t2.payment_type,t2.deposit,t2.final_payment,t1.status auditStatus from t_refund_application t1 left join t_big_gift_package_order t2 on t1.big_gift_package_order_id = t2.id
        left join t_app_user t3 on t2.app_user_id = t3.id left join t_big_gift_package t4 on t2.big_gift_package_id = t4.id
        where 1=1
        <if test="query.name != null and query.name != ''">
            and t4.name like concat('%',#{query.name},'%')
        </if>
        order by t1.applicant_time desc
    </select>
</mapper>