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 queryByOrderCodeList(@Param("orderCodeList") List orderCodeList); -} \ No newline at end of file + + List 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 getSplitOrdersInfoList(SplitOrderDTO dto); + + /** + * 根据汇付会员id查询时间段内东单分账记录 + */ + List 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 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 @@ - 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 + + - \ No newline at end of file +