Merge branch 'master' of http://git.quantgroup.cn/data-spider/asset-server

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

 package com.quantgroup.asset.distribution.service.funding.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.quantgroup.asset.distribution.model.form.AssetForm;
 import com.quantgroup.asset.distribution.model.response.GlobalResponse;
 import com.quantgroup.asset.distribution.service.funding.IAidFundRouteRecordService;
 import com.quantgroup.asset.distribution.service.funding.IAidFundRouteService;
 import com.quantgroup.asset.distribution.service.funding.IAidLoanFundConfigService;
+import com.quantgroup.asset.distribution.service.httpclient.IHttpService;
 import com.quantgroup.asset.distribution.service.jpa.entity.AidLoanFundConfig;
 import com.quantgroup.asset.distribution.service.jpa.entity.AidLoanFundRouteRecord;
 import com.quantgroup.asset.distribution.service.redis.IRedisService;
@@ -16,7 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -38,6 +43,12 @@ public class AidFundRouteServiceImpl implements IAidFundRouteService {
     @Autowired
     private IRedisService<String> redisService;
 
+    @Autowired
+    private IRedisService<AssetForm> redisServiceAssetForm;
+
+    @Autowired
+    private IHttpService iHttpService;
+
     /**
      * 助贷资金路由
      *
@@ -71,9 +82,21 @@ public class AidFundRouteServiceImpl implements IAidFundRouteService {
         }
         //第五步 开始路由
         if(CollectionUtils.isNotEmpty(aidLoanFundConfigList)){
-            //TODO 未接到助贷资金  暂时不能进行开发
 
+            //按优先级排序
+            TreeSet<AidLoanFundConfig> aidLoanFundConfigSet = new TreeSet<>(Comparator.comparing(AidLoanFundConfig::getFundPriority));
+            aidLoanFundConfigSet.addAll(aidLoanFundConfigList);
+            AidLoanFundConfig first = aidLoanFundConfigSet.first();
+
+            //通知资方
+            Map<String,String> response = iHttpService.postHasResponse(assetForm.getCallbackUrl(), assetForm.transToNotifyMap());
 
+            log.info("通知资金系统结束,response :{}, uuid : {} , bizNo : {} , callbackUrl:{},params:{}", JSON.toJSONString(response),assetForm.getUuid(),assetForm.getBizNo(),assetForm.getCallbackUrl(), JSON.toJSONString(assetForm));
+            if(response==null || response.size()==0 || !"200".equals(response.get("statusCode")) || "error".equals(response.get("response"))) {
+                assetForm.setRepeatCount(assetForm.getRepeatCount() + 1);
+                redisServiceAssetForm.rightPushEx("AID.LOAN.FUND.ROUTE.NOTIFY.83IUE",assetForm,1, TimeUnit.DAYS);
+                log.info("通知资金系统失败,response :{}, uuid : {} , bizNo : {} , callbackUrl:{},params:{}", JSON.toJSONString(response),assetForm.getUuid(),assetForm.getBizNo(),assetForm.getCallbackUrl(), JSON.toJSONString(assetForm));
+            }else {
                 //保存主贷资金路由记录
                 AidLoanFundRouteRecord aidLoanFundRouteRecord = new AidLoanFundRouteRecord();
                 aidLoanFundRouteRecord.setAidFundRouteStatus(1);//1-未完成 2-成功 3-失败
@@ -82,10 +105,11 @@ public class AidFundRouteServiceImpl implements IAidFundRouteService {
                 aidLoanFundRouteRecord.setBizNo(assetForm.getBizNo());
                 aidLoanFundRouteRecord.setFinanceProductType(Integer.parseInt(assetForm.getBizType()));
                 aidLoanFundRouteRecord.setUserLoanType(userLoanType);
-//            aidLoanFundRouteRecord.setFundNo("");//TODO
-//            aidLoanFundRouteRecord.setFundId("");//TODO
+                aidLoanFundRouteRecord.setFundNo(first.getFundNo());
+                aidLoanFundRouteRecord.setFundId(first.getFundId());
                 iAidFundRouteRecordService.saveAidLoanFundRouteRecord(aidLoanFundRouteRecord);
             }
+        }
         return GlobalResponse.error("未匹配到助贷资金");
     }
 }