update 汇付

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

@@ -39,4 +39,6 @@ public interface ClearingBillInfoMapper {
     List<MerchantClearingBillVO> getMerchantClearingBillList(GetClearingBillDTO dto);
 
     List<ClearingBillInfo> selectByWithdrawCode(@Param("withdrawCode") String withdrawCode);
-}
+
+    int countBlockingByMerchantId(@Param("merchantId") String merchantId);
+}

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

@@ -73,4 +73,6 @@ public interface ClearingWithdrawInfoMapper {
     List<ClearingWithdrawInfo> selectByMerchantId(@Param("merchantId") String merchantId);
 
     BigDecimal queryTotalWithdraw(String merchantId);
-}
+
+    int countProcessingByMerchantId(@Param("merchantId") String merchantId);
+}

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

@@ -27,4 +27,6 @@ public interface OrderUnsplitRecordMapper {
     int insertOrUpdateSelective(OrderUnsplitRecord record);
 
     List<OrderUnsplitRecord> queryUnsplitOrders(@Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    int countUnsplitByMerchantId(@Param("merchantId") String merchantId);
 }

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

@@ -40,5 +40,6 @@ public interface ClearingBillInfoService {
     ClearingBillInfo selectByMerchantIdAndTradeDate(String merchantId, String tradeDate);
 
     List<ClearingBillInfo> selectByWithdrawCode(String withdrawCode);
-}
 
+    int countBlockingByMerchantId(String merchantId);
+}

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

@@ -44,4 +44,6 @@ public interface ClearingWithdrawInfoService{
 
     BigDecimal queryTotalWithdraw(String merchantId);
 
+    int countProcessingByMerchantId(String merchantId);
+
 }

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

@@ -10,4 +10,6 @@ public interface OrderUnsplitRecordService {
     List<OrderUnsplitRecord> queryUnsplitOrders(String startTime, String endTime);
 
     void updateOrderUnsplitRecord(OrderUnsplitRecord orderUnsplitRecord);
+
+    int countUnsplitByMerchantId(String merchantId);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java

@@ -205,7 +205,17 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic
 
     @Override
     public void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount) {
+        String merchantId = adapayMemberAccount.getMerchantId();
+        if (StringUtils.isBlank(merchantId) && StringUtils.isNotBlank(adapayMemberAccount.getAdapayMemberId())) {
+            AdapayMemberAccount current = adapayMemberAccountMapper.selectByMemberId(adapayMemberAccount.getAdapayMemberId());
+            if (current != null) {
+                merchantId = current.getMerchantId();
+            }
+        }
         adapayMemberAccountMapper.updateAdapayMemberAccountByMemberId(adapayMemberAccount);
+        if (StringUtils.isNotBlank(merchantId)) {
+            redisCache.deleteObject(CacheConstants.ADAPAY_MEMBER_ACCOUNT + merchantId);
+        }
     }
 
     /**

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java

@@ -112,9 +112,13 @@ public class ClearingBillInfoServiceImpl implements ClearingBillInfoService {
         return result;
     }
 
+    @Override
+    public int countBlockingByMerchantId(String merchantId) {
+        return clearingBillInfoMapper.countBlockingByMerchantId(merchantId);
+    }
+
     @Override
     public List<ClearingBillInfo> selectByWithdrawCode(String withdrawCode) {
         return clearingBillInfoMapper.selectByWithdrawCode(withdrawCode);
     }
 }
-

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java

@@ -164,4 +164,9 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ
         return clearingWithdrawInfoMapper.queryTotalWithdraw(merchantId);
     }
 
+    @Override
+    public int countProcessingByMerchantId(String merchantId) {
+        return clearingWithdrawInfoMapper.countProcessingByMerchantId(merchantId);
+    }
+
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderUnsplitRecordServiceImpl.java

@@ -28,4 +28,9 @@ public class OrderUnsplitRecordServiceImpl implements OrderUnsplitRecordService
     public void updateOrderUnsplitRecord(OrderUnsplitRecord orderUnsplitRecord) {
         orderUnsplitRecordMapper.insertOrUpdateSelective(orderUnsplitRecord);
     }
+
+    @Override
+    public int countUnsplitByMerchantId(String merchantId) {
+        return orderUnsplitRecordMapper.countUnsplitByMerchantId(merchantId);
+    }
 }