Merge branch 'master' of ssh://gitlab.jqtianxia.cn:2222/zhanhai/windows

src/main/java/com/jqtx/windows/common/mq/CreditListener.java

@@ -13,15 +13,19 @@ import com.jqtx.infrastructure.mq.starter.annotation.MQConsumerComponent;
 import com.jqtx.infrastructure.oss.starter.config.OssUtils;
 import com.jqtx.infrastructure.oss.starter.properties.OssProperties;
 import com.jqtx.infrastructure.util.LoanMobileAESUtil;
+import com.jqtx.windows.common.config.BaseConfig;
+import com.jqtx.windows.common.exception.BizException;
 import com.jqtx.windows.component.CreditComponent;
 import com.jqtx.windows.component.enums.ZNEduEnum;
 import com.jqtx.windows.component.enums.ZNInComeEnum;
 import com.jqtx.windows.component.enums.ZNMarryEnum;
 import com.jqtx.windows.component.enums.ZNRelationEnum;
 import com.jqtx.windows.component.model.CreditModel;
+import com.jqtx.windows.infrastructure.enums.ExceptionCodeEnum;
 import com.jqtx.windows.infrastructure.feign.IClientFeignService;
 import com.jqtx.windows.infrastructure.feign.IWakandaFeignService;
 import com.jqtx.windows.infrastructure.feign.enums.ProductNameEnum;
+import com.jqtx.windows.infrastructure.feign.model.client.ClientFeignModel;
 import com.jqtx.windows.infrastructure.feign.model.wakanda.*;
 import com.jqtx.windows.web.request.CreditSubmitRequest;
 import com.jqtx.windows.web.response.JsonResult;
@@ -49,6 +53,8 @@ public class CreditListener extends AbstractMQConsumerHandler<CreditSubmitReques
 
     @Autowired
     private WindowsProducer windowsProducer;
+    @Autowired
+    private BaseConfig baseConfig;
 
     @Override
     public void run(CreditSubmitRequest request) throws Exception {
@@ -164,12 +170,17 @@ public class CreditListener extends AbstractMQConsumerHandler<CreditSubmitReques
         infoModel.setIdentifyInfo(idModel);
         infoModel.setBasicInfo(basicModel);
         infoModel.setContinuedLoan(false);
-//        ClientFeignModel clientFeignModel = new ClientFeignModel(infoModel.getBasicInfo().getIdCard(), infoModel.getBasicInfo().getName());
-//        JsonResult<String> clientResult = iClientFeignService.getClientNo(clientFeignModel);
-//        if (!clientResult.isSuccess()) {
-//            throw new BizException(ExceptionCodeEnum.SYSTEM_REMOTE_ERROR);
-//        }
-        String clientId = IdUtil.simpleUUID().toString();
+        ClientFeignModel clientFeignModel = new ClientFeignModel(infoModel.getBasicInfo().getIdCard(), infoModel.getBasicInfo().getName());
+        String clientId;
+        if (baseConfig.getUseBaffle().equals("use")) {
+            clientId = IdUtil.simpleUUID().toString();
+        } else {
+            JsonResult<String> clientResult = iClientFeignService.getClientNo(clientFeignModel);
+            if (!clientResult.isSuccess()) {
+                throw new BizException(ExceptionCodeEnum.SYSTEM_REMOTE_ERROR);
+            }
+            clientId = clientResult.getResult();
+        }
         infoModel.setClientNo(clientId);
         infoModel.setOrderNo(request.getOrderNo());