diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java index 287536d67..0dacb435a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java @@ -132,4 +132,6 @@ public interface AdapayMemberAccountMapper { * @return */ AdapayMemberAccount selectRecentInfoByMerchantId(String merchantId); -} \ No newline at end of file + + List selectUsedAdapayMemberIdByMerchantId(String merchantId); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java index 19bf9576d..c9f9d2751 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java @@ -122,4 +122,6 @@ public interface AdapayMemberAccountService { * @return */ AdapayMemberAccount selectRecentInfoByMerchantId(String merchantId); + + List selectUsedAdapayMemberIdByMerchantId(String merchantId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java index 17b51de3a..bb3ef5304 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java @@ -273,5 +273,13 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic public AdapayMemberAccount selectRecentInfoByMerchantId(String merchantId) { return adapayMemberAccountMapper.selectRecentInfoByMerchantId(merchantId); } + + /** + * 根据运营商id 查询该运营商所有使用过的AdapayMemberId + */ + @Override + public List selectUsedAdapayMemberIdByMerchantId(String merchantId) { + return adapayMemberAccountMapper.selectUsedAdapayMemberIdByMerchantId(merchantId); + } } 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 ad1486a02..5842f13b9 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 @@ -187,6 +187,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { } // 根据merchantId查询汇付账户信息 AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); + List usedAdapayMemberIdList = adapayMemberAccountService.selectUsedAdapayMemberIdByMerchantId(merchantId); // 按天分组, 组装结果集 key 为 tradeDate, value 为该天的订单分账记录 Map> dailyRecordMap = orderSplitRecords.stream().collect(Collectors.groupingBy(OrderSplitRecord::getTradeDate)); // 按天分组 key 为 tradeDate, value 为该天的订单分账记录 @@ -216,7 +217,9 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { orderCodeSet.remove(record.getOrderCode()); } // 区分运营商自己分账的金额, 和他人的分账金额 - if (adapayMemberAccount != null && adapayMemberAccount.getAdapayMemberId().equals(record.getAdapayMemberId())) { + // if (adapayMemberAccount != null && adapayMemberAccount.getAdapayMemberId().equals(record.getAdapayMemberId())) { + // record.getAdapayMemberId() 存在usedAdapayMemberIdList + if (CollectionUtils.isNotEmpty(usedAdapayMemberIdList) && usedAdapayMemberIdList.contains(record.getAdapayMemberId())) { totalMerchantSplitAmount = totalMerchantSplitAmount.add(record.getElectricitySplitAmount()).add(record.getServiceSplitAmount()); } else { totalOtherSplitAmount = totalOtherSplitAmount.add(record.getElectricitySplitAmount()).add(record.getServiceSplitAmount()); diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml index 3a6e96999..f6e6893ef 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml @@ -18,12 +18,12 @@ - id, `status`, merchant_id, adapay_member_id, settle_account_id, remark, create_time, + id, `status`, merchant_id, adapay_member_id, settle_account_id, remark, create_time, create_by, update_time, update_by, del_flag - \ No newline at end of file + + +