灵活用工

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

@@ -251,14 +251,14 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     public BasePageResult<SysUserAccount> queryByVo1(SysUserAccountVo sysUserAccountVo) {
         Page<SysUserAccount> page = new Page<>(sysUserAccountVo.getPageNum(), sysUserAccountVo.getPageSize());
-        Page<SysUserAccount> sysUserAccountHistoryPage = baseMapper.queryPageOrder1(page,sysUserAccountVo);
-        if(sysUserAccountHistoryPage!=null){
+        Page<SysUserAccount> sysUserAccountHistoryPage = baseMapper.queryPageOrder1(page, sysUserAccountVo);
+        if (sysUserAccountHistoryPage != null) {
             List<SysUserAccount> records = sysUserAccountHistoryPage.getRecords();
             List<SysUserAccount> newRecords = new ArrayList<>();
-            if(records!=null && !records.isEmpty()){
-                for(SysUserAccount  sysUserAccount :records){
+            if (records != null && !records.isEmpty()) {
+                for (SysUserAccount sysUserAccount : records) {
                     //重新赋值总金额  - 已提现金额  支付中金额
-                    MySumAmountQueryDto mySumAmountQueryDto =new MySumAmountQueryDto();
+                    MySumAmountQueryDto mySumAmountQueryDto = new MySumAmountQueryDto();
                     mySumAmountQueryDto.setUserId(sysUserAccount.getUserId());
                     //出单员是19 且是渠道的话，给渠道团队长
                     if ("21".equals(sysUserAccount.getRoleId()) && "1".equals(sysUserAccount.getManagementSource())) {
@@ -269,11 +269,11 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                         mySumAmountQueryDto.setGroupFlag(true);
                     }
                     // 已提现金额   查询历史表中的审核状态为3的数据
-                    BigDecimal ysTXAmount = insFeeOrderNewService.findMyAmountYTXmount(mySumAmountQueryDto.getUserId(), "3",mySumAmountQueryDto.getGroupFlag());
+                    BigDecimal ysTXAmount = insFeeOrderNewService.findMyAmountYTXmount(mySumAmountQueryDto.getUserId(), "3", mySumAmountQueryDto.getGroupFlag());
                     // 提现中
-                    BigDecimal txzTXAmount = insFeeOrderNewService.findMyAmountYTXmount(mySumAmountQueryDto.getUserId(), "2",mySumAmountQueryDto.getGroupFlag());
+                    BigDecimal txzTXAmount = insFeeOrderNewService.findMyAmountYTXmount(mySumAmountQueryDto.getUserId(), "2", mySumAmountQueryDto.getGroupFlag());
                     // 可提现
-                    BigDecimal ssKTAmount = sysUserAccount.getSumAmount()==null?BigDecimal.ZERO:sysUserAccount.getSumAmount();
+                    BigDecimal ssKTAmount = sysUserAccount.getSumAmount() == null ? BigDecimal.ZERO : sysUserAccount.getSumAmount();
                     //总的 =  已提现金额+  可提现金额 +  提现中
                     BigDecimal sumAmount = ysTXAmount.add(ssKTAmount).add(txzTXAmount);
                     sysUserAccount.setSumAmountWithdrawal(sumAmount);
@@ -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) ){
+        if (isManagement(userId) && sysSwitchConfigService.getBalanceExtractStatus()) {
             //  个代走线上付款
             UserWithdrawal withdrawal = new UserWithdrawal();
             withdrawal.setUserId(userId);
@@ -302,12 +302,12 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         }
         //add  by  hxl   2024-09-26 添加电销组员开关
         boolean flag = sysSwitchConfigService.dxtxDisplaySwitches();
-        if(flag){
+        if (flag) {
             // add  by  hxl   2024-09-25 电销组员无法提现
             SysUser user = sysUserService.getById(userId);
             SysUserBaseVO sysUserBaseVO = sysUserService.selectUserById(userId);
             SysDept dept = sysDeptService.getById(user.getDeptId());
-            if("3".equals(sysUserBaseVO.getRoleId()) && "3".equals(dept.getManagementSource())){
+            if ("3".equals(sysUserBaseVO.getRoleId()) && "3".equals(dept.getManagementSource())) {
                 throw new SystemException("电销组员不能提现");
             }
         }
@@ -418,7 +418,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 
     public boolean isManagement(String userId) {
         SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(userId);
-        if (ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())){
+        if (ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())) {
             return true;
         }
         return false;
@@ -437,12 +437,12 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         String userId = sysUserAccountVo.getUserId();
         //add  by  hxl   2024-09-26 添加电销组员开关
         boolean flag = sysSwitchConfigService.dxtxDisplaySwitches();
-        if(flag){
+        if (flag) {
             // add  by  hxl   2024-09-25 电销组员无法提现
             SysUser user = sysUserService.getById(userId);
             SysUserBaseVO sysUserBaseVO = sysUserService.selectUserById(userId);
             SysDept dept = sysDeptService.getById(user.getDeptId());
-            if("3".equals(sysUserBaseVO.getRoleId()) && "3".equals(dept.getManagementSource())){
+            if ("3".equals(sysUserBaseVO.getRoleId()) && "3".equals(dept.getManagementSource())) {
                 throw new SystemException("电销组员不能提现");
             }
         }
@@ -1622,12 +1622,12 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         BigDecimal ysAndSsTGAmount = ysTGAmount.add(ssTGAmount);
 
         // 已提现金额   查询历史表中的审核状态为3的数据
-        BigDecimal ysTXAmount = insFeeOrderNewService.findMyAmountYTXmount(mySumAmountQueryDto.getUserId(), "3",mySumAmountQueryDto.getGroupFlag());
+        BigDecimal ysTXAmount = insFeeOrderNewService.findMyAmountYTXmount(mySumAmountQueryDto.getUserId(), "3", mySumAmountQueryDto.getGroupFlag());
         // 可提现金额    查询账户的钱
         mySumAmountQueryDto.setAuditstatus("1");
         SysUserAccount sysUserAccountEntity = baseMapper.getById(mySumAmountQueryDto.getUserId());
         // 提现中
-        BigDecimal txzTXAmount = insFeeOrderNewService.findMyAmountYTXmount(mySumAmountQueryDto.getUserId(), "2",mySumAmountQueryDto.getGroupFlag());
+        BigDecimal txzTXAmount = insFeeOrderNewService.findMyAmountYTXmount(mySumAmountQueryDto.getUserId(), "2", mySumAmountQueryDto.getGroupFlag());
         // 可提现
         BigDecimal ssKTAmount = BigDecimal.ZERO;
         //if(mySumAmountQueryDto.getGroupFlag()){
@@ -1642,11 +1642,12 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 
         return new MySumAmountDto(ysAmount, ssAmount, ysAndSsAmount, ysTGAmount, ssTGAmount, ysAndSsTGAmount, ysTXAmount, ssKTAmount, sumAmount, txzTXAmount);
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/9/12 9:46
-     *  @Description:  判断渠道金额
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/12 9:46
+     * @Description: 判断渠道金额
      */
     private void judgeAmount(BigDecimal amount, String userId) {
         if (amount == null) {
@@ -1657,26 +1658,28 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         SysUser sysUser = sysUserMapper.selectById(userId);
         SysDept dept = sysDeptService.getById(sysUser.getDeptId());
         //渠道
-        if("1".equals(dept.getManagementSource())){
+        if ("1".equals(dept.getManagementSource())) {
             BigDecimal remainder = amount.remainder(new BigDecimal("100"));
-            if(remainder.compareTo(BigDecimal.ZERO) > 0){
+            if (remainder.compareTo(BigDecimal.ZERO) > 0) {
                 throw new SystemException("提现金额必须为100的倍数");
             }
         }
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/1/6 18:27
-     *  @Description:  查询提现的总金额
+     * @version
+     * @author: hxl
+     * @Date: 2025/1/6 18:27
+     * @Description: 查询提现的总金额
      */
     @Override
-    public BigDecimal queryCount() {;
+    public BigDecimal queryCount() {
+        ;
         List<SysUserAccount> list = baseMapper.queryCount();
-        BigDecimal sumYsTXAmount =BigDecimal.ZERO;
-        if(list!=null && !list.isEmpty()){
-            for(SysUserAccount  sysUserAccount :list){
-                MySumAmountQueryDto mySumAmountQueryDto =new MySumAmountQueryDto();
+        BigDecimal sumYsTXAmount = BigDecimal.ZERO;
+        if (list != null && !list.isEmpty()) {
+            for (SysUserAccount sysUserAccount : list) {
+                MySumAmountQueryDto mySumAmountQueryDto = new MySumAmountQueryDto();
                 mySumAmountQueryDto.setUserId(sysUserAccount.getUserId());
                 //出单员是19 且是渠道的话，给渠道团队长
                 if ("21".equals(sysUserAccount.getRoleId()) && "1".equals(sysUserAccount.getManagementSource())) {
@@ -1687,17 +1690,18 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                     mySumAmountQueryDto.setGroupFlag(true);
                 }
                 // 可提现
-                BigDecimal ssKTAmount = sysUserAccount.getSumAmount()==null?BigDecimal.ZERO:sysUserAccount.getSumAmount();
-                sumYsTXAmount =sumYsTXAmount.add(ssKTAmount);
+                BigDecimal ssKTAmount = sysUserAccount.getSumAmount() == null ? BigDecimal.ZERO : sysUserAccount.getSumAmount();
+                sumYsTXAmount = sumYsTXAmount.add(ssKTAmount);
             }
         }
-        return   sumYsTXAmount;
+        return sumYsTXAmount;
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/1/6 18:28
-     *  @Description:  通过用户id查询银行卡信息
+     * @version
+     * @author: hxl
+     * @Date: 2025/1/6 18:28
+     * @Description: 通过用户id查询银行卡信息
      */
     @Override
     public List<SysUserBankCard> queryCardListByUserId(String userId) {

src/main/java/com/ydtech/modules/esm/model/vo/EsmUserImageQueryVo.java

@@ -8,9 +8,10 @@ import lombok.EqualsAndHashCode;
 @Data
 public class EsmUserImageQueryVo extends EsmUserImageVo {
 
-
     @ApiModelProperty("影像地址")
     private String path;
 
+    @ApiModelProperty("文件存储路劲")
+    private String filePath;
 
 }

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

@@ -34,45 +34,50 @@ import java.util.Objects;
 @Slf4j
 public class RetrieveTTQFApi {
 
-
     private static TangClient tangClient;
 
     private static SavePayOrder savePayOrder;
 
     private static PayUserSignService signService;
 
+    private static TTFQConfig ttfQConfig;
 
     @Resource
-    private void setSignService(PayUserSignService userSignService){
+    private void setSignService(PayUserSignService userSignService) {
         signService = userSignService;
     }
 
 
     @Resource
-    private void setSavePayOrder(SavePayOrder order){
+    private void setSavePayOrder(SavePayOrder order) {
         savePayOrder = order;
     }
 
     @Resource(name = "tangClient")
-    private void setConfig(TangClient client){
+    private void setConfig(TangClient client) {
         tangClient = client;
     }
 
+    @Resource
+    public void setTtfQConfig(TTFQConfig config) {
+        ttfQConfig = config;
+    }
 
-
-    public  static boolean extractBalance(SysUser sysUser,UserWithdrawal withdrawal){
+    public static boolean extractBalance(SysUser sysUser, UserWithdrawal withdrawal) {
         QueryPresignResultModel resultModel = queryPressing(sysUser.getIdentity());
         //这俩验证银行卡是否处于绑定状态
-        List<QueryPresignResultModel.BankCard> cards = resultModel.getCards();
+//        List<QueryPresignResultModel.BankCard> cards = resultModel.getCards();
         //
-        QueryPresignResultModel.BankCard bankCard = cards.stream().filter(v -> v.getBankCardNo().equals(withdrawal.getBankNumber())).findAny().orElse(null);
-        if (bankCard == null){
-            throw new SystemException("银行卡未绑定");
-        }
-        if (Objects.equals(PayConstantStatus.SIGN_STATUS,resultModel.getSignStatus()) &&
-                Objects.equals(PayConstantStatus.AUTH_STATUS,resultModel.getAuthStatus())){
+//        QueryPresignResultModel.BankCard bankCard = cards.stream()
+//                .filter(v -> v.getBankCardNo().equals(withdrawal.getBankNumber()))
+//                .findAny().orElse(null);
+//        if (bankCard == null) {
+//            throw new SystemException("银行卡未绑定");
+//        }
+        if (Objects.equals(PayConstantStatus.SIGN_STATUS, resultModel.getSignStatus()) &&
+                Objects.equals(PayConstantStatus.AUTH_STATUS, resultModel.getAuthStatus())) {
             BigDecimal accountBalance = balance();
-            if (BigDecimal.ZERO.compareTo(accountBalance) == 0 || (accountBalance.compareTo(withdrawal.getAmount()) == -1)){
+            if (BigDecimal.ZERO.compareTo(accountBalance) == 0 || (accountBalance.compareTo(withdrawal.getAmount()) < 0)) {
                 throw new SystemException("商户余额不足，请联系管理员");
             }
             //用户已经签约  进行打款操作
@@ -82,8 +87,8 @@ public class RetrieveTTQFApi {
         }
     }
 
-    
-    public  static boolean orderAdd(SysUser sysUser,UserWithdrawal withdrawal){
+
+    public static boolean orderAdd(SysUser sysUser, UserWithdrawal withdrawal) {
         OrderAddModel addModel = OrderAddModel.builder()
                 .mchBatchNo(System.currentTimeMillis() + "")
                 .mchOrderNo(GenerateOrderNumberUtils.nextNumber() + "")
@@ -96,11 +101,9 @@ public class RetrieveTTQFApi {
                 //收款人身份证号
                 .userIdCardNo(sysUser.getIdentity())
                 //工作量衡量标准模板
-                .userWorkload("1849326302238785538")
+                .userWorkload(ttfQConfig.getUserWorkload())
                 //工作量衡量标准
-                .userWorkloadLevel(
-                        "[{\"proj\":\"山西掌柜鼎科技有限公司\",\"std\":\"1\"}]"
-                )
+                .userWorkloadLevel(ttfQConfig.getUserWorkloadLevel())
                 //打款金额 Number(15,2)
                 // M 单位为元，风控可调额
                 .amount(withdrawal.getAmount())
@@ -112,10 +115,11 @@ public class RetrieveTTQFApi {
                 .notifyUrl(PayConstantStatus.getPaymentNoticeUrl())
                 .build();
         OrderAddResponse response = testOrderAdd(addModel, sysUser.getId());
-        if(response.isSuccess()) {
+        if (response.isSuccess()) {
             log.info("成功 ====>orderAdd {}", response.getResultModel());
         } else {
             log.error("失败 ====>orderAdd {}", response.getRespData());
+            throw new SystemException(response.getRespData());
         }
         return response.isSuccess();
 
@@ -130,7 +134,7 @@ public class RetrieveTTQFApi {
         OrderNotifyModel model = OrderNotifyModel.builder().orderId("czhl00000001")
                 .tradeTime(new Date()).tradeStatus("3").cardNo("1234567890").build();
         request.setBizModel(model);
-        request.setRequestId(System.currentTimeMillis()+"");
+        request.setRequestId(System.currentTimeMillis() + "");
         OrderNotifyResponse response = tangClient.execute(request);
         System.out.println(response);
 
@@ -139,13 +143,14 @@ public class RetrieveTTQFApi {
 
     /**
      * 图片上传接口
+     *
      * @throws IOException
      */
     private static String testPictureUpload(String encodeBase64) throws IOException {
         PictureUploadRequest request = new PictureUploadRequest();
         PictureUploadModel model = PictureUploadModel.builder().picture(encodeBase64).build();
         request.setBizModel(model);
-        request.setRequestId(System.currentTimeMillis()+"");
+        request.setRequestId(System.currentTimeMillis() + "");
         PictureUploadResponse response = tangClient.execute(request);
         log.info(JSON.toJSONString(response));
         return response.getResultModel().getFileId();
@@ -154,22 +159,22 @@ public class RetrieveTTQFApi {
     /**
      * 账单下载接口
      */
-    public static BillDownloadResponse billDownload(Integer type,String date) {
+    public static BillDownloadResponse billDownload(Integer type, String date) {
         BillDownloadRequest request = new BillDownloadRequest();
         BillDownloadModel model = BillDownloadModel.builder().type(type).date(date).build();
         request.setBizModel(model);
-        request.setRequestId(System.currentTimeMillis()+"");
+        request.setRequestId(System.currentTimeMillis() + "");
         return tangClient.execute(request);
     }
 
     /**
-     *电子回执单瞎子啊接口
+     * 电子回执单瞎子啊接口
      */
     public static ReceiptlDownloadResponse receiptDownload(String mchOrderNo, String orderNo) {
         ReceiptDownloadRequest request = new ReceiptDownloadRequest();
         ReceiptDownloadModel model = ReceiptDownloadModel.builder().mchOrderNo(mchOrderNo).orderNo(orderNo).build();
         request.setBizModel(model);
-        request.setRequestId(System.currentTimeMillis()+"");
+        request.setRequestId(System.currentTimeMillis() + "");
         return tangClient.execute(request);
     }
 
@@ -182,7 +187,7 @@ public class RetrieveTTQFApi {
         request.setBizModel(model);
         request.setRequestId(System.currentTimeMillis() + "");
         PreviewResponse response = tangClient.execute(request);
-        if(response.isSuccess()) {
+        if (response.isSuccess()) {
             log.info("成功 ====>Preview {}", response);
         } else {
             log.error("失败 ====>Preview {}", response);
@@ -192,10 +197,10 @@ public class RetrieveTTQFApi {
     /**
      * 用户预签约接口
      */
-    public static String pres(SysUser sysUser,UserWithdrawal withdrawal){
+    public static String pres(SysUser sysUser, UserWithdrawal withdrawal) {
         PresignRequest request = new PresignRequest();
         List<EsmUserImageQueryVo> esmUserImageQueryVo = SpringUtil.getBean(EsmUserImageService.class).getEsmUserImageQueryVo(sysUser.getId());
-        if (CollectionUtils.isEmpty(esmUserImageQueryVo)){
+        if (CollectionUtils.isEmpty(esmUserImageQueryVo)) {
             throw new SystemException("用户影像资料不存在，请补全后在申请提现");
         }
         PresignModel presignModel = new PresignModel();
@@ -203,29 +208,29 @@ public class RetrieveTTQFApi {
         presignModel.setMobile(sysUser.getMobile());
         presignModel.setIdCardNo(sysUser.getIdentity());
         presignModel.setBankCardNo(withdrawal.getBankNumber());
-        if (sysUser.getIdentityTime().contains(",")){
+        if (sysUser.getIdentityTime().contains(",")) {
             presignModel.setExpiryStart(sysUser.getIdentityTime().split(",")[0]);
             presignModel.setExpiryEnd(sysUser.getIdentityTime().split(",")[1]);
-        }else {
+        } else {
             throw new SystemException("用户身份证有效日期不全，请检查");
         }
         presignModel.setNotifyUrl(PayConstantStatus.getUserSignNotifyUrl());
         for (EsmUserImageQueryVo item : esmUserImageQueryVo) {
             try {
-                if (StringUtils.isEmpty(item.getPath())){
+                if (StringUtils.isEmpty(item.getPath())) {
                     throw new SystemException("用户身份证影像资料不存在,请检查");
                 }
-                String encoded = Base64Utils.encodeToString(FileUtil.readBytes(item.getPath()));
-                if (StringUtils.isEmpty(encoded)){
+                String encoded = Base64Utils.encodeToString(FileUtil.readBytes(item.getFilePath()));
+                if (StringUtils.isEmpty(encoded)) {
                     throw new SystemException("用户身份证影像资料不存在或已删除，请刷新后重试");
                 }
-                if (DocumentClass.SFZ_01.getCode().equals(item.getType())){
+                if (DocumentClass.SFZ_01.getCode().equals(item.getType())) {
                     presignModel.setIdCardPicAFileId(testPictureUpload(encoded));
-                }else if(DocumentClass.SFZ_02.getCode().equals(item.getType())){
+                } else if (DocumentClass.SFZ_02.getCode().equals(item.getType())) {
                     presignModel.setIdCardPicBFileId(testPictureUpload(encoded));
                 }
-            }catch (Exception e){
-                log.error("获取影像信息错误：{}",e.getMessage());
+            } catch (Exception e) {
+                log.error("获取影像信息错误：{}", e.getMessage());
                 e.printStackTrace();
             }
         }
@@ -234,14 +239,14 @@ public class RetrieveTTQFApi {
         request.setBizModel(presignModel);
         request.setRequestId(System.currentTimeMillis() + "");
         PresignResponse response = tangClient.execute(request);
-        if(response.isSuccess()) {
+        if (response.isSuccess()) {
             log.info("成功 ====>Pressing {}", response.getResultModel());
             ContractH5Response h5Response = contractH5(sysUser.getIdentity());
-            if(h5Response.isSuccess()) {
+            if (h5Response.isSuccess()) {
                 //  返回当前签约H5页面
                 String signUrl = h5Response.getResultModel().getSignUrl();
-                if (!StringUtils.isEmpty(signUrl)){
-                    signService.saveUserSign(sysUser.getIdentity(),sysUser.getId());
+                if (!StringUtils.isEmpty(signUrl)) {
+                    signService.saveUserSign(sysUser.getIdentity(), sysUser.getId());
                 }
                 log.info("成功 ====>ContractH5 {}", response.getResultModel());
                 return signUrl;
@@ -261,7 +266,7 @@ public class RetrieveTTQFApi {
     public static QueryPresignResultModel queryPressing(String idCardNo) {
         QueryPresignResponse response = tangClient.execute(QueryPresignRequest.builder().requestId(System.currentTimeMillis() + "")
                 .bizModel(new QueryPresignModel(idCardNo)).build());
-        if(response.isSuccess()) {
+        if (response.isSuccess()) {
             log.info("成功 ====>QueryPressing {}", response.getResultModel());
             return response.getResultModel();
         } else {
@@ -284,7 +289,7 @@ public class RetrieveTTQFApi {
     /**
      * 打款订单新增接口
      */
-    public static OrderAddResponse testOrderAdd(OrderAddModel addModel,String userId) {
+    public static OrderAddResponse testOrderAdd(OrderAddModel addModel, String userId) {
         OrderAddRequest addRequest = OrderAddRequest.builder()
                 .requestId(System.currentTimeMillis() + "")
                 .bizModel(addModel)
@@ -292,11 +297,11 @@ public class RetrieveTTQFApi {
         OrderAddResponse response = tangClient.execute(addRequest);
         boolean confirm = false;
         String sysAmountAuditingId = "";
-        if (response.isSuccess()){
-            confirm = confirm(response.getResultModel().getOrderNo(),response.getResultModel().getBatchNo());
+        if (response.isSuccess()) {
+            confirm = confirm(response.getResultModel().getOrderNo(), response.getResultModel().getBatchNo());
             sysAmountAuditingId = SpringUtil.getBean(AmountAuditingService.class).sendMessage(response.getResultModel().getAmount(), userId, addModel.getUserBankCardNo());
         }
-        savePayOrder.savePayOrder(addRequest.getApiUrl(),response, JSONObject.toJSONString(addModel),JSONObject.toJSONString(response),userId, confirm,sysAmountAuditingId);
+        savePayOrder.savePayOrder(addRequest.getApiUrl(), response, JSONObject.toJSONString(addModel), JSONObject.toJSONString(response), userId, confirm, sysAmountAuditingId);
         return response;
     }
 
@@ -310,7 +315,7 @@ public class RetrieveTTQFApi {
                         .mchOrderNo("abc1111111114")
                         .orderNo("")
                         .build()).build());
-        if(response.isSuccess()) {
+        if (response.isSuccess()) {
             System.out.println("成功 ====>OrderCancel " + response.getResultModel());
         } else {
             System.out.println("失败 ====>OrderCancel " + response.getRespData());
@@ -325,7 +330,7 @@ public class RetrieveTTQFApi {
                 .requestId(System.currentTimeMillis() + "")
                 .bizModel(OrderQueryModel.builder().mchOrderNo("").orderNo(orderNo).build())
                 .build());
-        if(response.isSuccess()) {
+        if (response.isSuccess()) {
             log.info("成功 ====>OrderQuery {}", response.getResultModel());
         } else {
             log.error("失败 ====>OrderQuery {}", response.getRespData());
@@ -336,11 +341,11 @@ public class RetrieveTTQFApi {
     /**
      * \确认打款接口
      */
-    public static boolean confirm(String orderNo,String batchNo) {
+    public static boolean confirm(String orderNo, String batchNo) {
         ConfirmRequest confirmRequest = ConfirmRequest.builder().requestId(System.currentTimeMillis() + "")
                 .bizModel(ConfirmModel.builder().mchBatchNo("").batchNo(batchNo).build()).build();
         ConfirmResponse response = tangClient.execute(confirmRequest);
-        if(response.isSuccess()) {
+        if (response.isSuccess()) {
             log.info("成功 ====>Confirm{}", response.getResultModel());
             //startPaymentResultCallback(orderNo);
         } else {
@@ -352,17 +357,18 @@ public class RetrieveTTQFApi {
 
     /**
      * 异步检查打款状态
+     *
      * @param orderNo
      */
-    public static void startPaymentResultCallback(String orderNo){
+    public static void startPaymentResultCallback(String orderNo) {
         try {
             HashMap<String, String> hashMap = new HashMap<>();
-            hashMap.put("orderNo",orderNo);
+            hashMap.put("orderNo", orderNo);
             QuartzManager manager = QuartzManager.getInstance();
-            manager.getContext().put("flag",true);
+            manager.getContext().put("flag", true);
             //manager.addJob(orderNo,"jobGroup" + orderNo, RegularlyUpdateStatus.class,"*/5 * * * * ?",hashMap);
             manager.start();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -376,12 +382,12 @@ public class RetrieveTTQFApi {
                     .requestId(System.currentTimeMillis() + "").bizModel(MerchantBalanceModel.builder().build())
                     .build();
             MerchantBalanceResponse response = tangClient.execute(balanceRequest);
-            if (response.isSuccess()){
+            if (response.isSuccess()) {
                 return response.getResultModel().getAvailableBalance();
-            }else {
+            } else {
                 return BigDecimal.ZERO;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("查询商户余额异常{}", e.getMessage());
             return BigDecimal.ZERO;
         }

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

@@ -13,20 +13,25 @@ import org.springframework.context.annotation.Configuration;
 @Data
 public class TTFQConfig {
 
-    public  String mchPrivateKey;
+    public String mchPrivateKey;
 
-    public  String platformPublicKey;
+    public String platformPublicKey;
 
-    public  String host;
+    public String host;
 
-    public  String mchId;
+    public String mchId;
 
     private String lgUrl;
 
+    //  工作量衡量标准模板
+    private String userWorkload;
+
+    // 工作量衡量标准
+    private String userWorkloadLevel;
 
     @Bean(name = "tangClient")
     public TangClient getClient() {
-        return new DefaultTangClient(host, mchPrivateKey,  platformPublicKey,mchId);
+        return new DefaultTangClient(host, mchPrivateKey, platformPublicKey, mchId);
     }
 
 }

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

@@ -223,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("用户不存在，请检查");

src/main/resources/application-pre.yml

@@ -479,6 +479,8 @@ ttqf:
   host: https://ttqftest.chinaums.com
   lg-url: https://test.baoxianzhanggui.com/prod-api/paySign/information/zgInformationPush
   tokenUrl: https://test.baoxianzhanggui.com/web-api
+  userWorkload: 1832974247596724225
+  userWorkloadLevel: '[{"d":"件","max":"10000.00","min":"100","proj":"山西掌柜鼎科技有限公司","std":"100元-10000.00元/件"}]'
 
 #灵活用工平台实时推送ip地址
 sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api

src/main/resources/application-prod.yml

@@ -485,6 +485,8 @@ ttqf:
   host: https://ttqf.chinaums.com
   lg-url: https://sxzgkj.baoxianzhanggui.com/linggong/paySign/information/zgInformationPush
   tokenUrl: https://sxzgkj.baoxianzhanggui.com/web-api
+  userWorkload: 1832974247596724225
+  userWorkloadLevel: '[{"d":"件","max":"10000.00","min":"100","proj":"山西掌柜鼎科技有限公司","std":"100元-10000.00元/件"}]'
 
 #灵活用工平台实时推送ip地址
 sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api

src/main/resources/application-test.yml

@@ -510,6 +510,8 @@ ttqf:
   host: https://ttqftest.chinaums.com
   lg-url: https://test.baoxianzhanggui.com/prod-api/paySign/information/zgInformationPush
   tokenUrl: https://test.baoxianzhanggui.com/web-api
+  userWorkload: 1849326302238785538
+  userWorkloadLevel: '[{"proj":"山西掌柜鼎科技有限公司","std":"1"}]'
 
 xxl:
   job:

src/main/resources/mapper/modules/esm/EsmUserImageMapper.xml

@@ -14,6 +14,7 @@
     <resultMap id="EsmUserImageQueryVo" type="com.ydtech.modules.esm.model.vo.EsmUserImageQueryVo">
         <result property="imageId" column="images_id" jdbcType="VARCHAR"/>
         <result property="path" column="url" jdbcType="VARCHAR"/>
+        <result property="filePath" column="file_path" jdbcType="VARCHAR"/>
         <result property="type" column="type" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -23,7 +24,7 @@
     </sql>
 
     <select id="selectEsmUserImageQueryVo" resultMap="EsmUserImageQueryVo">
-        select i.type, i.images_id, f.file_path as url
+        select i.type, i.images_id, f.url, f.file_path
         from esm_user_image as i
                  left join ins_upload_files as f
                            on i.images_id = f.id