diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 1e894a3b..3a55ab9d 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -18,7 +18,6 @@ import com.hzs.common.domain.system.config.BdDelivery; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.service.ITransactionCommonService; import com.hzs.system.base.service.IBdCountryService; import com.hzs.system.base.service.IBdSystemConfigService; import com.hzs.system.config.service.*; @@ -65,8 +64,6 @@ public class EnumsController extends BaseController { private IBdDeliveryService iBdDeliveryService; @Autowired private IBdBonusItemsService bonusItemsService; - @Autowired - private ITransactionCommonService iTransactionCommonService; @DubboReference IMenuColumnServiceApi iMenuColumnServiceApi; @@ -1796,12 +1793,9 @@ public class EnumsController extends BaseController { // 查询国家奖衔列表 List awardList = awardsService.queryAwards(pkCountry); - // 获取翻译内容 - Map tranMap = iTransactionCommonService.enumTransactionByDBFromPkId(awardList.stream().map(BdAwards::getPkTransaction).collect(Collectors.toList())); - List enumEntityList = new ArrayList<>(); for (BdAwards bdAwards : awardList) { - enumEntityList.add(new EnumEntity(bdAwards.getPkId(), tranMap.get(bdAwards.getPkTransaction()))); + enumEntityList.add(new EnumEntity(bdAwards.getPkId(), bdAwards.getAwardsName())); } return AjaxResult.success(enumEntityList); } @@ -2596,11 +2590,9 @@ public class EnumsController extends BaseController { // 查询国家需要使用的收货币种 List list = iBdAccountService.queryCommissionAccount(SecurityUtils.getPkCountry()); - // 获取翻译内容 - Map tranMap = iTransactionCommonService.enumTransactionByDBFromPkId(list.stream().map(BdAccount::getPkTransactionKey).collect(Collectors.toList())); for (BdAccount bdAccount : list) { - enumEntityList.add(new EnumEntity(bdAccount.getPkId(), tranMap.get(bdAccount.getPkTransactionKey()))); + enumEntityList.add(new EnumEntity(bdAccount.getPkId(), bdAccount.getAccountName())); } return AjaxResult.success(enumEntityList); }