个贷提现修改

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -292,7 +292,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Transactional
     public HttpResult<Object> inert(SysUserAccountVo sysUserAccountVo) {
         String userId = BaseController.getUser().getId();
-        if (isManagement(userId) && sysSwitchConfigService.getBalanceExtractStatus()){
+        if (isManagement(userId) ){
             //  个代走线上付款
             UserWithdrawal withdrawal = new UserWithdrawal();
             withdrawal.setUserId(userId);

src/main/java/com/ydtech/modules/ttqf/RetrieveTTQFApi.java

@@ -236,7 +236,19 @@ public class RetrieveTTQFApi {
         PresignResponse response = tangClient.execute(request);
         if(response.isSuccess()) {
             log.info("成功 ====>Pressing {}", response.getResultModel());
-            return contractH5(sysUser.getIdentity());
+            ContractH5Response h5Response = contractH5(sysUser.getIdentity());
+            if(h5Response.isSuccess()) {
+                //  返回当前签约H5页面
+                String signUrl = h5Response.getResultModel().getSignUrl();
+                if (!StringUtils.isEmpty(signUrl)){
+                    signService.saveUserSign(sysUser.getIdentity(),sysUser.getId());
+                }
+                log.info("成功 ====>ContractH5 {}", response.getResultModel());
+                return signUrl;
+            } else {
+                log.error("调起用户签约信息异常");
+                throw new SystemException("调起用户签约信息异常");
+            }
         } else {
             log.error("失败{}", response);
             return response.getBizMsg();
@@ -261,20 +273,12 @@ public class RetrieveTTQFApi {
     /**
      * 合同签约唤起接口
      */
-    public static String contractH5(String idCardNo) {
-        ContractH5Response response = tangClient.execute(ContractH5Request.builder()
+    public static ContractH5Response contractH5(String idCardNo) {
+        return tangClient.execute(ContractH5Request.builder()
                 .requestId(System.currentTimeMillis() + "").bizModel(ContractH5Model.builder()
                         .idCardNo(idCardNo).mchReturnUrl(PayConstantStatus.getUserSignNotifyUrl()).build())
                 .build());
-        if(response.isSuccess()) {
-            //  返回当前签约H5页面
-            String signUrl = response.getResultModel().getSignUrl();
-            log.info("成功 ====>ContractH5 {}", response.getResultModel());
-            return signUrl;
-        } else {
-            log.error("调起用户签约信息异常");
-        }
-        return "";
+
     }
 
     /**

src/main/java/com/ydtech/modules/ttqf/service/impl/TtqfServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ipaynow.jiaxin.domain.QueryPresignResultModel;
 import com.ipaynow.jiaxin.response.BillDownloadResponse;
+import com.ipaynow.jiaxin.response.ContractH5Response;
 import com.ipaynow.jiaxin.response.ReceiptlDownloadResponse;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
@@ -222,9 +223,9 @@ public class TtqfServiceImpl implements TtqfService {
 
     @Override
     public HttpResult queryPressing(UserWithdrawal withdrawal) {
-        if (!sysSwitchConfigService.getBalanceExtractStatus()){
-            return HttpResult.ok(WithdrawalFRes.builder().bizCode("0").msg("").url("").build());
-        }
+//        if (!sysSwitchConfigService.getBalanceExtractStatus()){
+//            return HttpResult.ok(WithdrawalFRes.builder().bizCode("0").msg("").url("").build());
+//        }
         SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
         if (Objects.isNull(sysUser)){
             return HttpResult.error("用户不存在，请检查");
@@ -237,7 +238,16 @@ public class TtqfServiceImpl implements TtqfService {
         }
         PayUserSign payUserSign = signService.selectOne(sysUser.getIdentity(),sysUser.getId());
         if (!Objects.isNull(payUserSign)){
-            String signUrl = RetrieveTTQFApi.contractH5(sysUser.getIdentity());
+            ContractH5Response h5Response = RetrieveTTQFApi.contractH5(sysUser.getIdentity());
+            String signUrl = "";
+            if(h5Response.isSuccess()) {
+                //  返回当前签约H5页面
+                 signUrl = h5Response.getResultModel().getSignUrl();
+                log.info("成功 ====>ContractH5 {}", h5Response.getResultModel());
+            } else {
+                log.error("调起用户签约信息异常");
+                throw new SystemException("调起用户签约信息异常");
+            }
             if (Objects.equals(PayConstantStatus.SIGN_STATUS,payUserSign.getSign()) &&
                     Objects.equals(PayConstantStatus.AUTH_STATUS,payUserSign.getAuthStatus())){
 
@@ -272,9 +282,6 @@ public class TtqfServiceImpl implements TtqfService {
                 return HttpResult.error("用户身份证号不存在，请检查");
             }
             String pres = RetrieveTTQFApi.pres(sysUser, withdrawal);
-            if (!StringUtils.isEmpty(pres)){
-                signService.saveUserSign(sysUser.getIdentity(),sysUser.getId());
-            }
             return HttpResult.ok(WithdrawalFRes.builder().bizCode("").url(pres).msg("").build());
         }catch (Exception e){
             log.error("获取用户签约信息异常{}",e.getMessage());