助贷资金路由添加日志

src/main/java/com/quantgroup/asset/distribution/config/rabbitmq/ConsumerConfig.java

@@ -65,9 +65,9 @@ public class ConsumerConfig implements RabbitListenerConfigurer {
             log.info("助贷资金路由结果消息接收, 消息内容 : {} ",ms);
             JSONObject jo = JSONObject.parseObject(ms);
             String noticeType = jo.getString("noticeType");
-            if(FundingResult.REJECT.getText().equals(noticeType)
-                    || FundingResult.CANCEL_LOAN.getText().equals(noticeType)
-                    || FundingResult.FUAD_ASSIGN_SUCC.getText().equals(noticeType)){
+            if(FundingResult.REJECT.getCode().equals(noticeType)
+                    || FundingResult.CANCEL_LOAN.getCode().equals(noticeType)
+                    || FundingResult.FUAD_ASSIGN_SUCC.getCode().equals(noticeType)){
                 String applyNo = jo.getJSONObject("data").getString("applyNo");
                 iAidFundRouteRecordService.fundingResultNotity(applyNo,FundingResult.getAuditResultByDesc(noticeType));
                 log.info("助贷资金路由结果消息处理完毕, bizNo : {} ,noticeType : {} ",applyNo,noticeType);

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

@@ -61,6 +61,7 @@ public class AidFundRouteServiceImpl implements IAidFundRouteService {
 
         //第一步 查询所有助贷资金
         List<AidLoanFundConfig> aidLoanFundConfigList = iAidLoanFundConfigService.findAll();
+        log.info("助贷资金路由开始, uuid : {} , bizNo : {} ,助贷资金池 : {} ",assetForm.getUuid(),assetForm.getBizNo(),JSON.toJSONString(aidLoanFundConfigList));
 
         //第二步 开关筛选
         if(CollectionUtils.isNotEmpty(aidLoanFundConfigList))
@@ -107,11 +108,11 @@ public class AidFundRouteServiceImpl implements IAidFundRouteService {
             //通知资方
             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));
+            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));
+                log.info("助贷资金路由-通知资金系统失败,response :{}, uuid : {} , bizNo : {} , callbackUrl:{},params:{}", JSON.toJSONString(response),assetForm.getUuid(),assetForm.getBizNo(),assetForm.getCallbackUrl(), JSON.toJSONString(assetForm));
             }
 
             return GlobalResponse.success();

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

@@ -41,7 +41,7 @@ public class AidLoanFundConfigServiceImpl implements IAidLoanFundConfigService {
         String poolKey = AID_LOAN_FUND_CONFIG_POOL.isEnable()?redisService.hmget(AID_LOAN_POOLKEYS_HMSET_KEY, AID_LOAN_FUND_CONFIG_POOL.getPoolKey()):null;
         if(StringUtils.isEmpty(poolKey)) {
             List<AidLoanFundConfig> aidLoanFundConfigs = iAidLoanFundConfigRepository.findByEnableTrue();
-            if (CollectionUtils.isEmpty(aidLoanFundConfigs)) {
+            if (CollectionUtils.isNotEmpty(aidLoanFundConfigs)) {
                 String key = UUIDUtil.getUuid();
                 AID_LOAN_FUND_CONFIG_POOL.setPoolKey(key);
                 AID_LOAN_FUND_CONFIG_POOL.setAidLoanFundConfigList(aidLoanFundConfigs);