Merge branch 'xin' into pxb

彭雪彬

2025-07-15 46f7c2ef3abc235e44c59be9b3c5396befc64888

 oying-system/src/main/java/com/oying/modules/sh/service/OrderOperationLogService.java

@@ -1,7 +1,5 @@
package com.oying.modules.sh.service;

import com.oying.modules.sh.domain.Order;
import com.oying.modules.sh.domain.OrderAddressSnapshot;
import com.oying.modules.sh.domain.OrderOperationLog;
import com.oying.modules.sh.domain.dto.OrderOperationLogQueryCriteria;
import java.util.List;
@@ -9,7 +7,9 @@
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.modules.sh.domain.vo.OrderResponse;
import com.oying.utils.PageResult;
import com.oying.utils.enums.OrderStatusEnum;

/**
* @description 服务接口
@@ -34,15 +34,9 @@
    List<OrderOperationLog> queryAll(OrderOperationLogQueryCriteria criteria);

    /**
    * 创建
    * @param resources /
    */
    void create(OrderOperationLog resources);

    /**
     * 创建
     */
    void create(Order order, OrderAddressSnapshot addressSnapshot);
    void create(OrderResponse response, OrderStatusEnum statusEnum, String cardName);

    /**
    * 编辑