common aid

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

@@ -15,9 +15,11 @@ public interface IAidFundAssetService {
     /**
      * 准入审核，预审
      * @param assetForm
+     * @param fundId
+     * @param data
      * @return
      */
-    public boolean preAudit(AssetForm assetForm, String fundId, Map<String, Object> data);
+    public boolean preAudit(AssetForm assetForm, String fundId, String fundProductId, Map<String, Object> data);
 
     /**
      * 进件审核
@@ -25,7 +27,8 @@ public interface IAidFundAssetService {
      * @param data
      * @param asset
      * @param fundId
+     * @param fundProductId
      * @return true:进件成功 false:进件失败
      */
-    public boolean audit(AssetForm assetForm, Map<String, Object> data, Asset asset, String fundId);
+    public boolean audit(AssetForm assetForm, Map<String, Object> data, Asset asset, String fundId, String fundProductId);
 }

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

@@ -4,6 +4,7 @@ import com.quantgroup.asset.distribution.constant.AidFundConstants;
 import com.quantgroup.asset.distribution.exception.QGException;
 import com.quantgroup.asset.distribution.exception.QGExceptionType;
 import com.quantgroup.asset.distribution.model.form.AssetForm;
+import com.quantgroup.asset.distribution.service.funding.IAidAssetCommonService;
 import com.quantgroup.asset.distribution.service.funding.IAidFundAssetService;
 import com.quantgroup.asset.distribution.service.jpa.entity.Asset;
 import com.quantgroup.asset.distribution.service.niwodai.INiwodaiAssetService;
@@ -24,26 +25,28 @@ public class AidFundAssetServiceImpl implements IAidFundAssetService {
 
     @Autowired
     private INiwodaiAssetService niwodaiAssetService;
+    @Autowired
+    private IAidAssetCommonService aidAssetCommonService;
 
     @Override
-    public boolean preAudit(AssetForm assetForm, String fundId, Map<String, Object> data) {
+    public boolean preAudit(AssetForm assetForm, String fundId, String fundProductId, Map<String, Object> data) {
         switch (fundId) {
             case AidFundConstants.FundId.NIWODAI : {
                 return niwodaiAssetService.preAudit(assetForm.getUuid(), data).getPass().booleanValue();
             }
             default :
-                throw new QGException(QGExceptionType.UNKNOW_AID_FUND_ID);
+                return aidAssetCommonService.preAudit(assetForm, fundId, fundProductId, data);
         }
     }
 
     @Override
-    public boolean audit(AssetForm assetForm, Map<String, Object> data, Asset asset, String fundId) {
+    public boolean audit(AssetForm assetForm, Map<String, Object> data, Asset asset, String fundId, String fundProductId) {
         switch (fundId) {
             case AidFundConstants.FundId.NIWODAI : {
                 return niwodaiAssetService.incoming(assetForm, data, asset).getCode().equals(300007);
             }
             default :
-                throw new QGException(QGExceptionType.UNKNOW_AID_FUND_ID);
+                return aidAssetCommonService.audit(assetForm, asset, data, fundId, fundProductId);
         }
     }
 }

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

@@ -120,7 +120,7 @@ public class AidFundRouteServiceImpl implements IAidFundRouteService {
                     if (status == AidFundStatus.Route.PRE_PASS) {
                         accessResult = true;
                     } else {
-                        accessResult = aidFundAssetService.preAudit(assetForm, aidLoanFundConfig.getFundId(), data);
+                        accessResult = aidFundAssetService.preAudit(assetForm, aidLoanFundConfig.getFundId(), aidLoanFundConfig.getFundProductId(), data);
                         // 保存主贷资金路由记录
                         aidLoanFundRouteRecord = new AidLoanFundRouteRecord();
                         aidLoanFundRouteRecord.setAidFundRouteStatus(accessResult ? AidFundStatus.Route.PRE_PASS : AidFundStatus.Route.PRE_REJECT);//1-准入成功 2-准入失败 3-进件完成
@@ -153,7 +153,7 @@ public class AidFundRouteServiceImpl implements IAidFundRouteService {
                         // 先创建进件订单记录
                         AidLoanFundAuditOrder aidLoanFundAuditOrder = createAidFundAuditOrder(aidLoanFundRouteRecord, assetForm, asset, data);
                         // 调用助贷资方进件接口 异步
-                        boolean incomingResult = aidFundAssetService.audit(assetForm, data, asset, aidLoanFundConfig.getFundId());
+                        boolean incomingResult = aidFundAssetService.audit(assetForm, data, asset, aidLoanFundConfig.getFundId(), aidLoanFundConfig.getFundProductId());
                         // 将助贷路由记录状态改为进件完成
                         iAidFundRouteRecordService.updateAidLoanFundRouteRecordStatus(aidLoanFundRouteRecord, AidFundStatus.Route.INCOMING_COMPLETE);
                         log.info("助贷资金路由-进件完成, bizChannel : {} , uuid : {} , bizNo : {} , fundId : {} , fundProductId : {} , 进件结果 : {}, 耗时 : {} ",assetForm.getBizChannel(),assetForm.getUuid(),assetForm.getBizNo(),aidLoanFundRouteRecord.getFundId(),aidLoanFundRouteRecord.getFundProductId(),incomingResult,started.stop().elapsed(TimeUnit.MILLISECONDS));