二次风控

src/main/java/cn/quantgroup/cashloanflowboss/api/order/controller/OrderController.java

@@ -107,6 +107,22 @@ public class OrderController {
         }
     }
 
+    /**
+     * 二次风控审批
+     *
+     * @return
+     */
+    @Security(authorityId = "Order.loadSecondAuditJob")
+    @GetMapping("/loadSecondAuditJob")
+    public Result<Boolean> loadSecondAuditJob() {
+        if (Application.isDebug()) {
+            this.orderService.loadSecondAuditJob();
+            return Result.buildSuccess(true,"操作成功");
+        } else {
+            return Result.buildSuccess(false,"无此操作");
+        }
+    }
+
     /**
      * 贷前关单
      *

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderService.java

@@ -39,4 +39,6 @@ public interface OrderService {
     List<CallbackRecordVoModel> getOrderCallbackRecordList(String channelOrderNumber);
 
     Object findRepaymentPlan(String channelOrderNumber, Long loanId);
+
+    void loadSecondAuditJob();
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderServiceImpl.java

@@ -19,16 +19,13 @@ import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderMapping;
 import cn.quantgroup.cashloanflowboss.spi.clf.model.CallbackRecordVoModel;
 import cn.quantgroup.cashloanflowboss.spi.clf.repository.ClfOrderMappingRepository;
 import cn.quantgroup.cashloanflowboss.spi.clf.service.CLFCenterService;
-import cn.quantgroup.cashloanflowboss.spi.clotho.client.ClothoCenter;
 import cn.quantgroup.cashloanflowboss.spi.clotho.service.ClothoCenterService;
-import cn.quantgroup.cashloanflowboss.spi.jolyne.JolyneCenter;
 import cn.quantgroup.cashloanflowboss.spi.jolyne.JolyneService;
 import cn.quantgroup.cashloanflowboss.spi.jolyne.JolyneUtil;
 import cn.quantgroup.cashloanflowboss.spi.opapi.OPCenter;
 import cn.quantgroup.cashloanflowboss.spi.user.service.XyqbUserService;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.Contract;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.LoanApplicationHistory;
-import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.WaitingFundingCorpOperatePeople;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.CancelPreLoanRepository;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.service.XYQBCenterService;
 import cn.quantgroup.cashloanflowboss.utils.JSONTools;
@@ -38,7 +35,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -55,7 +51,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
@@ -91,8 +86,6 @@ public class OrderServiceImpl implements OrderService{
     @Autowired
     private CLFCenterService clfCenterService;
     @Autowired
-    private JolyneCenter jolyneCenter;
-    @Autowired
     private JolyneService jolyneService;
 
 
@@ -355,7 +348,7 @@ public class OrderServiceImpl implements OrderService{
                 // 修改合同状态
                 ArrayList<String> updateContract = Lists.newArrayList();
                 updateContract.add("update contract set generate_status = 2 where user_id = " + orderMapping.getQgUserId() + ";");
-                jolyneCenter.sqlXyqb(JolyneUtil.getJolneSql(updateContract));
+                jolyneService.executeXYQBSQL(JolyneUtil.getJolneSql(updateContract));
             }
         } else {
             // 合同为空 log表记录问题，UI用户查询
@@ -489,13 +482,13 @@ public class OrderServiceImpl implements OrderService{
     public boolean cancel(OrderVo orderVo) {
         ClfOrderMapping orderMapping = clfOrderMappingRepository.findByChannelOrderNoLastOne(orderVo.getChannelOrderNumber());
         if (orderMapping == null) {
-            log.info("sqlXyqb,关单失败，无订单 channelOrderNumber={}", orderVo.getChannelOrderNumber());
+            log.info("executeXYQBSQL,关单失败，无订单 channelOrderNumber={}", orderVo.getChannelOrderNumber());
             return false;
         }
 
         XUser xUser = xyqbUserService.findXUserById(orderMapping.getQgUserId());
         if (xUser == null) {
-            log.info("sqlXyqb,关单失败，未找到用户 channelOrderNumber={}", orderVo.getChannelOrderNumber());
+            log.info("executeXYQBSQL,关单失败，未找到用户 channelOrderNumber={}", orderVo.getChannelOrderNumber());
             return false;
         }
         Long userId = xUser.getId();
@@ -508,7 +501,7 @@ public class OrderServiceImpl implements OrderService{
         cancel_list.add("delete from apply_quota_record where user_id=" + userId);
         cancel_list.add("delete from user_operation_history where user_id=" + userId);
         data.put("sql", cancel_list);
-        String cancel_result = jolyneCenter.sqlXyqb(JSONTools.serialize(data));
+        String cancel_result = jolyneService.executeXYQBSQL(JSONTools.serialize(data));
         return "success".equals(cancel_result);
     }
 
@@ -684,6 +677,12 @@ public class OrderServiceImpl implements OrderService{
         return null;
     }
 
+    @Override
+    public void loadSecondAuditJob() {
+        jolyneService.fetchDataLoanJob();
+        jolyneService.loanDataJob();
+    }
+
 
     /**
      * 查询订单状态

src/main/java/cn/quantgroup/cashloanflowboss/spi/jolyne/JolyneCenter.java

@@ -2,23 +2,39 @@ package cn.quantgroup.cashloanflowboss.spi.jolyne;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Component
-@FeignClient(name = "JolyneServiceCenter", url = "http://192.168.4.156:9001/executeSQL/"+"${NAMESPACE}", fallback = JolyneCenter.Fallback.class)
+@FeignClient(name = "JolyneServiceCenter", url = "http://192.168.4.156:9001", fallback = JolyneCenter.Fallback.class)
 public interface JolyneCenter {
 
+    @PostMapping(value = "/executeSQL/"+"${NAMESPACE}" + "/xyqb", consumes = "application/json")
+    String executeXYQBSQL(String jsonData);
 
-    @PostMapping(value = "/xyqb", consumes = "application/json")
-    String sqlXyqb(String jsonData);
+    @GetMapping(value = "/job/clotho-elastic-job/cn.qg.clotho.job.FetchDataLoanJob")
+    void fetchDataLoanJob(@RequestParam("namespace") String namespace);
+
+    @GetMapping(value = "/job/clotho-elastic-job/cn.qg.clotho.job.LoanDataJob")
+    void loanDataJob(@RequestParam("namespace") String namespace);
 
     @Component
     class Fallback implements JolyneCenter {
 
         @Override
-        public String sqlXyqb(String jsonData) {
+        public String executeXYQBSQL(String jsonData) {
             return null;
         }
+
+        @Override
+        public void fetchDataLoanJob(String namespace) {
+
+        }
+
+        @Override
+        public void loanDataJob(String namespace) {
+
+        }
     }
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/jolyne/JolyneService.java

@@ -9,5 +9,14 @@ package cn.quantgroup.cashloanflowboss.spi.jolyne;
  */
 public interface JolyneService {
 
+
+    String executeXYQBSQL(String jsonData);
+
+
+    void fetchDataLoanJob();
+
+    void loanDataJob();
+
+
     String delayUpdateWaitingXyqbSql(Long sqlContent, Long delayTime);
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/jolyne/JolyneServiceImpl.java

@@ -5,10 +5,10 @@ import cn.quantgroup.cashloanflowboss.spi.xyqb.service.XYQBCenterService;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.sql.Timestamp;
 import java.util.ArrayList;
 
 /**
@@ -26,6 +26,25 @@ public class JolyneServiceImpl implements JolyneService {
     @Autowired
     private JolyneCenter jolyneCenter;
 
+    @Value("${NAMESPACE}")
+    private String namespace;
+
+
+    @Override
+    public String executeXYQBSQL(String jsonData) {
+        return jolyneCenter.executeXYQBSQL(jsonData);
+    }
+
+    @Override
+    public void fetchDataLoanJob() {
+        jolyneCenter.fetchDataLoanJob(namespace);
+    }
+
+    @Override
+    public void loanDataJob() {
+        jolyneCenter.loanDataJob(namespace);
+    }
+
     @Async
     @Override
     public String delayUpdateWaitingXyqbSql(Long loanId, Long delayTime) {
@@ -33,6 +52,8 @@ public class JolyneServiceImpl implements JolyneService {
 
         WaitingFundingCorpOperatePeople waitingFundingCorpOperatePeople = xyqbCenterService.findWaitingFundingCorpOperatePeopleByLoanId(loanId);
 
+        int i = 0;
+
         while (waitingFundingCorpOperatePeople == null) {
             try {
                 Thread.sleep(delayTime);
@@ -40,15 +61,22 @@ public class JolyneServiceImpl implements JolyneService {
                 e.printStackTrace();
             }
             waitingFundingCorpOperatePeople = xyqbCenterService.findWaitingFundingCorpOperatePeopleByLoanId(loanId);
+
+            if (++ i > 10000) {
+                return "fail";
+            }
         }
 
         if (waitingFundingCorpOperatePeople.getCreatedAt().getTime() > (System.currentTimeMillis() - 5 * 60 * 1000)) {
             // 更新待放款时间(5分钟之前)
             ArrayList<String> updateWaitingFundingCorpOperatePeople = Lists.newArrayList();
             updateWaitingFundingCorpOperatePeople.add("update waiting_funding_corp_operate_people set created_at = DATE_SUB(created_at, interval 5 minute) where loan_application_history_id = " + loanId + ";");
-            return jolyneCenter.sqlXyqb(JolyneUtil.getJolneSql(updateWaitingFundingCorpOperatePeople));
+            return jolyneCenter.executeXYQBSQL(JolyneUtil.getJolneSql(updateWaitingFundingCorpOperatePeople));
         }
 
+        fetchDataLoanJob();
+        loanDataJob();
+
         return "success";
     }
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/user/service/XyqbUserServiceImpl.java

@@ -179,7 +179,7 @@ public class XyqbUserServiceImpl implements XyqbUserService {
         cancel_list.add("delete from apply_quota_record where user_id="+userId);
         cancel_list.add("delete from user_operation_history where user_id="+userId);
         data.put("sql",cancel_list);
-        String cancel_result = jolyneCenter.sqlXyqb(JSONTools.serialize(data));
+        String cancel_result = jolyneCenter.executeXYQBSQL(JSONTools.serialize(data));
         return "success".equals(cancel_result);
     }