From 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:28:52 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderAddressSnapshotServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderAddressSnapshotServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderAddressSnapshotServiceImpl.java
index bfa0821..ccf61e8 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderAddressSnapshotServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderAddressSnapshotServiceImpl.java
@@ -41,6 +41,11 @@
}
@Override
+ public OrderAddressSnapshot queryByOrderNum(String orderNum) {
+ return orderAddressSnapshotMapper.queryByOrderNum(orderNum);
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public void create(OrderAddressSnapshot resources) {
orderAddressSnapshotMapper.insert(resources);
@@ -65,7 +70,7 @@
List<Map<String, Object>> list = new ArrayList<>();
for (OrderAddressSnapshot orderAddressSnapshot : all) {
Map<String, Object> map = new LinkedHashMap<>();
- map.put("订单ID", orderAddressSnapshot.getOrderId());
+ map.put("订单号", orderAddressSnapshot.getOrderNum());
map.put("收货人姓名", orderAddressSnapshot.getReceiverName());
map.put("收货人电话", orderAddressSnapshot.getReceiverPhone());
map.put("省份", orderAddressSnapshot.getProvince());
@@ -75,7 +80,7 @@
map.put("详细地址", orderAddressSnapshot.getDetail());
map.put("经度", orderAddressSnapshot.getLongitude());
map.put("纬度", orderAddressSnapshot.getLatitude());
- map.put("地址标签(家/公司/学校等)", orderAddressSnapshot.getTag());
+ map.put("地址标签", orderAddressSnapshot.getTag());
list.add(map);
}
FileUtil.downloadExcel(list, response);
--
Gitblit v1.9.3