From 74543bbdd920848e8cfe83c316f27dfe5dccfd60 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 24 Jan 2025 14:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A2=9D=E5=A4=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=94=B6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/mapper/OrderSplitRecordMapper.java  | 4 ++++
 .../pile/service/impl/OrderSplitRecordServiceImpl.java   | 5 +++--
 .../resources/mapper/pile/OrderSplitRecordMapper.xml     | 9 +++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java
index d3e54b02f..91b47fd38 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java
@@ -28,4 +28,8 @@ public interface OrderSplitRecordMapper {
                                                    @Param("stationId") String stationId,
                                                    @Param("startTime") String startTime,
                                                    @Param("endTime") String endTime);
+
+    List<OrderSplitRecord> queryOrderSplitRecordList(@Param("adapayMemberId") String adapayMemberId,
+                                                     @Param("startTime") String startTime,
+                                                     @Param("endTime") String endTime);
 }
\ No newline at end of file
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
index 64c186865..4322cb2ad 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
@@ -16,6 +16,7 @@ import com.jsowell.pile.mapper.OrderSplitRecordMapper;
 import com.jsowell.pile.service.AdapayMemberAccountService;
 import com.jsowell.pile.service.OrderSplitRecordService;
 import com.jsowell.pile.vo.OrderInfoDetailVO;
+import com.jsowell.pile.vo.web.ExtraOrderIncomeVO;
 import com.jsowell.pile.vo.web.OrderSplitDailySummaryData;
 import com.jsowell.pile.vo.web.OrderSplitRecordVO;
 import com.jsowell.pile.vo.web.OtherSplitDetail;
@@ -231,9 +232,9 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
      * 根据merchantId, 查询从他人分账的金额
      * extra income
      */
-    public BigDecimal queryExtraIncome(String merchantId) {
+    public ExtraOrderIncomeVO queryExtraIncome(String merchantId, String startTime, String endTime) {
         AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
-        List<OrderSplitRecord> orderSplitRecords = orderSplitRecordMapper.queryOrderSplitDataList(merchantId, null, null, null);
+        List<OrderSplitRecord> orderSplitRecords = orderSplitRecordMapper.queryOrderSplitRecordList(adapayMemberAccount.getAdapayMemberId(), startTime, endTime);
         BigDecimal totalOtherSplitAmount = BigDecimal.ZERO; // 当天其他人分账金额汇总
         Map<String, List<OrderSplitRecord>> otherSplitDetailMap = Maps.newHashMap();// 当天其他人分账的记录
         return null;
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
index a1451662c..94d067d09 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
@@ -770,4 +770,13 @@
     </if>
     and trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   </select>
+
+  <select id="queryOrderSplitRecordList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from order_split_record
+    where del_flag = '0'
+    and adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}
+    and trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  </select>
 </mapper>
\ No newline at end of file