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 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 orderSplitRecords = orderSplitRecordMapper.queryOrderSplitDataList(merchantId, null, null, null); + List orderSplitRecords = orderSplitRecordMapper.queryOrderSplitRecordList(adapayMemberAccount.getAdapayMemberId(), startTime, endTime); BigDecimal totalOtherSplitAmount = BigDecimal.ZERO; // 当天其他人分账金额汇总 Map> 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 @@ and trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR} + + \ No newline at end of file