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 | 21 +++++----------------
1 files changed, 5 insertions(+), 16 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 593366c..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
@@ -301,7 +301,7 @@
@PutMapping("/cancelOrder/{orderId}")
- @ApiOperation(value = "取消订单操作", tags = {"管理后台-订单管理"})
+ @ApiOperation(value = "取消订单操作", tags = {"后台-订单管理"})
public R cancelOrder(@PathVariable("orderId") Long orderId) {
return orderService.cancelOrder(orderId);
}
@@ -322,8 +322,8 @@
@GetMapping("/getOrderPageList")
- @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", })
- public R<PageInfo<OrderPageListVo>> getOrderPageList(OrderPageList orderPageList) {
+ @ApiOperation(value = "获取订单列表", tags = {"后台-订单管理", })
+ public R<PageInfo<OrderManagePageListVO>> getOrderPageList(OrderPageList orderPageList) {
return R.ok(orderService.getOrderPageList(orderPageList));
}
@@ -545,7 +545,7 @@
*/
@GetMapping("/exportExpress")
public void exportExpress(HttpServletResponse response, OrderPageList orderPage) {
- //搜索条件，用户姓名
+ /* //搜索条件，用户姓名
if (StringUtils.isNotEmpty(orderPage.getUserName())) {
List<AppUser> data = appUserClient.getAppUserByNameNoFilter(orderPage.getUserName()).getData();
List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
@@ -559,7 +559,7 @@
} else {
orderPage.setAppUserIds(collect);
}
- }
+ }*/
//搜索条件，用户电话
if (StringUtils.isNotEmpty(orderPage.getPhone())) {
List<AppUser> data = appUserClient.getAppUserByPhoneNoFilter(orderPage.getPhone()).getData();
@@ -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