贷前关单

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

@@ -78,7 +78,7 @@ public class OrderController {
      * @return
      */
     @PostMapping("/cancel/loan")
-    public Result<Boolean> cancelPreLoan(@RequestBody @Valid String channelOrderNumber) {
+    public Result<Boolean> cancelPreLoan(@RequestParam @Valid String channelOrderNumber) {
         return Result.buildSuccess(this.orderService.cancelPreLoan(channelOrderNumber));
     }
 

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

@@ -17,11 +17,13 @@ import cn.quantgroup.cashloanflowboss.spi.clf.service.CLFCenter;
 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.opapi.OPCenter;
 import cn.quantgroup.cashloanflowboss.spi.user.service.XyqbUserService;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.CancelPreLoanRepository;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.service.XYQBCenterService;
 import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import cn.quantgroup.user.retbean.XUser;
+import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import java.math.BigDecimal;
@@ -41,6 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 /**
  * function:
@@ -81,6 +84,13 @@ public class OrderService {
     @Autowired
     private CancelPreLoanRepository cancelPreLoanRepository;
 
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private OPCenter opCenter;
+
+    private static final String auth = "dXNlcj14dWV6aiZwYXNzd29yZD0xMjMxMjNxd2Vxd2U%3D";
 
     public Page<OrderVo> getOrders(Long channelId, String channelOrderNo, Integer pageNumber, Integer pageSize) {
         Page<ClfOrderMapping> page = this.clfOrderMappingRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
@@ -290,23 +300,33 @@ public class OrderService {
    * @return
    */
   public boolean cancelPreLoan(String channelOrderNumber) {
-
-        /*Order order = this.orderRepository.findOrderByChannelOrderNumber(channelOrderNumber);
-
-        ClfOrderMapping orderMapping = this.clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
-
-        if (orderMapping == null) {
-            log.info("cancelPreLoan,贷前关单失败，无订单 channelOrderNumber={}", channelOrderNumber);
-            return false;
-        }*/
-
-    Long id = cancelPreLoanRepository.cancelPreLoan(channelOrderNumber);
-
-    ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
-    data.put("data",id);
-    data.put("remark","系统关单");
-    String result = clothoCenter.cancelPreLoan(data);
-    return true;
+    boolean cancel = true;
+    String token = null;
+    ClfOrderMapping orderMapping = clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
+    if (orderMapping == null) {
+      log.info("cancelPreLoan,贷前关单失败，无订单 channelOrderNumber={}", channelOrderNumber);
+      return false;
+    }
+    try{
+      Long id = cancelPreLoanRepository.cancelPreLoan(orderMapping.getApplyNo());
+      String response = opCenter.getToken(auth);
+      JSONObject responseJ = JSONObject.parseObject(response);
+      if(responseJ != null && responseJ.containsKey("data")){
+        JSONObject data = (JSONObject) responseJ.get("data");
+        if(data != null && data.containsKey("token")){
+          token = String.valueOf(data.get("token"));
+        }
+      }
+
+      ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
+      data.put("data",id);
+      data.put("remark","贷前关单");
+      String result = clothoCenter.cancelPreLoan(data,token);
+    }catch (Exception e){
+      cancel = false;
+      log.error(e.getMessage(),e);
+    }
+    return cancel;
   }
 
   /**
@@ -320,7 +340,7 @@ public class OrderService {
     ClfOrderMapping orderMapping = this.clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
 
     if (orderMapping == null) {
-      log.info("cancelAfterLoan,贷后关单失败，无订单 channelOrderNumber={}", channelOrderNumber);
+      log.info("cancelAfterLoan,贷后关单失败，无订单  ={}", channelOrderNumber);
       return false;
     }
     if (orderMapping.getLoanId() == null) {

src/main/java/cn/quantgroup/cashloanflowboss/spi/clotho/client/ClothoCenter.java

 package cn.quantgroup.cashloanflowboss.spi.clotho.client;
 
 import cn.quantgroup.cashloanflowboss.spi.clotho.exception.ClothoCenterException;
+import java.util.Map;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
@@ -47,7 +49,7 @@ public interface ClothoCenter {
      * @return
      */
     @PostMapping(value = "/loan/super/close/quota", consumes = "application/x-www-form-urlencoded")
-    String cancelPreLoan(@RequestParam Map data);
+    String cancelPreLoan(@RequestParam Map data,@RequestHeader(value = "x-auth-token") String token);
 
     /**
      * 贷后关单
@@ -76,7 +78,7 @@ public interface ClothoCenter {
             return null;
         }
 
-        @Override public String cancelPreLoan(Map data) {
+        @Override public String cancelPreLoan(Map data, String token) {
             return null;
         }
 

src/main/java/cn/quantgroup/cashloanflowboss/spi/opapi/OPCenter.java

+package cn.quantgroup.cashloanflowboss.spi.opapi;
+
+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.RequestParam;
+
+
+@Component
+@FeignClient(name = "OPCenterService", url = "${op.api-host}", fallback = OPCenter.Fallback.class)
+public interface OPCenter {
+  @GetMapping(value = "/user/login")
+  String getToken(@RequestParam("auth") String auth);
+
+  @Component
+  class Fallback implements OPCenter {
+
+    @Override
+    public String getToken(String auth) {
+      return null;
+    }
+  }
+}
+