From e92163c601f2ccfda20a138b60ed9ad31c47e4d6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 12 十一月 2024 18:37:22 +0800
Subject: [PATCH] add:553-结算列表增加导出表格功能;562-订单列表需要增加订单的扎数统计字段
---
src/main/java/com/mzl/flower/dto/response/payment/OrderListExportDTO.java | 3 +++
src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java | 3 +++
src/main/java/com/mzl/flower/service/payment/OrderService.java | 7 ++++++-
src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java | 3 +++
src/main/java/com/mzl/flower/mapper/payment/OrderItemMapper.java | 4 ++++
src/main/resources/mapper/payment/OrderMapper.xml | 3 ++-
6 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
index 0087f32..7ec12ed 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
@@ -93,4 +93,7 @@
@ApiModelProperty(value = "留言")
private String remarks;
+
+ @ApiModelProperty(value = "订单扎数")
+ private Integer saleNum;
}
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderListExportDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderListExportDTO.java
index 480aedb..5dddbc8 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderListExportDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderListExportDTO.java
@@ -35,6 +35,9 @@
@ApiModelProperty(value = "状态")
private String statusBackendStr;
+ @ApiModelProperty(value = "订单扎数")
+ private Integer saleNum;
+
@ApiModelProperty(value = "下单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java
index 6276efa..9648ec8 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java
@@ -93,4 +93,7 @@
@ApiModelProperty(value = "留言")
private String remarks;
+
+ @ApiModelProperty(value = "订单扎数")
+ private Integer saleNum;
}
diff --git a/src/main/java/com/mzl/flower/mapper/payment/OrderItemMapper.java b/src/main/java/com/mzl/flower/mapper/payment/OrderItemMapper.java
index e60120f..950fcba 100644
--- a/src/main/java/com/mzl/flower/mapper/payment/OrderItemMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/payment/OrderItemMapper.java
@@ -6,6 +6,7 @@
import com.mzl.flower.dto.response.payment.OrderItemPlatformListDTO;
import com.mzl.flower.entity.payment.OrderItem;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;
@@ -21,4 +22,7 @@
Integer getFlowerSaleNum(@Param("startTime") LocalDateTime startTime
, @Param("endTime") LocalDateTime endTime);
+
+ @Select("select sum(num) from t_order_item where deleted = '0' and order_id = #{orderId}")
+ Integer getSumNumByOrderId(String orderId);
}
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index d8a9c9d..497b07c 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -921,6 +921,10 @@
orderIds.add(o.getId());
OrderPlatformListDTO p = new OrderPlatformListDTO();
+ //增加订单扎数
+ Integer sumNumByOrderId = orderItemMapper.getSumNumByOrderId(o.getId());
+ o.setSaleNum(sumNumByOrderId);
+
BeanUtils.copyProperties(o, p);
result.add(p);
}
@@ -1752,7 +1756,7 @@
public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO dto) {
List<OrderListExportDTO> ls = getOrderExportListBase( dto);
String[] rowsName = new String[]{"序号","订单号", "用户账号", "收货人", "收货人电话", "收货地址", "订单金额"
- , "底价", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
+ , "底价","销售扎数", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
List<Object[]> dataList = new ArrayList<>();
int sn = 1;
for (OrderListExportDTO o : ls) {
@@ -1766,6 +1770,7 @@
objs[a++] = o.getCustomerAddress();
objs[a++] = o.getTotalAmount();
objs[a++] = o.getSupplierAmount();
+ objs[a++] = o.getSaleNum();
objs[a++] = o.getStatusBackendStr();
objs[a++] = o.getCreateTime();
objs[a++] = o.getPartnerName();
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index de52af6..6bd3e15 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -296,7 +296,8 @@
code2.label as specialNeedsStr,
CONCAT(q.customer_province, q.customer_city,q.customer_region,q.customer_address) AS customerAddress,
(select Sum(COALESCE(oi.num, 0) * COALESCE(oi.supplier_price, 0))
- from t_order_item oi where order_id = q.id) supplierAmount
+ from t_order_item oi where order_id = q.id) supplierAmount,
+ (select Sum(oi.num) from t_order_item oi where order_id = q.id) saleNum
FROM t_order q
left join t_user u on q.create_by = u.id
LEFT JOIN (SELECT ct.label, ct.value from t_code_value ct where type_code = 'ORDER_STATUS_BACKEND') code ON q.status_backend = code.value
--
Gitblit v1.9.3