From 3be86b24b494d71f5f95bfea315529b2459ff3cd Mon Sep 17 00:00:00 2001 From: chuzhichao Date: Fri, 30 Jun 2023 13:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=B8=80=E7=AC=94=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=89=80=E8=B4=AD=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cyl/manager/oms/pojo/request/ManagerOrderQueryRequest.java | 2 +- .../src/main/java/com/cyl/manager/oms/service/OrderService.java | 2 ++ ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerOrderQueryRequest.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerOrderQueryRequest.java index 0c52b4a..80e3852 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerOrderQueryRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerOrderQueryRequest.java @@ -15,7 +15,7 @@ public class ManagerOrderQueryRequest { private Long orderId; @ApiModelProperty(name = "orderSn", value = "订单编号", required = true, dataType = "String") - private Long orderSn; + private String orderSn; @ApiModelProperty(name = "productId", value = "商品id", required = true, dataType = "Long") diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java index 1c13609..adf83e9 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java @@ -173,6 +173,7 @@ public class OrderService { .stream().collect(Collectors.groupingBy(OrderItem::getOrderId)); groupedOrderItemMap.keySet().forEach(key -> { ManagerOrderVO managerOrderVO = orderMap.get(key); + managerOrderVO.setBuyNum(0); List orderItemList = groupedOrderItemMap.get(key); List addProductList = new ArrayList<>(); orderItemList.forEach(item -> { @@ -184,6 +185,7 @@ public class OrderService { vo.setProductId(item.getProductId()); vo.setSpData(item.getSpData()); addProductList.add(vo); + managerOrderVO.setBuyNum(managerOrderVO.getBuyNum() + item.getQuantity()); }); managerOrderVO.setProductList(addProductList); }); diff --git a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml index 7201bab..5307c6e 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml @@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -- left join oms_order_item b on a.id = b.order_id left join ums_member c on a.member_id = c.id where a.aftersale_status = 1 - + and a.order_sn = #{orderSn}