From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 bd94f8a..752d42e 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
@@ -1,12 +1,14 @@
package com.ruoyi.order.controller;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.account.api.feignClient.UserAddressClient;
import com.ruoyi.account.api.model.UserAddress;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -17,6 +19,7 @@
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
+import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
@@ -33,6 +36,8 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -312,6 +317,10 @@
orderStatisticsDetail.setServiceTotal(serviceTotal);
orderStatisticsDetail.setSingleTotal(singleTotal);
orderStatisticsDetail.setTotal(total);
+
+ orderStatisticsDetail.setServiceTotalMoney(serviceTotalMoney);
+ orderStatisticsDetail.setSingleTotalMoney(singleTotalMoney);
+ orderStatisticsDetail.setTotalMoney(totalMoney);
orderStatisticsDetails.add(orderStatisticsDetail);
});
Integer shopId = null;
@@ -320,7 +329,17 @@
}
OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime, shopId);
if(null != orderStatistics){
- orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ List<OrderStatisticsDetail> sortedDetails = orderStatisticsDetails.stream()
+ .sorted(Comparator.comparing((OrderStatisticsDetail detail) -> {
+ try {
+ return dateFormat.parse(detail.getDate());
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ }).reversed())
+ .collect(Collectors.toList());
+ orderStatistics.setOrderStatisticsDetailList(sortedDetails);
}
return R.ok(orderStatistics);
}
@@ -408,9 +427,28 @@
*/
@PostMapping("/getAppUserByShoppingShop")
public R<Set<Long>> getAppUserByShoppingShop(@RequestParam("shopId") Integer shopId){
- List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getShopId, shopId).eq(Order::getDelFlag, 0).eq(Order::getPayStatus, 2).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8)));
+ List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getShopId, shopId).eq(Order::getDelFlag, 0)
+ .eq(Order::getPayStatus, 2).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8)));
Set<Long> collect = list.stream().map(Order::getAppUserId).collect(Collectors.toSet());
return R.ok(collect);
}
+
+
+ /**
+ * 获取订单快递明细
+ * @param id
+ * @return
+ */
+ @GetMapping("/getOrderExpress/{id}")
+ @ApiOperation(value = "获取订单快递明细", tags = {"小程序-订单管理"})
+ public R<MapTrackKD100Vo> getOrderExpress(@PathVariable("id") Long id){
+ Order order = orderService.getById(id);
+ String expressResult = order.getExpressResult();
+ if(StringUtils.isNotEmpty(expressResult)){
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(expressResult, MapTrackKD100Vo.class);
+ return R.ok(mapTrackKD100Vo);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1