autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-08-14 18:17:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2026-07-20 15:41:30 +08:00
parent b27c1ce213 345a6efb37
commit 840c2af9bc
14 changed files with 191 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayMemberAccountMapper.java
View File

@@ -120,13 +120,14 @@ public interface AdapayMemberAccountMapper {
AdapayMemberAccount selectByMemberId(String memberId);
/**
* 通过运营商id删除账户信息
* @param merchantId
*/
void deleteAccountByMerchantId(String merchantId);
int deleteCurrentAccount(@Param("id") Integer id,
@Param("merchantId") String merchantId,
@Param("adapayMemberId") String adapayMemberId);
void clearSettleAccountByMerchantId(String merchantId);
int clearCurrentSettleAccount(@Param("id") Integer id,
@Param("merchantId") String merchantId,
@Param("adapayMemberId") String adapayMemberId,
@Param("settleAccountId") String settleAccountId);
/**
* 根据运营商id查询最近一条的信息

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java
View File

@@ -35,4 +35,6 @@ public interface StationSplitConfigMapper {
* @return
*/
List<SplitConfigStationVO> queryStationList(String adapayMemberId);
int countActiveByAdapayMemberId(String adapayMemberId);
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java
View File

@@ -111,12 +111,11 @@ 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);
int clearCurrentSettleAccount(Integer id, String merchantId, String adapayMemberId, String settleAccountId);
/**
* 根据运营商Id查询最近一条的信息

2
jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java
View File

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

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

@@ -270,15 +270,21 @@ 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
public void clearSettleAccountByMerchantId(String merchantId) {
adapayMemberAccountMapper.clearSettleAccountByMerchantId(merchantId);
redisCache.deleteObject(CacheConstants.ADAPAY_MEMBER_ACCOUNT + merchantId);
public int clearCurrentSettleAccount(Integer id, String merchantId, String adapayMemberId, String settleAccountId) {
int result = adapayMemberAccountMapper.clearCurrentSettleAccount(id, merchantId, adapayMemberId, settleAccountId);
if (result > 0) {
redisCache.deleteObject(CacheConstants.ADAPAY_MEMBER_ACCOUNT + merchantId);
}
return result;
}
/**

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

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