From 17abf0608f62cdd318dba3e7b12a32ea486cb482 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 21 四月 2025 20:34:03 +0800
Subject: [PATCH] 导入导出，财务统计
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index ef321e2..f68ed57 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -583,10 +583,6 @@
orderPage.setAppUserIds(orderPage.getAppUserIds().stream().distinct().collect(Collectors.toList()));
}
-// UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
-// orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone());
-// userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
-// orderInfo.setAddress(userAddress.getRecieveAddress());
List<OrderExport> orderExportList = orderMapper.getOrderExportList(orderPage);
@@ -603,13 +599,6 @@
orderExport.setGoodsName(goods.getName());
/* orderExport.setCompanyCostPrice(goods.getOperatingCost());
orderExport.setSupplierCostPrice(goods.getShopCost());*/
- }
-
- String expressJson = orderExport.getExpressJson();
- if (StringUtils.isNotEmpty(expressJson) && !expressJson.equals("NULL")) {
- JSONObject jsonObject = JSONObject.parseObject(expressJson);
- orderExport.setExpressNum(jsonObject.getString("num"));
- orderExport.setExpressName(ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com")));
}
});
--
Gitblit v1.7.1