贷前关单

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

@@ -549,6 +549,7 @@ public class OrderServiceImpl implements OrderService{
     public boolean cancelPreLoan(String channelOrderNumber) {
         boolean cancel = true;
         String token = null;
+        String result = "";
         ClfOrderMapping orderMapping = clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
         if (orderMapping == null) {
             log.info("cancelPreLoan,贷前关单失败，无订单 channelOrderNumber={}", channelOrderNumber);
@@ -565,10 +566,21 @@ public class OrderServiceImpl implements OrderService{
                 }
             }
 
-            ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
+            HashMap<Object, Object> data = Maps.newHashMap();
+            Long loanId = orderMapping.getLoanId();
+            if(Objects.nonNull(loanId)){
+                data.put("loanIds",loanId);
+                 result = clothoCenterService.cancelPreLoanHasLoanId(data,token);
+
+            }else{
                 data.put("data",id);
                 data.put("remark","贷前关单");
-            String result = clothoCenterService.cancelPreLoan(data,token);
+                 result = clothoCenterService.cancelPreLoan(data,token);
+            }
+            JSONObject resp = JSONObject.parseObject(result);
+            if(Objects.isNull(resp) || Objects.isNull(resp.get("success")) || !"true".equals(String.valueOf(resp.get("success")))){
+                cancel = false;
+            }
         }catch (Exception e){
             cancel = false;
             log.error(e.getMessage(),e);
@@ -830,5 +842,4 @@ public class OrderServiceImpl implements OrderService{
         tuple.setValue(buttonList);
         return tuple;
     }
-
 }

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

@@ -46,7 +46,7 @@ public interface ClothoCenter {
     String lending(@RequestParam Map data);
 
     /**
-     * 贷前关单
+     * 贷前关单(提现前)
      *
      * @param data
      * @return
@@ -54,6 +54,15 @@ public interface ClothoCenter {
     @PostMapping(value = "/loan/super/close/quota", consumes = "application/x-www-form-urlencoded")
     String cancelPreLoan(@RequestParam Map data,@RequestHeader(value = "x-auth-token") String token);
 
+    /**
+     * 贷前关单(提现后)
+     *
+     * @param data
+     * @return
+     */
+    @PostMapping(value = "/loan/super/close", consumes = "application/x-www-form-urlencoded")
+    String cancelPreLoanHasLoanId(@RequestParam Map data,@RequestHeader(value = "x-auth-token") String token);
+
     /**
      * 贷后关单
      *
@@ -90,6 +99,10 @@ public interface ClothoCenter {
             return null;
         }
 
+        @Override public String cancelPreLoanHasLoanId(Map data, String token) {
+            return null;
+        }
+
         @Override public String cancelAfterLoan(Map data) {
             return null;
         }

src/main/java/cn/quantgroup/cashloanflowboss/spi/clotho/service/ClothoCenterService.java

@@ -98,4 +98,12 @@ public class ClothoCenterService {
         }
     }
 
+    public String cancelPreLoanHasLoanId(Map<Object, Object> data,String token) {
+        if (Application.isDebug()) {
+            return clothoCenter.cancelPreLoanHasLoanId(data,token);
+        } else {
+            return "error";
+        }
+    }
+
 }