From f04bb37f47ff1eb51e5e8c42d73514c1e9c33710 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 20 八月 2024 17:22:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java index 1753120..2cb8469 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java @@ -2,6 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.order.api.model.TChargingOrder; +import com.ruoyi.order.dto.GetNoInvoicedOrder; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * <p> @@ -11,6 +17,29 @@ * @author xiaochen * @since 2024-08-07 */ +@Mapper public interface TChargingOrderMapper extends BaseMapper<TChargingOrder> { - + + + /** + * 获取小程序充电记录列表数据 + * @param appUserId + * @param type + * @param pageCurr + * @param pageSize + * @return + */ + List<TChargingOrder> getMyChargingOrderList(@Param("appUserId") Long appUserId, @Param("type") Integer type, + @Param("pageCurr") Integer pageCurr, @Param("pageSize") Integer pageSize); + + + /** + * 获取待开票订单列表 + * @param month 筛选时间2024-01-01 + * @param pageCurr + * @param pageSize + * @return + */ + List<TChargingOrder> getNoInvoicedOrder(@Param("appUserId") Long appUserId, @Param("month") String month, + @Param("pageCurr") Integer pageCurr, @Param("pageSize") Integer pageSize); } -- Gitblit v1.7.1