From b5d7c188a7ce68d62d3f4836193c1e6cc019df50 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 24 Mar 2025 11:08:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=B4=A6=E6=98=8E=E7=BB=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/mapper/OrderSplitRecordMapper.java   |  4 +-
 .../pile/service/OrderSplitRecordService.java |  5 +++
 .../impl/OrderSplitRecordServiceImpl.java     |  5 +++
 .../mapper/pile/OrderSplitRecordMapper.xml    | 45 +++++++++++--------
 4 files changed, 40 insertions(+), 19 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 ebc01d3f1..8cc30d15c 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
@@ -39,4 +39,6 @@ public interface OrderSplitRecordMapper {
      * @return
      */
     List<OrderSplitRecord> queryByOrderCodeList(@Param("orderCodeList") List<String> orderCodeList);
-}
\ No newline at end of file
+
+    List<OrderSplitRecord> queryOrderSplitRecordByMemberId(@Param("adapayMemberId") String adapayMemberId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+}
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
index 63af37fc1..e74f34bc4 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
@@ -68,5 +68,10 @@ public interface OrderSplitRecordService {
      * @return
      */
     List<SplitOrdersInfoVO> getSplitOrdersInfoList(SplitOrderDTO dto);
+
+    /**
+     * 根据汇付会员id查询时间段内东单分账记录
+     */
+    List<OrderSplitRecord> queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime);
 }
 
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 7e0b55e91..985a44e22 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
@@ -251,6 +251,11 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
         return null;
     }
 
+    @Override
+    public List<OrderSplitRecord> queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime) {
+        return orderSplitRecordMapper.queryOrderSplitRecordByMemberId(adapayMemberId, startTime, endTime);
+    }
+
     /**
      * 根据merchantId, 查询从他人分账的金额
      * extra income
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
index 59601079f..87caf79e3 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
@@ -30,14 +30,14 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, order_code, merchant_id, station_id, `status`, settle_amount, electricity_amount, 
-    service_amount, trade_date, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio, 
-    electricity_split_amount, service_split_ratio, service_split_amount, fee_amount, 
+    id, order_code, merchant_id, station_id, `status`, settle_amount, electricity_amount,
+    service_amount, trade_date, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio,
+    electricity_split_amount, service_split_ratio, service_split_amount, fee_amount,
     remark, create_by, create_time, update_by, update_time, del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--@mbg.generated-->
-    select 
+    select
     <include refid="Base_Column_List" />
     from order_split_record
     where id = #{id,jdbcType=INTEGER}
@@ -427,20 +427,20 @@
   <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
     <!--@mbg.generated-->
     insert into order_split_record
-    (order_code, merchant_id, station_id, `status`, settle_amount, electricity_amount, 
-      service_amount, trade_date, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio, 
-      electricity_split_amount, service_split_ratio, service_split_amount, fee_amount, 
+    (order_code, merchant_id, station_id, `status`, settle_amount, electricity_amount,
+      service_amount, trade_date, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio,
+      electricity_split_amount, service_split_ratio, service_split_amount, fee_amount,
       remark, create_by, create_time, update_by, update_time, del_flag)
     values
     <foreach collection="list" item="item" separator=",">
-      (#{item.orderCode,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, 
-        #{item.status,jdbcType=VARCHAR}, #{item.settleAmount,jdbcType=DECIMAL}, #{item.electricityAmount,jdbcType=DECIMAL}, 
-        #{item.serviceAmount,jdbcType=DECIMAL}, #{item.tradeDate,jdbcType=VARCHAR}, #{item.adapayMemberId,jdbcType=VARCHAR}, 
-        #{item.paymentId,jdbcType=VARCHAR}, #{item.paymentConfirmId,jdbcType=VARCHAR}, 
-        #{item.electricitySplitRatio,jdbcType=DECIMAL}, #{item.electricitySplitAmount,jdbcType=DECIMAL}, 
-        #{item.serviceSplitRatio,jdbcType=DECIMAL}, #{item.serviceSplitAmount,jdbcType=DECIMAL}, 
-        #{item.feeAmount,jdbcType=DECIMAL}, #{item.remark,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, 
-        #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      (#{item.orderCode,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR},
+        #{item.status,jdbcType=VARCHAR}, #{item.settleAmount,jdbcType=DECIMAL}, #{item.electricityAmount,jdbcType=DECIMAL},
+        #{item.serviceAmount,jdbcType=DECIMAL}, #{item.tradeDate,jdbcType=VARCHAR}, #{item.adapayMemberId,jdbcType=VARCHAR},
+        #{item.paymentId,jdbcType=VARCHAR}, #{item.paymentConfirmId,jdbcType=VARCHAR},
+        #{item.electricitySplitRatio,jdbcType=DECIMAL}, #{item.electricitySplitAmount,jdbcType=DECIMAL},
+        #{item.serviceSplitRatio,jdbcType=DECIMAL}, #{item.serviceSplitAmount,jdbcType=DECIMAL},
+        #{item.feeAmount,jdbcType=DECIMAL}, #{item.remark,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR},
+        #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.delFlag,jdbcType=VARCHAR})
     </foreach>
   </insert>
@@ -502,7 +502,7 @@
       #{updateTime,jdbcType=TIMESTAMP},
       #{delFlag,jdbcType=VARCHAR},
     </trim>
-    on duplicate key update 
+    on duplicate key update
     <trim suffixOverrides=",">
       <if test="id != null">
         id = #{id,jdbcType=INTEGER},
@@ -677,7 +677,7 @@
         #{delFlag,jdbcType=VARCHAR},
       </if>
     </trim>
-    on duplicate key update 
+    on duplicate key update
     <trim suffixOverrides=",">
       <if test="id != null">
         id = #{id,jdbcType=INTEGER},
@@ -780,6 +780,15 @@
     and trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   </select>
 
+  <select id="queryOrderSplitRecordByMemberId" 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>
+
   <select id="queryByOrderCodeList" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
@@ -790,4 +799,4 @@
       #{item}
     </foreach>
   </select>
-</mapper>
\ No newline at end of file
+</mapper>