新增后台配送订单详情与取消功能，优化订单处理逻辑

杨刚
1 parent 2f424bcf
Showing 6 changed files with 118 additions and 17 deletions
src/main/java/com/diligrp/rider/controller/AdminRiderController.java
src/main/java/com/diligrp/rider/service/AdminRiderService.java
src/main/java/com/diligrp/rider/service/DeliveryOrderService.java
src/main/java/com/diligrp/rider/service/impl/AdminRiderServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/DeliveryFeeServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/DeliveryOrderServiceImpl.java
@@ -7,6 +7,7 @@ import com.diligrp.rider.entity.Orders;
 import com.diligrp.rider.entity.Rider;
 import com.diligrp.rider.mapper.OrdersMapper;
 import com.diligrp.rider.service.AdminRiderService;
+import com.diligrp.rider.vo.DeliveryOrderCreateVO;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -117,20 +118,20 @@ public class AdminRiderController {
      */
     @GetMapping("/order/list")
     public Result<List<Orders>> orderList(
+            @RequestParam(required = false) Long cityId,
             @RequestParam(required = false) Integer status,
             @RequestParam(required = false) Integer isTrans,
             @RequestParam(required = false) String keyword,
             @RequestParam(defaultValue = "1") int page,
             HttpServletRequest request) {
-        Long cityId = (Long) request.getAttribute("cityId");
-        String role = (String) request.getAttribute("role");
+        Long scopedCityId = resolveQueryCityId(request, cityId);
  
         LambdaQueryWrapper<Orders> wrapper = new LambdaQueryWrapper<Orders>()
                 .eq(Orders::getIsDel, 0)
                 .orderByDesc(Orders::getId);
  
-        if ("substation".equals(role) && cityId != null) {
-            wrapper.eq(Orders::getCityId, cityId);
+        if (scopedCityId != null) {
+            wrapper.eq(Orders::getCityId, scopedCityId);
         }
         if (status != null) wrapper.eq(Orders::getStatus, status);
         if (isTrans != null) wrapper.eq(Orders::getIsTrans, isTrans);
@@ -152,6 +153,7 @@ public class AdminRiderController {
      */
     @GetMapping("/order/delivery/list")
     public Result<List<Orders>> deliveryOrderList(
+            @RequestParam(required = false) Long cityId,
             @RequestParam(required = false) String appKey,
             @RequestParam(required = false) String outOrderNo,
             @RequestParam(required = false) Integer status,
@@ -160,9 +162,9 @@ public class AdminRiderController {
         LambdaQueryWrapper<Orders> wrapper = new LambdaQueryWrapper<Orders>()
                 .eq(Orders::getIsDel, 0)
                 .orderByDesc(Orders::getId);
-        Long cityId = resolveScopedCityId(request);
-        if (cityId != null) {
-            wrapper.eq(Orders::getCityId, cityId);
+        Long scopedCityId = resolveQueryCityId(request, cityId);
+        if (scopedCityId != null) {
+            wrapper.eq(Orders::getCityId, scopedCityId);
         }
         if (appKey != null && !appKey.isBlank()) wrapper.eq(Orders::getAppKey, appKey);
         if (outOrderNo != null && !outOrderNo.isBlank()) wrapper.like(Orders::getOutOrderNo, outOrderNo);
@@ -172,9 +174,25 @@ public class AdminRiderController {
         return Result.success(ordersMapper.selectList(wrapper));
     }
  
+    @GetMapping("/order/delivery/detail")
+    public Result<DeliveryOrderCreateVO> deliveryDetail(@RequestParam Long orderId, HttpServletRequest request) {
+        return Result.success(adminRiderService.deliveryDetail(orderId, resolveScopedCityId(request)));
+    }
+
+    @PostMapping("/order/delivery/cancel")
+    public Result<Void> cancelDeliveryOrder(@RequestParam Long orderId, HttpServletRequest request) {
+        adminRiderService.cancelDeliveryOrder(orderId, resolveScopedCityId(request));
+        return Result.success();
+    }
+
     private Long resolveScopedCityId(HttpServletRequest request) {
         return "substation".equals(request.getAttribute("role"))
                 ? (Long) request.getAttribute("cityId")
                 : null;
     }
+
+    private Long resolveQueryCityId(HttpServletRequest request, Long queryCityId) {
+        Long scopedCityId = resolveScopedCityId(request);
+        return scopedCityId != null ? scopedCityId : queryCityId;
+    }
 }
@@ -2,6 +2,7 @@ package com.diligrp.rider.service;
  
 import com.diligrp.rider.dto.AdminRiderAddDTO;
 import com.diligrp.rider.entity.Rider;
+import com.diligrp.rider.vo.DeliveryOrderCreateVO;
  
 import java.util.List;
  
@@ -25,4 +26,8 @@ public interface AdminRiderService {
     void designate(Long orderId, Long riderId, Long cityId);
     /** 处理转单申请（1=通过 3=拒绝） */
     void setTrans(Long orderId, int trans, Long cityId);
+    /** 配送订单详情 */
+    DeliveryOrderCreateVO deliveryDetail(Long orderId, Long cityId);
+    /** 后台取消配送订单 */
+    void cancelDeliveryOrder(Long orderId, Long cityId);
 }
 package com.diligrp.rider.service;
  
 import com.diligrp.rider.dto.DeliveryOrderCreateDTO;
+import com.diligrp.rider.entity.Orders;
 import com.diligrp.rider.vo.DeliveryOrderCreateVO;
  
 public interface DeliveryOrderService {
@@ -18,4 +19,10 @@ public interface DeliveryOrderService {
  
     /** 取消订单（仅 status=2 可取消） */
     void cancel(String appKey, String outOrderNo);
+
+    /** 后台查看配送订单详情 */
+    DeliveryOrderCreateVO getAdminDetail(Orders order);
+
+    /** 后台取消配送订单 */
+    void cancelByAdmin(Orders order);
 }
@@ -15,6 +15,8 @@ import com.diligrp.rider.mapper.RiderMapper;
 import com.diligrp.rider.entity.*;
 import com.diligrp.rider.mapper.*;
 import com.diligrp.rider.service.AdminRiderService;
+import com.diligrp.rider.service.DeliveryOrderService;
+import com.diligrp.rider.vo.DeliveryOrderCreateVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,6 +39,7 @@ public class AdminRiderServiceImpl implements AdminRiderService {
     private final OrdersMapper ordersMapper;
     private final RiderBalanceMapper balanceMapper;
     private final AdminScopeGuard adminScopeGuard;
+    private final DeliveryOrderService deliveryOrderService;
  
     @Override
     public void add(AdminRiderAddDTO dto, Long cityId) {
@@ -227,6 +230,22 @@ public class AdminRiderServiceImpl implements AdminRiderService {
         if (updated == 0) throw new BizException("操作失败，请重试");
     }
  
+    @Override
+    public DeliveryOrderCreateVO deliveryDetail(Long orderId, Long cityId) {
+        Orders order = ordersMapper.selectById(orderId);
+        if (order == null) throw new BizException("订单不存在");
+        adminScopeGuard.assertCityAccessible(cityId, order.getCityId());
+        return deliveryOrderService.getAdminDetail(order);
+    }
+
+    @Override
+    public void cancelDeliveryOrder(Long orderId, Long cityId) {
+        Orders order = ordersMapper.selectById(orderId);
+        if (order == null) throw new BizException("订单不存在");
+        adminScopeGuard.assertCityAccessible(cityId, order.getCityId());
+        deliveryOrderService.cancelByAdmin(order);
+    }
+
     private String encryptPass(String pass) {
         return DigestUtils.md5DigestAsHex(pass.getBytes(StandardCharsets.UTF_8));
     }
@@ -45,9 +45,9 @@ public class DeliveryFeeServiceImpl implements DeliveryFeeService {
         }
  
         int orderType = dto.getOrderType();
-        if (!pricingConfig.getType().contains(orderType)) {
-            throw new BizException("当前城市未开通该类型服务");
-        }
+//        if (!pricingConfig.getType().contains(orderType)) {
+//            throw new BizException("当前城市未开通该类型服务");
+//        }
  
         // 获取该订单类型的配送费配置
         DeliveryPricingRuleDTO typeConfig = getTypeConfig(pricingConfig, orderType);
@@ -105,6 +105,7 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
         // 6. 构建 extra 信息
         Map<String, Object> extra = new HashMap<>();
         extra.put("distance", fee.getDistance());
+        extra.put("estimatedMinutes", fee.getEstimatedMinutes());
         extra.put("weight", dto.getWeight());
         extra.put("pieces", feeDTO.getPieces());
         extra.put("remark", dto.getRemark());
@@ -186,12 +187,7 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
     public DeliveryOrderCreateVO queryByOutOrderNo(String appKey, String outOrderNo) {
         getApp(appKey);
         Orders order = getOrderByOutNo(appKey, outOrderNo);
-        DeliveryFeeResultVO feeVO = new DeliveryFeeResultVO();
-        feeVO.setMoneyBasic(order.getMoneyDelivery());
-        feeVO.setMoneyDistance(BigDecimal.ZERO);
-        feeVO.setMoneyTime(BigDecimal.ZERO);
-        feeVO.setTotalFee(order.getMoneyDelivery());
-        return toCreateVO(order, feeVO);
+        return toCreateVO(order, buildFeeVO(order));
     }
  
     @Override
@@ -199,17 +195,73 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
     public void cancel(String appKey, String outOrderNo) {
         getApp(appKey);
         Orders order = getOrderByOutNo(appKey, outOrderNo);
+        cancelInternal(order);
+    }
+
+    @Override
+    public DeliveryOrderCreateVO getAdminDetail(Orders order) {
+        return toCreateVO(order, buildFeeVO(order));
+    }
+
+    @Override
+    @Transactional
+    public void cancelByAdmin(Orders order) {
+        cancelInternal(order);
+    }
+
+    // ---- 私有方法 ----
+
+    private void cancelInternal(Orders order) {
         if (order.getStatus() != 2) {
             throw new BizException("订单已接单或已完成，无法取消");
         }
         ordersMapper.update(null, new LambdaUpdateWrapper<Orders>()
                 .eq(Orders::getId, order.getId())
+                .eq(Orders::getStatus, 2)
                 .set(Orders::getStatus, 10));
         order.setStatus(10);
         notifyCallback(order, "order.cancelled");
     }
  
-    // ---- 私有方法 ----
+    private DeliveryFeeResultVO buildFeeVO(Orders order) {
+        DeliveryFeeResultVO feeVO = new DeliveryFeeResultVO();
+        feeVO.setMoneyBasic(order.getMoneyDelivery());
+        feeVO.setMoneyDistance(BigDecimal.ZERO);
+        feeVO.setMoneyTime(BigDecimal.ZERO);
+        feeVO.setTotalFee(order.getMoneyDelivery());
+        feeVO.setDistance(readDistance(order));
+        feeVO.setEstimatedMinutes(readEstimatedMinutes(order));
+        return feeVO;
+    }
+
+    private BigDecimal readDistance(Orders order) {
+        if (order.getExtra() == null || order.getExtra().isBlank()) {
+            return BigDecimal.ZERO;
+        }
+        try {
+            Map<String, Object> extraMap = objectMapper.readValue(order.getExtra(), Map.class);
+            Object distance = extraMap.get("distance");
+            return distance == null ? BigDecimal.ZERO : new BigDecimal(String.valueOf(distance));
+        } catch (Exception e) {
+            return BigDecimal.ZERO;
+        }
+    }
+
+    private Integer readEstimatedMinutes(Orders order) {
+        if (order.getExtra() == null || order.getExtra().isBlank()) {
+            return 0;
+        }
+        try {
+            Map<String, Object> extraMap = objectMapper.readValue(order.getExtra(), Map.class);
+            Object estimatedMinutes = extraMap.get("estimatedMinutes");
+            if (estimatedMinutes == null) {
+                return 0;
+            }
+            return Integer.parseInt(String.valueOf(estimatedMinutes));
+        } catch (Exception e) {
+            return 0;
+        }
+    }
  
     private OpenApp getApp(String appKey) {
         OpenApp app = openAppMapper.selectOne(new LambdaQueryWrapper<OpenApp>()