Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
#	src/main/java/com/ycwl/basic/service/pc/OrderService.java
This commit is contained in:
songmingsong
2024-12-05 17:34:37 +08:00
29 changed files with 773 additions and 32 deletions

View File

@ -4,6 +4,7 @@ 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;
import com.ycwl.basic.model.pc.order.resp.OrderRespVO;
import com.ycwl.basic.utils.ApiResponse;
@ -22,4 +23,12 @@ public interface OrderService {
void updateOrderState(Long orderSn, OrderStateEnum orderStateEnum, String refundReason);
ApiResponse getOrderCountByUserId(Long userId);
ApiResponse<PageInfo<OrderAppRespVO>> appPageQuery(OrderReqQuery orderReqQuery);
ApiResponse<OrderAppRespVO> appDetail(Long id);
}