Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/application.yml
This commit is contained in:
longbinbin
2024-12-05 18:07:46 +08:00
62 changed files with 2468 additions and 154 deletions

View File

@ -1,6 +1,7 @@
package com.ycwl.basic.service.pc;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.enums.OrderStateEnum;
import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO;
@ -20,6 +21,9 @@ public interface OrderService {
ApiResponse<Integer> add(OrderAddOrUpdateReq query);
ApiResponse<Integer> update(OrderAddOrUpdateReq query);
void updateOrderState(Long orderSn, OrderStateEnum orderStateEnum, String refundReason);
ApiResponse getOrderCountByUserId(Long userId);
ApiResponse<PageInfo<OrderAppRespVO>> appPageQuery(OrderReqQuery orderReqQuery);