From 3a6c70ccfece562accad0a3e3ae67745815d73a7 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期三, 18 九月 2024 19:17:45 +0800
Subject: [PATCH] 结算订单号
---
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java | 3 +++
src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml | 2 +-
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java | 3 +++
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
index ae4e3cb..b6abfbb 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
@@ -85,4 +85,7 @@
@JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
@DateTimeFormat
private LocalDateTime receiveTime;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
}
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
index b2dd6bf..dc86c02 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
@@ -52,4 +52,7 @@
@JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
@DateTimeFormat
private LocalDateTime checkTime;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
}
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 832228f..0de6831 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -45,7 +45,7 @@
SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
, ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
, ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee
- , ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time
+ , ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time, o.order_no
, (select count(1) from t_order_item_sales sa where sa.order_item_id = oi.id) salesNum
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
diff --git a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
index ad5158e..4521617 100644
--- a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
+++ b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.mzl.flower.mapper.payment.OrderSettlementDetailMapper">
<select id="selectSettlementDetailList" resultType="com.mzl.flower.dto.response.payment.OrderSettlementDetailDTO">
- SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time
+ SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time, o.order_no
FROM t_order_settlement_detail s
join t_order_item oi on oi.id = s.order_item_id
join t_order o on o.id = s.order_id
--
Gitblit v1.9.3