Revert "量子魔方6.6第二期"

This reverts commit bd72559e

src/main/java/com/quantgroup/asset/distribution/config/datasource/DataSourceConfig.java

@@ -20,8 +20,8 @@ import com.alibaba.druid.pool.DruidDataSource;
  */
 @Configuration
 public class DataSourceConfig {
-
-    @Value("${spring.datasource.primary.url}")
+	
+	@Value("${spring.datasource.primary.url}")
     private String dbUrl;
     @Value("${spring.datasource.primary.username}")
     private String username;

src/main/java/com/quantgroup/asset/distribution/model/entity/fund/FundConfigCondition.java

-package com.quantgroup.asset.distribution.model.entity.fund;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class FundConfigCondition implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String conditionTempId;
-    private List<Condition> condition;
-    private Result result;
-
-
-    @Data
-    public static class Condition{
-        private String conditionCode;
-        private String conditionName;
-        private String conditionValue;
-    }
-
-    @Data
-    public static class Result{
-        private Boolean success;
-        private String fundInfo;
-    }
-}

src/main/java/com/quantgroup/asset/distribution/service/funding/IFundModuleService.java

 package com.quantgroup.asset.distribution.service.funding;
 
-import com.quantgroup.asset.distribution.config.annotation.HandleException;
-import com.quantgroup.asset.distribution.model.entity.fund.FundConfigCondition;
 import com.quantgroup.asset.distribution.model.response.GlobalResponse;
 
-import java.util.List;
-
 /**
  * 资方模块Service
  * @author liwenbin
@@ -103,8 +99,4 @@ public interface IFundModuleService {
 	 * @return
 	 */
 	public GlobalResponse audit(Long id, Integer auditStatus);
-
-	GlobalResponse getAllConditionsOfFundConfig(Long configId);
-
-	GlobalResponse simulationCases(List<FundConfigCondition> configConditions,Long configId);
 }

src/test/java/com/quantgroup/asset/distribution/niwodai/NiwodaiTest.java

@@ -6,9 +6,6 @@ import cn.quantgroup.user.IUserSdkService;
 import cn.quantgroup.user.UserSdkServiceFactory;
 import com.alibaba.fastjson.JSON;
 import com.quantgroup.asset.distribution.AssetDistributionBootstrap;
-import com.quantgroup.asset.distribution.model.entity.fund.FundConfigCondition;
-import com.quantgroup.asset.distribution.model.entity.fund.FundConfigSimulationVO;
-import com.quantgroup.asset.distribution.service.funding.IFundModuleService;
 import com.quantgroup.asset.distribution.service.niwodai.INiwodaiAssetService;
 import com.quantgroup.asset.distribution.service.niwodai.INiwodaiService;
 import com.quantgroup.asset.distribution.service.niwodai.vo.*;
@@ -24,7 +21,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Map;
 
 @RunWith(SpringRunner.class)
@@ -41,8 +37,6 @@ public class NiwodaiTest {
 	@Value("${user.sdk.url}")
 	private String userSysUrl;
 	private IUserSdkService userSdkService;
-	@Autowired
-	private IFundModuleService fundModuleService;
 	@PostConstruct
 	private void init() {
 		userSdkService = UserSdkServiceFactory.generateSDKService(userSysUrl, httpClient);
@@ -69,25 +63,8 @@ public class NiwodaiTest {
 
 	@Test
 	public void testIncoming() {
-		NiwodaiIncomingResponseVO vo = niwodaiAssetService.incoming("2f0c65a8-c94e-4e03-87c6-b0ae99b100f0","AN000000135399103854755840","10000",12);
-		System.out.println(JSON.toJSONString(vo));
-	}
-
-	@Test
-	public void testResult(){
-		NiwodaiIncomingResultResponseVO vo = niwodaiAssetService.incomingResult("AN000000135399103854755840");
+		NiwodaiIncomingResponseVO vo = niwodaiAssetService.incoming("ae7d04bf-1c5a-475b-98d2-b193be88cf2f","1028791648161","10000",12);
 		System.out.println(JSON.toJSONString(vo));
 	}
 
-	@Test
-	public void testFund(){
-		fundModuleService.getAllConditionsOfFundConfig(1L);
-	}
-
-	@Test
-	public void testFundResult(){
-		List<FundConfigCondition> list = ((FundConfigSimulationVO)fundModuleService.getAllConditionsOfFundConfig(7L).getBody()).getConditionsCase();
-		fundModuleService.simulationCases(list,7L);
-	}
-
 }