fix

src/main/java/cn/quantgroup/cashloanflowboss/api/login/model/Principal.java

@@ -33,6 +33,10 @@ public class Principal {
      */
     private Set<Role> roles;
 
+    /**
+     * 是否测试模式 true 是；false 不是测试（生产环境）
+     */
+    private Boolean debugModel;
     /**
      * 是否是超级管理员
      *

src/main/java/cn/quantgroup/cashloanflowboss/api/login/service/LogService.java

@@ -11,6 +11,7 @@ import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import cn.quantgroup.cashloanflowboss.utils.MD5Tools;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -29,6 +30,9 @@ public class LogService {
     @Autowired
     private HttpServletRequest request;
 
+    @Value("${debug.model}")
+    private Boolean debugModel;
+
     /**
      * 登入
      *
@@ -58,6 +62,7 @@ public class LogService {
         principal.setChannelId(user.getChannelId());
         principal.setRank(user.getRank());
         principal.setRoles(user.getRoles());
+        principal.setDebugModel(debugModel);
 
         session.setAttribute(ApplicationDictionary.PRINCIPAL, JSONTools.serialize(principal));
 

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

@@ -334,7 +334,6 @@ public class OrderService {
         } else {
             // p2p
 
-            this.xyqbCenterService.payResultNotify(orderMapping.getLoanId(), lendingFormModel.getResult());
             Map data = this.xyqbCenterService.queryLendingRecordCount(orderApprove.getFundId(), 0);
             log.info("[order_lending][queryLendingRecordCount]查询待打款数量,channelOrderNumber={}, data={}", lendingFormModel.getChannelOrderNumber(), data);
             if (data.size() > 0) {

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

 package cn.quantgroup.cashloanflowboss.spi.clotho.service;
 
+import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.spi.clotho.client.ClothoCenter;
 import cn.quantgroup.cashloanflowboss.spi.clotho.model.LendingServiceModel;
 import cn.quantgroup.cashloanflowboss.utils.JSONTools;
@@ -38,15 +39,17 @@ public class ClothoCenterService {
      */
     public boolean lending(Integer fundId, BigDecimal amountLimit, Integer pepoleLimit) {
 
-        // TODO WEIWEI 根据返回的数据结构补充判断逻辑
-
+        if (Application.getPrincipal().getDebugModel()) {
             String data = this.clothoCenter.lending(new HashMap(4) {{
                 put("fundingCorpId", fundId);
                 put("amountLimit", amountLimit);
                 put("peopleLimit", pepoleLimit);
             }});
 
+            return "success".equals(data);
+        } else {
             return false;
+        }
 
     }
 
@@ -57,15 +60,27 @@ public class ClothoCenterService {
      * @return
      */
     public String approve(Map<String, Object> approveData) {
+        if (Application.getPrincipal().getDebugModel()) {
             return clothoCenter.approve(approveData);
+        } else {
+            return "error";
+        }
     }
 
     public String cancelPreLoan(Map<Object, Object> data) {
+        if (Application.getPrincipal().getDebugModel()) {
             return clothoCenter.cancelPreLoan(data);
+        } else {
+            return "error";
+        }
     }
 
     public String cancelAfterLoan(Map<Object, Object> data) {
+        if (Application.getPrincipal().getDebugModel()) {
             return clothoCenter.cancelAfterLoan(data);
+        } else {
+            return "error";
+        }
     }
 
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/service/XYQBCenterService.java

@@ -2,6 +2,7 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.service;
 
 import cn.quantgroup.cashloanflowboss.api.order.model.XyqbCurrentOrderStatusServiceResultModel;
 import cn.quantgroup.cashloanflowboss.api.order.model.XyqbHistoryOrderStatusServiceResultModel;
+import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.core.base.ServiceResult;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.client.XYQBCenter;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.Contract;
@@ -186,12 +187,17 @@ public class XYQBCenterService {
      * @return
      */
     public boolean payResultNotify(Long loanId, Boolean expectPayResult) {
+        if (Application.getPrincipal().getDebugModel()) {
             Map paramMap = Maps.newHashMap();
             paramMap.put("orderNo", loanId);
             paramMap.put("payOrderNo", loanId);
             paramMap.put("payTime", "");
             paramMap.put("payStatus", expectPayResult ? 3 : 4);
             return "success".equals(xyqbCenter.pushLendingResult(paramMap));
+        } else {
+            return false;
+        }
+
     }