Merge remote-tracking branch 'origin/master'

xuhy

2024-08-27 b79c0fa3aa4f7dffe18ab419b6cf4ed47ebd22f9

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java

@@ -4,6 +4,7 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.query.ShoppingOrderQuery;
import com.ruoyi.order.api.query.TActivityStatisticsQuery;
import com.ruoyi.order.api.vo.TActivityStatisticslVO;
import com.ruoyi.order.api.vo.TActivityVO;
@@ -59,4 +60,9 @@
     * @return
     */
    List<MyShoppingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query);

    void callBack(String code,String outTradeNo);

    PageInfo<TShoppingOrder> pageList(ShoppingOrderQuery query);

}