diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java index c92314a8..a4290467 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java @@ -254,10 +254,10 @@ public class SysWorkReviewController extends BaseController { // 修改订单状态为1 已退款 -// List sysOrderList = sysOrderService.getSysOrderByWordId(workId); + List sysOrderList = sysOrderService.getSysOrderByWordId(workId); - //消息提醒------------- + // 下架资源位 } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java index 73bbbefd..b921d0d0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java @@ -35,6 +35,8 @@ public class OrderInfo extends BaseEntity private Date refundTime; + private Long money; + public void setId(Long id){ this.id = id; } @@ -87,6 +89,16 @@ public class OrderInfo extends BaseEntity this.refundTime = refundTime; } + public Long getMoney() { + return money; + } + + public void setMoney(Long money) { + this.money = money; + } + + + @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java index f00c44d5..7764c627 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java @@ -87,4 +87,10 @@ public interface SysOrderMapper * 支付回调后根据orderId返回订单详情 * */ public SysOrderPayBackDto getSysOrderPayBackDto(Long orderId); + + /** + * + * 根据wordId返回订单列表 + * */ + public List getSysOrderByWordId(@Param("wordId") Long wordId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java index 14e33cab..ca36a2de 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java @@ -100,5 +100,5 @@ public interface ISysOrderService * * 根据wordId返回订单列表 * */ -// public List getSysOrderByWordId(Long wordId); + public List getSysOrderByWordId(Long wordId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java index 309deacd..482eb766 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java @@ -135,4 +135,13 @@ public class SysOrderServiceImpl implements ISysOrderService public SysOrderPayBackDto getSysOrderPayBackDto(Long orderId){ return sysOrderMapper.getSysOrderPayBackDto(orderId); } + + /** + * + * 根据wordId返回订单列表 + * */ + @Override + public List getSysOrderByWordId(Long wordId){ + return sysOrderMapper.getSysOrderByWordId(wordId); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml index f0afe211..33ed06f1 100644 --- a/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml @@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select order_info_id, remark, source_id, work_id from order_info + select id, order_info_id, remark, source_id, work_id, money, status, refund_time from order_info +