From 984c102eb4e632985e45b7c4be1545c53c87b589 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 十二月 2024 21:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v5' into master-v5
---
src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java b/src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java
index 689e2c3..add35ab 100644
--- a/src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java
@@ -6,6 +6,7 @@
import com.mzl.flower.dto.response.payment.OrderSettlementListDTO;
import com.mzl.flower.entity.payment.OrderSettlement;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.math.BigDecimal;
@@ -15,5 +16,10 @@
public interface OrderSettlementMapper extends BaseMapper<OrderSettlement> {
List<OrderSettlementListDTO> selectSettlementList(Page page, @Param("condition") OrderSettlementQueryDTO dto);
+ List<OrderSettlementListDTO> selectSettlementListInfo(Page page, @Param("condition") OrderSettlementQueryDTO dto);
+
BigDecimal getUserIncome(@Param("userId") String userId);
+
+ @Select("select * from t_order_settlement where id = #{id}")
+ OrderSettlement selectOrderSettlementById(String id);
}
--
Gitblit v1.9.3