From ae69d718d0b417974dafbe2ce98a429a89101152 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 一月 2025 15:18:50 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 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 af5b99b..a62c6df 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;
@@ -14,9 +16,12 @@
import com.ruoyi.order.enums.OrderStatus;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.service.RefundPassService;
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;
@@ -66,6 +71,8 @@
private OrderMapper orderMapper;
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private RefundPassService refundPassService;
/**
@@ -202,6 +209,7 @@
public R<Void> updateOrderStatus(@RequestBody Order order){
Order order1 = orderService.getById(order.getId());
order1.setOrderStatus(order.getOrderStatus());
+ order1.setOldOrderStatus(order.getOldOrderStatus());
orderService.updateById(order1);
return R.ok();
}
@@ -263,6 +271,10 @@
@ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
+ RefundPass refundPass = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderId).one();
+ if (refundPass!=null){
+ orderInfo.setRefundPassId(refundPass.getId().toString());
+ }
return R.ok(orderInfo);
}
@@ -283,8 +295,10 @@
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
- List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>().eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
- .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+ List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
+ .eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
+ .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+ .orderByAsc(Order::getCreateTime));
Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
@@ -424,9 +438,52 @@
*/
@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();
+ }
+
+
+ /**
+ * 根据id获取订单详情
+ * @param id
+ * @return
+ */
+ @PostMapping("/getOrderById")
+ public R<Order> getOrderById(@RequestParam("id") Long id){
+ Order order = orderService.getById(id);
+ return R.ok(order);
+ }
+
+
+ /**
+ * 修改订单
+ * @param order
+ * @return
+ */
+ @PostMapping("/editOrder")
+ public R editOrder(@RequestBody Order order){
+ orderService.updateById(order);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1