diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/ZyTest.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/ZyTest.java index 27bd2d95a..4ed249605 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/ZyTest.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/ZyTest.java @@ -95,7 +95,7 @@ public class ZyTest { dto.setEPID("1"); dto.setAccName("测试部门"); dto.setEPID("1"); - ZyMerSyncAccountInfoVo vo = zyMerService.syncAccountInfoApi(List.of(dto)); + ZyMerSyncAccountInfoVo.DataVo vo = zyMerService.syncAccountInfoApi(List.of(dto)); System.out.println(vo); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java index 095df44d7..5fe05691f 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java @@ -23,9 +23,11 @@ import com.bsd.pjcloud.wallet.api.vo.MchManageVo; import com.bsd.pjcloud.wallet.api.vo.code.MchCollectionCodeVo; import com.bsd.pjcloud.wallet.mapper.MchManageMapper; import com.bsd.pjcloud.wallet.service.MchManageService; +import com.bsd.pjcloud.wallet.service.WalletThirdZyService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.CacheEvict; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; @@ -56,6 +58,8 @@ public class MchManageServiceImpl extends ServiceImpl redisTemplate.opsForValue().getAndDelete(CacheConstants.WALLET_MCH + v)); + list.forEach(v -> { + redisTemplate.opsForValue().getAndDelete(CacheConstants.WALLET_MCH + v); + walletThirdZyService.syncAllMch(v, Boolean.TRUE); + }); } @Override diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/MchThirdZyServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java similarity index 95% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/MchThirdZyServiceImpl.java rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java index 5bf8f655f..e9e28ae35 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/MchThirdZyServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.admin.api.dto.UserInfo; +import com.bsd.pjcloud.admin.api.entity.SysDept; import com.bsd.pjcloud.admin.api.entity.SysRole; import com.bsd.pjcloud.admin.api.feign.RemoteDeptService; import com.bsd.pjcloud.admin.api.feign.RemoteRoleService; @@ -46,7 +47,7 @@ import java.util.Optional; @Slf4j @RequiredArgsConstructor @Service -public class MchThirdZyServiceImpl implements WalletThirdZyService { +public class WalletThirdZyServiceImpl implements WalletThirdZyService { private static final String TAG = "用户模块同步到正元信息"; @@ -107,23 +108,26 @@ public class MchThirdZyServiceImpl implements WalletThirdZyService { @Override public void syncAllDept(Long deptId, Boolean isDel) { MchManageDto dto = new MchManageDto(); - if(ObjectUtil.isNotEmpty(deptId)){ + if (ObjectUtil.isNotEmpty(deptId)) { MchManageVo mchManageVo = mchManageService.getFirstMchByDeptId(deptId); - if(ObjectUtil.isNotEmpty(mchManageVo)){ + if (ObjectUtil.isNotEmpty(mchManageVo)) { dto.setDeptId(mchManageVo.getDeptId()); } } - List mchList = mchManageService.list(dto); - if (ObjectUtil.isEmpty(mchList)) { - log.info("|{}|同步到正元全部商户部门信息错误mchList为空", TAG); + List deptList = remoteDeptService.getAllDept(null).getData(); + if (ObjectUtil.isNotEmpty(deptId)) { + deptList = deptList.stream().filter(v -> ObjectUtil.equals(v.getDeptId(), deptId)).toList(); + } + if (ObjectUtil.isEmpty(deptList)) { + log.info("|{}|同步到正元全部商户部门信息错误deptList为空", TAG); return; } List syncList = new ArrayList<>(); String syncAllMchVersion = getSyncAllMchVersion(); - for (MchManageVo v : mchList) { + for (SysDept v : deptList) { ZyMerSyncEnterpriseInfoDto entity = new ZyMerSyncEnterpriseInfoDto(); entity.setEPID(v.getDeptId().toString()); - entity.setEPName(v.getDeptName()); + entity.setEPName(v.getName()); entity.setIsValid(getIsValid(v.getDelFlag(), isDel)); entity.setFixId(syncAllMchVersion); syncList.add(entity);