From 4f3c752c62365ce41e1b3f762f314bba66c8e822 Mon Sep 17 00:00:00 2001 From: yangqingyuan Date: Tue, 20 Aug 2024 22:04:18 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=80=80=E5=8D=95=E8=A2=AB?= =?UTF-8?q?=E6=8B=92=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=BF=94=E5=9B=9E=E8=A2=AB?= =?UTF-8?q?=E6=8B=92=E7=8A=B6=E6=80=81=E4=BB=A5=E5=8F=8A=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/shop/controller/OrderController.java | 12 ++++++++++++ src/main/java/com/gxwebsoft/shop/entity/Order.java | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java index 9dbbe09..001f751 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java @@ -86,6 +86,9 @@ public class OrderController extends BaseController { @Resource private OrderPayService orderPayService; + @Resource + private OrderRefundService orderRefundService; + @PreAuthorize("hasAuthority('shop:order:list')") @OperationLog @@ -134,10 +137,12 @@ public class OrderController extends BaseController { List equipmentList = equipmentService.list(Wrappers.lambdaQuery(Equipment.class).in(Equipment::getEquipmentId, equipmentIds)); List equipmentOrderGoodsList = equipmentOrderGoodsService.list(Wrappers.lambdaQuery(EquipmentOrderGoods.class).in(EquipmentOrderGoods::getOrderId, orderIds)); List orderPayList = orderPayService.list(Wrappers.lambdaQuery(OrderPay.class).eq(OrderPay::getPayStatus,20).in(OrderPay::getRentOrderId, orderIds)); + List orderRefundList = orderRefundService.list(Wrappers.lambdaQuery(OrderRefund.class).eq(OrderRefund::getAuditStatus,30).in(OrderRefund::getOrderId, orderIds)); // Map> equipmentCollect = equipmentList.stream().collect(Collectors.groupingBy(Equipment::getEquipmentId)); Map equipmentCollect = equipmentList.stream().collect(Collectors.toMap(Equipment::getEquipmentId, e->e)); Map> equipmentOrderGoodsCollect = equipmentOrderGoodsList.stream().collect(Collectors.groupingBy(EquipmentOrderGoods::getOrderId)); Map> orderPayCollect = orderPayList.stream().collect(Collectors.groupingBy(OrderPay::getRentOrderId)); + Map> orderRefundCollect = orderRefundList.stream().collect(Collectors.groupingBy(OrderRefund::getOrderId)); // 查询订单的设备 for (Order order : list) { @@ -150,6 +155,13 @@ public class OrderController extends BaseController { order.setTotalPayPrice(BigDecimal.ZERO); } + //查看是否有被拒绝 + List orderRefunds =orderRefundCollect.get(order.getOrderId()); + if (null != orderRefunds && !orderRefunds.isEmpty()){ + order.setIsRefund(orderRefunds.get(0).getAuditStatus());//这里只有一条 + order.setRefuseDesc(orderRefunds.get(0).getRefuseDesc()); + } + final OrderGoodsParam orderGoodsParam = new OrderGoodsParam(); orderGoodsParam.setOrderId(order.getOrderId()); List equipmentOrderGoods = equipmentOrderGoodsCollect.get(order.getOrderId()); diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java index b2513ec..2d1f968 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/Order.java +++ b/src/main/java/com/gxwebsoft/shop/entity/Order.java @@ -332,6 +332,10 @@ public class Order implements Serializable { @TableField(exist = false) private Integer isRefund; + @ApiModelProperty(value = "商家拒绝原因(说明)") + @TableField(exist = false) + private String refuseDesc; + @ApiModelProperty(value = "订单交费总数") @TableField(exist = false) private BigDecimal totalPayPrice;