Commit 7bd81b90 authored by zhengjian's avatar zhengjian

量子魔方6.6-2

parent d9b8c6d5
package com.quantgroup.asset.distribution.controller; package com.quantgroup.asset.distribution.controller;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -118,8 +119,8 @@ public class FundModuleController { ...@@ -118,8 +119,8 @@ public class FundModuleController {
} }
@RequestMapping("/simulation/result") @RequestMapping("/simulation/result")
public GlobalResponse simulationResult(List<FundConfigCondition> configConditions,Long configId){ public GlobalResponse simulationResult(String configConditions, Long configId){
return simulation(configConditions,configId); return simulation(JSON.parseArray(configConditions,FundConfigCondition.class),configId);
} }
private GlobalResponse saveChannelFundsConfigCommon(Integer type, Long id, String bizChannel, String funds, String remarks, private GlobalResponse saveChannelFundsConfigCommon(Integer type, Long id, String bizChannel, String funds, String remarks,
...@@ -207,7 +208,7 @@ public class FundModuleController { ...@@ -207,7 +208,7 @@ public class FundModuleController {
} }
private GlobalResponse simulation(List<FundConfigCondition> configConditions,Long configId){ private GlobalResponse simulation(List<FundConfigCondition> configConditions,Long configId){
log.info("资方模块接口,根据案例进行空, configConditions : {}", configConditions); log.info("资方模块接口,根据案例进行空, configConditions : {}", configConditions);
if (CollectionUtils.isEmpty(configConditions)) { if (CollectionUtils.isEmpty(configConditions)) {
return GlobalResponse.create(FundModuleResponse.ID_IS_EMPTY); return GlobalResponse.create(FundModuleResponse.ID_IS_EMPTY);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment