review code

src/main/java/com/quantgroup/asset/distribution/AssetDistributionBootstrap.java

@@ -19,7 +19,6 @@ import com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer;
 
 import lombok.extern.slf4j.Slf4j;
 
-@ComponentScan(basePackages = {"com.quantgroup.asset.distribution"})
 @EnableJpaRepositories(basePackages = {"com.quantgroup.asset.distribution.service.jpa.repository"})
 @EntityScan(basePackages = {"com.quantgroup.asset.distribution.service.jpa.entity"})
 @EnableTransactionManagement

src/main/java/com/quantgroup/asset/distribution/exception/QGExceptionType.java

@@ -73,6 +73,7 @@ public enum QGExceptionType {
     AID_COMMON_AUDIT_RESULT_ERROR(3024, "助贷回调URL或content内容错误, fundId : %s, fundProductId : %s, content : %s"),
     AID_COMMON_QUERY_AUDIT_RESULT_ERROR(3025, "助贷资方审核结果查询结果出现错误, uuid : %s, bizNo : %s, fundId : %s"),
     AID_COMMON_AUDIT_RESULT_ORDER_ERROR(3026, "通用助贷结果接收订单状态异常, orderNo : %s, fundId : %s, orderStatus : %s"),
+    AID_COMMON_FUND_CONFIG_IS_EMPTY(3027, "未找到通用助贷资方信息配置, fundId : %s, fundProductId : %s"),
 
     USER_OCR_INFO_IS_EMPTY(3019, "用户OCR信息为空, uuid : %s"),
     LIVE_DATA_ERROR(3020, "活体数据获取失败, uuid : %s"),

src/main/java/com/quantgroup/asset/distribution/model/entity/aid/AidRiskInfo.java

@@ -46,7 +46,7 @@ public class AidRiskInfo implements Serializable {
 
     public AidRiskInfo() {}
 
-    public AidRiskInfo(int label, BigDecimal qgScore3, BigDecimal qgScore5, BigDecimal qgDebtPayingScore, String qgRiskLevelPhone, String qgRiskLevelIdNo) {
+    public AidRiskInfo(int label, Object qgScore3, Object qgScore5, Object qgDebtPayingScore, Object qgRiskLevelPhone, Object qgRiskLevelIdNo) {
         super();
         this.label = label;
         this.qgScore3 = qgScore3;

src/main/java/com/quantgroup/asset/distribution/service/aid/impl/AidFundInfoConfigServiceImpl.java

@@ -31,7 +31,7 @@ public class AidFundInfoConfigServiceImpl implements IAidFundInfoConfigService {
     @Override
     public AidFundInfoConfig findAidFundInfo(String fundId, String fundProductId) {
         String redisKey = getAidFundInfoConfigKey(fundId, fundProductId);
-        AidFundInfoConfig aidFundInfoConfig = null;
+        AidFundInfoConfig aidFundInfoConfig = redisService.getEntity(redisKey);
         if (aidFundInfoConfig == null) {
             List<AidFundInfoConfig> aidFundInfoConfigs = aidFundInfoConfigRepository.findByFundIdAndFundProductIdAndEnableIsTrue(fundId, fundProductId);
             if (CollectionUtils.isNotEmpty(aidFundInfoConfigs)) {

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

@@ -16,6 +16,7 @@ public interface IAidFundAssetService {
      * 准入审核，预审
      * @param assetForm
      * @param fundId
+     * @param fundProductId
      * @param data
      * @return
      */

src/main/java/com/quantgroup/asset/distribution/service/funding/impl/AidAssetCommonServiceImpl.java

@@ -77,6 +77,8 @@ public class AidAssetCommonServiceImpl implements IAidAssetCommonService {
     public boolean preAudit(AssetForm assetForm, String fundId, String fundProductId, Map<String, Object> data) {
         try {
             AidFundInfoConfig aidFundInfoConfig = aidFundInfoConfigService.findAidFundInfo(fundId, fundProductId);
+            QGPreconditions.checkArgument(aidFundInfoConfig != null, QGExceptionType.AID_COMMON_FUND_CONFIG_IS_EMPTY, fundId, fundProductId);
+
             String preAuditUrl = aidFundInfoConfig.getPreAuditUrl();
             int preAuditType = aidFundInfoConfig.getPreAuditType().intValue();
             Map<String, String> requestParams = getPreAuditParams(assetForm.getUuid(), fundId, fundProductId, preAuditType);
@@ -99,6 +101,7 @@ public class AidAssetCommonServiceImpl implements IAidAssetCommonService {
     public boolean audit(AssetForm assetForm, Asset asset, Map<String, Object> data, String fundId, String fundProductId) {
         try {
             AidFundInfoConfig aidFundInfoConfig = aidFundInfoConfigService.findAidFundInfo(fundId, fundProductId);
+            QGPreconditions.checkArgument(aidFundInfoConfig != null, QGExceptionType.AID_COMMON_FUND_CONFIG_IS_EMPTY, fundId, fundProductId);
             String requestURL = aidFundInfoConfig.getAuditUrl();
 
             // 用户中心相关信息, 这里不可能为空，不然预审就拦截住了
@@ -132,6 +135,8 @@ public class AidAssetCommonServiceImpl implements IAidAssetCommonService {
     public void auditResult(AssetForm assetForm, Asset asset, String fundId, String fundProductId) {
         try {
             AidFundInfoConfig aidFundInfoConfig = aidFundInfoConfigService.findAidFundInfo(fundId, fundProductId);
+            QGPreconditions.checkArgument(aidFundInfoConfig != null, QGExceptionType.AID_COMMON_FUND_CONFIG_IS_EMPTY, fundId, fundProductId);
+
             Map<String, String> params = new HashMap<>();
             params.put("orderNo", assetForm.getBizNo());
             MiddleOfficeResponse response = request(aidFundInfoConfig.getAuditResultUrl(), aidFundInfoConfig.getFundId(), JSON.toJSONString(params), aidFundInfoConfig.getPrivateKey(), aidFundInfoConfig.getPublicKey());