diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 71412d6b1..865a76e85 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1401,7 +1401,13 @@ public class OrderService { if (StringUtils.isBlank(memberId)) { return; } - adapayMemberAccountService.deleteByMemberId(memberId); + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMemberId(memberId); + if (adapayMemberAccount == null) { + return; + } + adapayMemberAccount.setDelFlag(Constants.ONE); + adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount); + } private void corpMemberSucceeded(String data) { 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 6d1a26ea0..0f1901c18 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 @@ -66,4 +66,6 @@ public interface AdapayMemberAccountMapper { void deleteByMemberId(String memberId); void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount); + + AdapayMemberAccount selectByMemberId(String memberId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java index 2781d05db..6f0a7c71e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java @@ -61,6 +61,8 @@ public interface IAdapayMemberAccountService { AdapayMemberAccount selectByMerchantId(String merchantId); + AdapayMemberAccount selectByMemberId(String memberId); + String selectAdapayMemberIdByStationId(String stationId); void deleteByMemberId(String memberId); 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 84d0459d6..fe4ace2fb 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 @@ -3,6 +3,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.AdapayMemberAccount; import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.mapper.AdapayMemberAccountMapper; @@ -75,7 +76,12 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi @Override public int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount) { // adapayMemberAccount.setUpdateTime(DateUtils.getNowDate()); - return adapayMemberAccountMapper.updateAdapayMemberAccount(adapayMemberAccount); + int i = adapayMemberAccountMapper.updateAdapayMemberAccount(adapayMemberAccount); + if (StringUtils.isNotBlank(adapayMemberAccount.getMerchantId())) { + String redisKey = CacheConstants.ADAPAY_MEMBER_ACCOUNT + adapayMemberAccount.getMerchantId(); + redisCache.deleteObject(redisKey); + } + return i; } /** @@ -113,6 +119,12 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi return adapayMemberAccount; } + + @Override + public AdapayMemberAccount selectByMemberId(String memberId) { + return adapayMemberAccountMapper.selectByMemberId(memberId); + } + @Override public String selectAdapayMemberIdByStationId(String stationId) { PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId)); diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml index 89e93415f..e954098f5 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml @@ -121,4 +121,12 @@ delete from adapay_member_account where adapay_member_id = #{memberId,jdbcType=VARCHAR} + + \ No newline at end of file