1

foodnexus-module-mall/foodnexus-module-order/src/main/java/cn/iocoder/foodnexus/module/order/controller/admin/customerorder/vo/CustomerOrderRespVO.java

 package cn.iocoder.foodnexus.module.order.controller.admin.customerorder.vo;
 
 import cn.iocoder.foodnexus.module.erp.api.vo.warehouse.WarehouseInfo;
+import cn.iocoder.foodnexus.module.order.controller.admin.customerorderrecord.vo.CustomerOrderRecordRespVO;
 import cn.iocoder.foodnexus.module.order.dto.CustomerAddressInfo;
 import cn.iocoder.foodnexus.module.order.dal.dataobject.customerorder.CustomerOrderRemark;
 import cn.iocoder.foodnexus.module.order.enums.CustomerOrderStatus;
@@ -9,6 +10,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.time.LocalDateTime;
+import java.util.List;
+
 import cn.idev.excel.annotation.*;
 import cn.iocoder.foodnexus.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.foodnexus.framework.excel.core.convert.DictConvert;
@@ -35,6 +38,8 @@ public class CustomerOrderRespVO {
     @ExcelProperty("客户id")
     private Long customerId;
 
+    private String customerName;
+
     @Schema(description = "收获仓库id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27065")
     @ExcelProperty("收获仓库id")
     private Long warehouseId;
@@ -93,4 +98,7 @@ public class CustomerOrderRespVO {
     @Schema(description = "订单备注")
     private CustomerOrderRemark orderRemark;
 
+    @Schema(description = "当前订单进度")
+    private List<CustomerOrderRecordRespVO> currentRecords;
+
 }
\ No newline at end of file

foodnexus-module-mall/foodnexus-module-order/src/main/java/cn/iocoder/foodnexus/module/order/controller/app/customerOrder/AppCustomerOrderController.java

@@ -92,14 +92,18 @@ public class AppCustomerOrderController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     public CommonResult<CustomerOrderRespVO> getCustomerOrder(@RequestParam("id") Long id) {
         CustomerOrderDO customerOrder = customerOrderService.getCustomerOrder(id);
-        return success(BeanUtils.toBean(customerOrder, CustomerOrderRespVO.class));
+        return success(BeanUtils.toBean(customerOrder, CustomerOrderRespVO.class, item -> {
+            item.setCurrentRecords(customerOrderRecordService.queryCurrentRecords(item.getId(), item.getOrderStatus()));
+        }));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得客户总订单分页")
     public CommonResult<PageResult<CustomerOrderRespVO>> getCustomerOrderPage(@Valid CustomerOrderPageReqVO pageReqVO) {
         PageResult<CustomerOrderDO> pageResult = customerOrderService.getCustomerOrderPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, CustomerOrderRespVO.class));
+        return success(BeanUtils.toBean(pageResult, CustomerOrderRespVO.class, item -> {
+            item.setCurrentRecords(customerOrderRecordService.queryCurrentRecords(item.getId(), item.getOrderStatus()));
+        }));
     }
 
     @GetMapping("/record")

foodnexus-module-mall/foodnexus-module-order/src/main/java/cn/iocoder/foodnexus/module/order/service/customerorderrecord/CustomerOrderRecordService.java

@@ -3,6 +3,7 @@ package cn.iocoder.foodnexus.module.order.service.customerorderrecord;
 import java.util.*;
 
 import cn.iocoder.foodnexus.module.order.controller.admin.customerorder.vo.CustomerOrderRecordMapVO;
+import cn.iocoder.foodnexus.module.order.enums.CustomerOrderStatus;
 import jakarta.validation.*;
 import cn.iocoder.foodnexus.module.order.controller.admin.customerorderrecord.vo.*;
 import cn.iocoder.foodnexus.module.order.dal.dataobject.customerorderrecord.CustomerOrderRecordDO;
@@ -63,8 +64,10 @@ public interface CustomerOrderRecordService {
 
     /**
      * 订单进度记录
-     * @param id
+     * @param customerOrderId
      * @return
      */
-    List<CustomerOrderRecordMapVO> queryRecordMap(Long id);
+    List<CustomerOrderRecordMapVO> queryRecordMap(Long customerOrderId);
+
+    List<CustomerOrderRecordRespVO> queryCurrentRecords(Long customerOrderId, CustomerOrderStatus orderStatus);
 }
\ No newline at end of file

foodnexus-module-mall/foodnexus-module-order/src/main/java/cn/iocoder/foodnexus/module/order/service/customerorderrecord/CustomerOrderRecordServiceImpl.java

@@ -122,6 +122,12 @@ public class CustomerOrderRecordServiceImpl implements CustomerOrderRecordServic
     }
 
     @Override
+    public List<CustomerOrderRecordRespVO> queryCurrentRecords(Long customerOrderId, CustomerOrderStatus orderStatus) {
+        return BeanUtils.toBean(customerOrderRecordMapper.selectList(CustomerOrderRecordDO::getCustomerOrderId, customerOrderId,
+                CustomerOrderRecordDO::getOrderStatus, orderStatus), CustomerOrderRecordRespVO.class);
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public void recordEvent(CustomerOrderRecordEvent event) {
         SpringUtils.getApplicationContext().publishEvent(event);
@@ -135,10 +141,6 @@ public class CustomerOrderRecordServiceImpl implements CustomerOrderRecordServic
         CustomerOrderStatus orderStatus = event.getOrderStatus();
         CustomerOrderDTO orderInfo = customerOrderApi.queryById(orderId);
 
-        if (!orderStatus.equals(orderInfo.getOrderStatus())) {
-            return ;
-        }
-
         String message = String.format(orderStatus.getText(), event.getCopyWriter().toArray(new String[0]));
 
         CustomerOrderRecordSaveReqVO saveReqVO = new CustomerOrderRecordSaveReqVO();