diff --git a/web/src/main/java/com/ibeetl/jlw/enums/AccountTypeEnum.java b/web/src/main/java/com/ibeetl/jlw/enums/AccountTypeEnum.java index 6663b434..eabd511d 100644 --- a/web/src/main/java/com/ibeetl/jlw/enums/AccountTypeEnum.java +++ b/web/src/main/java/com/ibeetl/jlw/enums/AccountTypeEnum.java @@ -71,8 +71,12 @@ public enum AccountTypeEnum { INSURANCE_ACCOUNT("保险账户"), /**供应链资产账户*/ SUPPLY_CHAIN_ASSET_ACCOUNT("供应链资产账户"), + + /**理财账户*/ + FINANCIAL_ACCOUNT("理财账户"), ; + @EnumValue private String text; diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java index 354f5949..2ca90205 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java @@ -208,8 +208,8 @@ public class StudentAccountAssetAllocationService extends CoreBaseService applications = resourcesApplicationDao.getValuesByQuery(query); @@ -373,12 +375,39 @@ public class StudentAccountAssetAllocationService extends CoreBaseService experimentalSystems = universitiesCollegesJurisdictionExperimentalSystemDao.getNotExpireApply(orgId, applications.get(0).getResourcesApplicationId().toString()); allocation.setState(CollectionUtil.isNotEmpty(experimentalSystems) ? 2 : 1); + Double money = 0D; + if (values[i].getText().equals(AccountTypeEnum.P2P_ACCOUNT.getText())) { + money = 2000000D; + } else if (values[i].getText().equals(AccountTypeEnum.CROWDFUNDING_ACCOUNT.getText())) { + money = 2000000D; + + } else if (values[i].getText().equals(AccountTypeEnum.EQUITY_FUND_INVESTMENT_ACCOUNT.getText())) { + money = 2000000D; + } else if (values[i].getText().equals(AccountTypeEnum.FUTURES_INVESTMENT_ACCOUNT.getText())) { + money = 2000000D; + } else if (values[i].getText().equals(AccountTypeEnum.EQUITY_INVESTMENT_ACCOUNT.getText())) { + if (j == 1) { + money = 2000000D; + } else { + money = 10000000D; + } + } else if (values[i].getText().equals(AccountTypeEnum.FOREX_INVESTMENT_ACCOUNT.getText())) { + money = 2000000D; + } else if (values[i].getText().equals(AccountTypeEnum.SUPPLY_CHAIN_ASSET_ACCOUNT.getText())) { + money = 2000000D; + } else if (values[i].getText().equals(AccountTypeEnum.BLOCKCHAIN_ASSET_ACCOUNT.getText())) { + money = 2000000D; + } else if (values[i].getText().equals(AccountTypeEnum.FINANCIAL_ACCOUNT.getText())) { + money = 2000000D; + }else if(values[i].getText().equals(AccountTypeEnum.INSURANCE_ACCOUNT.getText())){ + money = 2000000D; + } allocation.setInitialCapital(CollectionUtil.isNotEmpty(experimentalSystems) ? - new BigDecimal(1000000) : BigDecimal.ZERO); + new BigDecimal(money) : BigDecimal.ZERO); allocation.setAvailableFunds(CollectionUtil.isNotEmpty(experimentalSystems) ? - new BigDecimal(1000000) : BigDecimal.ZERO); + new BigDecimal(money) : BigDecimal.ZERO); allocation.setInitialInvestmentCapital(CollectionUtil.isNotEmpty(experimentalSystems) ? - new BigDecimal(1000000) : BigDecimal.ZERO); + new BigDecimal(money) : BigDecimal.ZERO); } } } @@ -666,7 +695,7 @@ public class StudentAccountAssetAllocationService extends CoreBaseService getInfoByStudentId(Long studentId){ + public List getInfoByStudentId(Long studentId) { return studentAccountAssetAllocationDao.getInfo(studentId); } @@ -810,5 +839,4 @@ public class StudentAccountAssetAllocationService extends CoreBaseService item.getTeacherOpenCourseInfo() != null).collect(Collectors.toList()); //饼状图数据 - //todo查询数据库 + //todo 查询数据库 // List> pieMaps = new ArrayList<>(); Map map1 = new HashMap<>();