1、swagger接口文档

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;
 

web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java

@@ -208,8 +208,8 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
         }
     }
 
-    public StudentAccountAssetAllocation getByApplicationIdAndStudentId(Long applicationId,Long studentId){
+    public StudentAccountAssetAllocation getByApplicationIdAndStudentId(Long applicationId, Long studentId) {
-          return studentAccountAssetAllocationDao.getByApplicationIdAndStudentId(applicationId,studentId);
+        return studentAccountAssetAllocationDao.getByApplicationIdAndStudentId(applicationId, studentId);
     }
 
     /**
@@ -354,18 +354,20 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
 
                     query.setApplicationSecondLevelRelation("供应链金融服务公司");
 
+                }else if(ObjectUtil.equals(values[i].getText(),AccountTypeEnum.FINANCIAL_ACCOUNT.getText())){
+                    query.setApplicationSecondLevelRelation("智能理财");
                 }
 
-                if (ObjectUtil.equals(values[i].getText(), AccountTypeEnum.CASH_ACCOUNT.getText()) || ObjectUtil.equals(values[i].getText(), AccountTypeEnum.BANK_ACCOUNT.getText())) {
+                if (ObjectUtil.equals(values[i].getText(), AccountTypeEnum.BANK_ACCOUNT.getText())) {
                     allocation.setState(2);
                     allocation.setApplicationId(ObjectUtil.equals(values[i].getText(), AccountTypeEnum.CASH_ACCOUNT.getText()) ? -2L : -1L);
 
                     allocation.setInitialCapital(ObjectUtil.equals(values[i].getText(), AccountTypeEnum.CASH_ACCOUNT.getText()) ?
-                            new BigDecimal(1000000) : BigDecimal.ZERO);
+                            new BigDecimal(2000000) : BigDecimal.ZERO);
                     allocation.setAvailableFunds(ObjectUtil.equals(values[i].getText(), AccountTypeEnum.CASH_ACCOUNT.getText()) ?
-                            new BigDecimal(1000000) : BigDecimal.ZERO);
+                            new BigDecimal(2000000) : BigDecimal.ZERO);
                     allocation.setInitialInvestmentCapital(ObjectUtil.equals(values[i].getText(), AccountTypeEnum.CASH_ACCOUNT.getText()) ?
-                            new BigDecimal(1000000) : BigDecimal.ZERO);
+                            new BigDecimal(2000000) : BigDecimal.ZERO);
                 } else {
                     if (ObjectUtil.isNotNull(query.getApplicationSecondLevelRelation())) {
                         List<ResourcesApplication> applications = resourcesApplicationDao.getValuesByQuery(query);
@@ -373,12 +375,39 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
                             allocation.setApplicationId(applications.get(0).getResourcesApplicationId());
                             List<UniversitiesCollegesJurisdictionExperimentalSystem> 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<Studen
         }
     }
 
-    public List<StudentAccountAssetAllocation> getInfoByStudentId(Long studentId){
+    public List<StudentAccountAssetAllocation> getInfoByStudentId(Long studentId) {
         return studentAccountAssetAllocationDao.getInfo(studentId);
     }
 
@@ -810,5 +839,4 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
     }
 
 
-
 }

web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java

@@ -96,7 +96,7 @@ public class ApiStudentService {
         myOpenCourseList = CollectionUtil.emptyIfNull(myOpenCourseList).stream().filter(item -> item.getTeacherOpenCourseInfo() != null).collect(Collectors.toList());
 
         //饼状图数据
-        //todo查询数据库
+        //todo 查询数据库
         //
         List<Map<String, Object>> pieMaps = new ArrayList<>();
         Map<String, Object> map1 = new HashMap<>();