update 财务中心 计算金额

jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java

@@ -132,4 +132,6 @@ public interface AdapayMemberAccountMapper {
      * @return
      */
     AdapayMemberAccount selectRecentInfoByMerchantId(String merchantId);
+
+    List<String> selectUsedAdapayMemberIdByMerchantId(String merchantId);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java

@@ -122,4 +122,6 @@ public interface AdapayMemberAccountService {
      * @return
      */
     AdapayMemberAccount selectRecentInfoByMerchantId(String merchantId);
+
+    List<String> selectUsedAdapayMemberIdByMerchantId(String merchantId);
 }

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<String> selectUsedAdapayMemberIdByMerchantId(String merchantId) {
+        return adapayMemberAccountMapper.selectUsedAdapayMemberIdByMerchantId(merchantId);
+    }
 }
 

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<String> usedAdapayMemberIdList = adapayMemberAccountService.selectUsedAdapayMemberIdByMerchantId(merchantId);
         // 按天分组, 组装结果集 key 为 tradeDate, value 为该天的订单分账记录
         Map<String, List<OrderSplitRecord>> 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());

jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml

@@ -544,4 +544,11 @@
     order by create_time desc
     limit 1
   </select>
+
+  <select id="selectUsedAdapayMemberIdByMerchantId" resultType="java.lang.String">
+    select
+      adapay_member_id
+    from adapay_member_account
+    where merchant_id = #{merchantId,jdbcType=VARCHAR}
+  </select>
 </mapper>