提现给h5提现留入口，修复和增了异常处理逻辑

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/impl/CashWithdrawalServiceImpl.java

@@ -116,17 +116,26 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
    }
 
     public JSONObject applyLoan(OneClickData oneClickData,String md5Keywy,String aesKeywy){
-        Map<String,String> paras = new HashMap<String, String>();
+        JSONObject result =null;
         String bankCardNumber=  BankCardNumberGenerator.generate(BankNameEnum.CCB, BankCardTypeEnum.DEBIT);
         String bankCode="CCB";
         String bankName="建设银行";
         boolean formIdIsTrue=oneClickData.getFundCorpId().equals(ResposeResultEnum.FUNDCORPID910.getDesc()) || oneClickData.getFundCorpId().equals(ResposeResultEnum.FUNDCORPID920.getDesc()) || oneClickData.getFundCorpId().equals(ResposeResultEnum.FUNDCORPID940.getDesc());
         if(formIdIsTrue){
             bankCardNumber=getBankCardNumberLasterNumberIsEvenNumbers();
-            bankCode="PINGAN";
+            bankCode="PAB";
             bankName="平安银行";
+            result=getH5CashWithdrawal(oneClickData,md5Keywy,aesKeywy,bankCardNumber,bankCode,bankName);
+        }else{
+
+            result=getAPICashWithdrawal(oneClickData, md5Keywy, aesKeywy, bankCardNumber, bankCode, bankName);
         }
+        return result;
 
+    }
+
+    public JSONObject getAPICashWithdrawal(OneClickData oneClickData,String md5Keywy,String aesKeywy,String bankCardNumber,String bankCode, String bankName){
+        Map<String,String> paras = new HashMap<String, String>();
         String channelCode="ZHANGZHONG";
         String url ="";
         if(oneClickData.getChannelCode().trim().equals(ChannelEnum.ZHANGHZONG.getCode())){
@@ -158,10 +167,13 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
         content_map.put("content",encryptContent);
         log.info("获取当前的paras={}", paras);
         JSONObject result = HttpRequest.doPostReturnResponseJson(url, content_map);
-
         return result;
     }
 
+    public JSONObject getH5CashWithdrawal(OneClickData oneClickData,String md5Keywy,String aesKeywy,String bankCardNumber,String bankCode, String bankName){
+        return null;
+
+    }
 
     /**
      * 掌众的申请提现
@@ -244,39 +256,41 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
         String bankCardNumber=  BankCardNumberGenerator.generate(BankNameEnum.CCB, BankCardTypeEnum.DEBIT);
         String bankCode="CCB";
         String bankName="建设银行";
+        JSONObject result =null;
         boolean formIdIsTrue=oneClickData.getFundCorpId().equals(ResposeResultEnum.FUNDCORPID910.getDesc()) || oneClickData.getFundCorpId().equals(ResposeResultEnum.FUNDCORPID920.getDesc()) || oneClickData.getFundCorpId().equals(ResposeResultEnum.FUNDCORPID940.getDesc());
         if(formIdIsTrue){
             bankCardNumber=getBankCardNumberLasterNumberIsEvenNumbers();
-            bankCode="PINGAN";
+            bankCode="PAB";
             bankName="平安银行";
-        }
-
-        Map<String,String> paras = new HashMap<String, String>();
-        paras.put("channelOrderNumber",oneClickData.getChannelOrderNo());
-        paras.put("bankCardNumber",bankCardNumber);
-        paras.put("bankCode",bankCode);
-        paras.put("bankName",bankName);
-        paras.put("reservePhoneNumber",oneClickData.getPhone());
+        }else {
 
-        String encryptContent = GetEncryptContentAndMd5.getEncryptContent(paras, aesKeywy, md5Keywy);
+            Map<String, String> paras = new HashMap<String, String>();
+            paras.put("channelOrderNumber", oneClickData.getChannelOrderNo());
+            paras.put("bankCardNumber", bankCardNumber);
+            paras.put("bankCode", bankCode);
+            paras.put("bankName", bankName);
+            paras.put("reservePhoneNumber", oneClickData.getPhone());
 
-        Map<String,String> content_map = new HashMap<String, String>();
-        content_map.put("content",encryptContent);
-        log.info("获取当前的paras={}",paras);
-        JSONObject result = HttpRequest.doPostReturnResponseJson(url, content_map);
+            String encryptContent = GetEncryptContentAndMd5.getEncryptContent(paras, aesKeywy, md5Keywy);
 
+            Map<String, String> content_map = new HashMap<String, String>();
+            content_map.put("content", encryptContent);
+            log.info("获取当前的paras={}", paras);
+            result = HttpRequest.doPostReturnResponseJson(url, content_map);
 
+        }
         return result;
     }
 
 
-    public static String getBankCardNumberLasterNumberIsEvenNumbers(){
+       public static String getBankCardNumberLasterNumberIsEvenNumbers(){
         String bankCardNumberOrigan=BankCardNumberGenerator.generate(BankNameEnum.PAB, BankCardTypeEnum.DEBIT);
 
         char bankCardNumberOriganCv=bankCardNumberOrigan.charAt(bankCardNumberOrigan.length() - 1);
         int isEven=bankCardNumberOriganCv % 2;
         if( isEven== 0){
             log.info("获取当前的bankCardNumberOrigan={},bankCardNumberOriganCv={}",bankCardNumberOrigan,bankCardNumberOriganCv);
+            // 在支付中心插入一条绑卡信息
         }else {
             getBankCardNumberLasterNumberIsEvenNumbers();
 

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/impl/LoanOperationServiceImpl.java

@@ -7,6 +7,7 @@ import cn.quantgroup.cashloanflowboss.api.oneclickdata.repository.OneClickDataRe
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.FundsAllocationplanService;
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.LoanOperationService;
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.PhoneInfoService;
+import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.ScheduleService;
 import cn.quantgroup.cashloanflowboss.core.base.Result;
 import cn.quantgroup.cashloanflowboss.spi.clf.model.LoanProgress;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.LoanApplicationHistory;
@@ -46,6 +47,8 @@ public class LoanOperationServiceImpl implements LoanOperationService{
     private FundsAllocationplanService fundsAllocationplanService;
     @Autowired
     private PhoneInfoService phoneInfoService;
+    @Autowired
+    private ScheduleService scheduleService;
     @Value("${opapi.http.net}")
     private String opapiHttp;
     @Value("${clotho.http.net}")
@@ -249,7 +252,13 @@ public class LoanOperationServiceImpl implements LoanOperationService{
      * */
     @Override
     public JSONObject payNotify(OneClickData oneClickData,String payStatus) {
-
+      try {
+          //JOB执行
+          scheduleService.fetchDataLoanJob();
+          scheduleService.loanDataJob();
+      }catch (Exception e){
+          log.info("错误信息={}",e.toString());
+      }
         String url=apiHttp+"/ex/paycenter/pay_notify";
 
         long payTime=System.currentTimeMillis();

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/impl/OneClickDataQueueOperateServiceImpl.java

@@ -226,7 +226,8 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
                  updatContractStatus(oneClickData);
              }
          }else {
-             return result;
+             log.info("当前的合同状态是对的contract.getGenerateStatus() ={}", contract.getGenerateStatus());
+
          }
         String payStatus="3";
         // 通过申请类型确定是否要放款成功、失败

src/main/java/cn/quantgroup/cashloanflowboss/spi/paycenter/source/GuBeiBataSourceConfiguration.java

+//package cn.quantgroup.cashloanflowboss.spi.paycenter.source;
+//
+//import org.springframework.context.annotation.ComponentScan;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+//import org.springframework.transaction.annotation.EnableTransactionManagement;
+//
+///**
+// * Created by shang on 2020/2/20.
+// */
+//@Configuration
+//@EnableTransactionManagement
+//@EnableJpaRepositories(basePackages = {"cn.quantgroup"}, entityManagerFactoryRef = "guBeiEntityManager", transactionManagerRef = "guBeiTransactionManager", includeFilters = @ComponentScan.Filter(GuBeiDataSource.class))
+//public class GuBeiBataSourceConfiguration {
+//}

src/main/java/cn/quantgroup/cashloanflowboss/spi/paycenter/source/GuBeiDataSource.java

+//package cn.quantgroup.cashloanflowboss.spi.paycenter.source;
+//
+//import java.lang.annotation.ElementType;
+//import java.lang.annotation.Retention;
+//import java.lang.annotation.RetentionPolicy;
+//import java.lang.annotation.Target;
+//
+///**
+// * Created by shang on 2020/2/20.
+// */
+//@Target({ElementType.TYPE})
+//@Retention(RetentionPolicy.RUNTIME)
+//public @interface GuBeiDataSource {
+//}