update 汇付账户本地删除与结算校验

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

@@ -111,10 +111,9 @@ public interface AdapayMemberAccountService {
     String selectMerchantNameByAdapayMemberId(String adapayMemberId);
 
     /**
-     * 根据运营商id删除记录
-     * @param merchantId
+     * 精确逻辑删除当前有效账户，避免并发开户时误删新记录。
      */
-    void deleteAccountByMerchantId(String merchantId);
+    int deleteCurrentAccount(Integer id, String merchantId, String adapayMemberId);
 
     void clearSettleAccountByMerchantId(String merchantId);
 

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

@@ -59,4 +59,6 @@ public interface StationSplitConfigService {
      * @return
      */
     Map<String,List<SplitConfigStationVO>> queryStationList(SplitConfigStationDTO splitConfigStationDTO);
+
+    int countActiveByAdapayMemberId(String adapayMemberId);
 }

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

@@ -270,9 +270,12 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic
     }
 
     @Override
-    public void deleteAccountByMerchantId(String merchantId) {
-        adapayMemberAccountMapper.deleteAccountByMerchantId(merchantId);
-        redisCache.deleteObject(CacheConstants.ADAPAY_MEMBER_ACCOUNT + merchantId);
+    public int deleteCurrentAccount(Integer id, String merchantId, String adapayMemberId) {
+        int result = adapayMemberAccountMapper.deleteCurrentAccount(id, merchantId, adapayMemberId);
+        if (result > 0) {
+            redisCache.deleteObject(CacheConstants.ADAPAY_MEMBER_ACCOUNT + merchantId);
+        }
+        return result;
     }
 
     @Override

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

@@ -316,4 +316,9 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
         return stationMap;
     }
 
+    @Override
+    public int countActiveByAdapayMemberId(String adapayMemberId) {
+        return stationSplitConfigMapper.countActiveByAdapayMemberId(adapayMemberId);
+    }
+
 }