Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-26 a988a89e6b0cd75a5df4691eb8196c0ef9513a05

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -246,6 +246,7 @@
        order.setOrderStatus(OrderStatus.COMPLETED.getCode());
        order.setIsCommission(0);
        order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
        order.setEndTime(LocalDateTime.now());
        orderMapper.updateById(order);
    }