angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 部门枚举接口去掉国际化；

This commit is contained in:
cabbage 2025-06-20 14:57:56 +08:00
parent f65f44c13f
commit b65ac357af
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java
View File

@ -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.BdGrade;
import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; import com.hzs.common.domain.system.config.ext.BdBonusItemsExt;
import com.hzs.common.security.utils.SecurityUtils; 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.IBdCountryService;
import com.hzs.system.base.service.IBdSystemConfigService; import com.hzs.system.base.service.IBdSystemConfigService;
import com.hzs.system.config.service.*; import com.hzs.system.config.service.*;
@ -65,8 +64,6 @@ public class EnumsController extends BaseController {
private IBdDeliveryService iBdDeliveryService; private IBdDeliveryService iBdDeliveryService;
@Autowired @Autowired
private IBdBonusItemsService bonusItemsService; private IBdBonusItemsService bonusItemsService;
@Autowired
private ITransactionCommonService iTransactionCommonService;
@DubboReference @DubboReference
IMenuColumnServiceApi iMenuColumnServiceApi; IMenuColumnServiceApi iMenuColumnServiceApi;
@ -1796,12 +1793,9 @@ public class EnumsController extends BaseController {
// 查询国家奖衔列表 // 查询国家奖衔列表
List<BdAwards> awardList = awardsService.queryAwards(pkCountry); List<BdAwards> awardList = awardsService.queryAwards(pkCountry);
// 获取翻译内容
Map<Integer, String> tranMap = iTransactionCommonService.enumTransactionByDBFromPkId(awardList.stream().map(BdAwards::getPkTransaction).collect(Collectors.toList()));
List<EnumEntity> enumEntityList = new ArrayList<>(); List<EnumEntity> enumEntityList = new ArrayList<>();
for (BdAwards bdAwards : awardList) { 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); return AjaxResult.success(enumEntityList);
} }
@ -2596,11 +2590,9 @@ public class EnumsController extends BaseController {
// 查询国家需要使用的收货币种 // 查询国家需要使用的收货币种
List<BdAccount> list = iBdAccountService.queryCommissionAccount(SecurityUtils.getPkCountry()); List<BdAccount> list = iBdAccountService.queryCommissionAccount(SecurityUtils.getPkCountry());
// 获取翻译内容
Map<Integer, String> tranMap = iTransactionCommonService.enumTransactionByDBFromPkId(list.stream().map(BdAccount::getPkTransactionKey).collect(Collectors.toList()));
for (BdAccount bdAccount : list) { 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); return AjaxResult.success(enumEntityList);
} }