天天企赋银联api接口调试

src/main/java/com/ydtech/modules/admin/dao/SysUserBankCardMapper.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.admin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.po.SysUserBankCardHistory;
 import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
@@ -30,22 +31,16 @@ public interface SysUserBankCardMapper extends BaseMapper<SysUserBankCard> {
     List<SysUserBankCardHistory> getUserBankCardHistoryList(@Param("sysUserBankCardHistory") SysUserBankCardHistory sysUserBankCardHistory);
 
     @Select("SELECT " +
-            "  u.mobile, " +
-            "  u.identity, " +
-            "  u.identity_time, " +
-            "  b.real_user_name AS user_name, " +
-            "  b.user_id, " +
-            "  b.bank_number, " +
-            "  d.management_source " +
+            " u.mobile,u.id, " +
+            " u.identity, " +
+            " u.identity_time, " +
+            " u.`name`, " +
+            " d.management_source  " +
             " FROM " +
-            "  sys_user_bank_card b " +
-            "  INNER JOIN sys_user u ON u.id = b.user_id " +
-            "  INNER JOIN sys_dept d ON u.dept_id = d.id " +
-            "   " +
-            " WHERE " +
-            "  b.is_default = 1  " +
-            "  AND b.user_id = #{userId}")
-    SysUserBankCard selectByIdPay(@Param("userId") String userId);
+            " sys_user u " +
+            " INNER JOIN sys_dept d ON u.dept_id = d.id " +
+            " WHERE u.id = #{userId}")
+    SysUser selectByIdPay(@Param("userId") String userId);
 }
 
 

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

@@ -139,20 +139,21 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             //插入轨迹表
             SysAmountAuditingHistory sysAmountAuditingHistory =new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId,new Date(),"4", "1",sysUserAccountHistory.getId());
             sysAmountAuditingHistoryService.save(sysAmountAuditingHistory);
+            sendLgParams(sysAmountAuditingEntity,sysAmountAuditingHistory.getAuditingStatus());
         }
     }
 
 
-    public void sendLgParams(SysAmountAuditingHistory sysAmountAuditingHistory,SysAmountAuditingEntity sysAmountAuditingEntity){
+    public void sendLgParams(SysAmountAuditingEntity sysAmountAuditingEntity,String auditingStatus){
         PushLgEntity lgEntity = new PushLgEntity();
         lgEntity.setApplicationTime(new Date());
         lgEntity.setBusinessUmber(sysAmountAuditingEntity.getId());
         lgEntity.setPayee(sysAmountAuditingEntity.getUserName());
         lgEntity.setPayeeId(String.valueOf(sysAmountAuditingEntity.getUserId()));
         lgEntity.setReceivingAccount(sysAmountAuditingEntity.getBankNumber());
-        lgEntity.setExtractMoney(sysAmountAuditingHistory.getAmount());
+        lgEntity.setExtractMoney(sysAmountAuditingEntity.getAmount());
         lgEntity.setServiceCharge(null);
-        lgEntity.setExtractStatus(sysAmountAuditingHistory.getAuditingStatus());
+        lgEntity.setExtractStatus(auditingStatus);
         pushLgEntityService.sendLgData(lgEntity);
     }
 

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

@@ -297,6 +297,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             UserWithdrawal withdrawal = new UserWithdrawal();
             withdrawal.setUserId(userId);
             withdrawal.setAmount(sysUserAccountVo.getAmount());
+            withdrawal.setBankNumber(sysUserAccountVo.getFromBankCardId());
             return ttqfService.userCashOut(withdrawal);
         }
         //add  by  hxl   2024-09-26 添加电销组员开关
@@ -416,8 +417,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     }
 
     public boolean isManagement(String userId) {
-        SysUserBankCard bankCard = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(userId);
-        if (ManagementSource.MS_02.getCode().equals(bankCard.getManagementSource())){
+        SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(userId);
+        if (ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())){
             return true;
         }
         return false;

src/main/java/com/ydtech/modules/lg/PushLgLogUtils.java

@@ -10,6 +10,7 @@ import com.ydtech.utils.StringUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.HashMap;
 
 @Component
@@ -17,17 +18,22 @@ public class PushLgLogUtils {
 
     @Async
     public void pushLg(PushLgEntity lgEntity){
-        JSONObject jsonObject = JSONObject.parseObject(SendUtils.send(JSONObject.toJSONString(lgEntity)));
-        if (null != jsonObject){
-            lgEntity.setPushStatus(String.valueOf(jsonObject.getInteger("code")));
-            lgEntity.setMsg(jsonObject.getString("msg"));
-        }else {
-            lgEntity.setPushStatus("");
-            lgEntity.setMsg("推送失败");
-        }
-        SpringUtil.getBean(PushLgEntityMapper.class).insert(lgEntity);
-        if (!StringUtils.equals(lgEntity.getPushStatus(),"200")){
-            pushLgRetry(lgEntity);
+        int insert = SpringUtil.getBean(PushLgEntityMapper.class).insert(lgEntity);
+        if (insert > 0){
+            lgEntity.setZgUuid(lgEntity.getId());
+            lgEntity.setId(null);
+            JSONObject jsonObject = JSONObject.parseObject(SendUtils.send(JSONObject.toJSONString(lgEntity)));
+            if (null != jsonObject && String.valueOf(jsonObject.getInteger("code")).equals("200")){
+                lgEntity.setPushStatus(String.valueOf(jsonObject.getInteger("code")));
+                lgEntity.setMsg(jsonObject.getString("msg"));
+                lgEntity.setSuccessPushTime(new Date());
+            }else {
+                lgEntity.setPushStatus("");
+                lgEntity.setMsg("推送失败");
+            }
+            if (!StringUtils.equals(lgEntity.getPushStatus(),"200")){
+                pushLgRetry(lgEntity);
+            }
         }
     }
 
@@ -37,6 +43,7 @@ public class PushLgLogUtils {
             HashMap<String, Object> map = new HashMap<>();
             map.put("lgEntity", lgEntity);
             QuartzManager manager = QuartzManager.getInstance();
+            manager.getContext().put("executionFrequency",1);
             manager.addJob(String.valueOf(lgEntity.getId()),"jobGroup" + lgEntity.getId(), PushRetry.class,"*/5 * * * * ?",map);
             manager.start();
         }catch (Exception e){

src/main/java/com/ydtech/modules/lg/PushRetry.java

@@ -5,26 +5,45 @@ import com.alibaba.fastjson.JSONObject;
 import com.ydtech.modules.lg.dao.PushLgEntityMapper;
 import com.ydtech.modules.lg.model.PushLgEntity;
 import com.ydtech.modules.ttqf.QuartzManager;
+import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 
+import java.util.Date;
+
+@Slf4j
 public class PushRetry implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
-        Object object = mergedJobDataMap.get("lgEntity");
-        PushLgEntity lgEntity = JSONObject.parseObject((JSONObject.toJSONString(object)) , PushLgEntity.class);
-        JSONObject jsonObject = JSONObject.parseObject(SendUtils.send(JSONObject.toJSONString(lgEntity)));
-        if (null != jsonObject){
-            if (String.valueOf(jsonObject.getInteger("code")).equals("200")){
-                lgEntity.setPushStatus(String.valueOf(jsonObject.getInteger("code")));
-                lgEntity.setMsg(jsonObject.getString("msg"));
-                SpringUtil.getBean(PushLgEntityMapper.class).updateById(lgEntity);
-                try {
-                    QuartzManager.getInstance().removeJob(jobExecutionContext);
-                }catch (Exception e){
-                    e.printStackTrace();
+        try {
+            Integer executionFrequency = (Integer)QuartzManager.getInstance().getContext().get("executionFrequency");
+            JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
+            Object object = mergedJobDataMap.get("lgEntity");
+            PushLgEntity lgEntity = JSONObject.parseObject((JSONObject.toJSONString(object)) , PushLgEntity.class);
+            JSONObject jsonObject = JSONObject.parseObject(SendUtils.send(JSONObject.toJSONString(lgEntity)));
+            if (null != jsonObject){
+                if (String.valueOf(jsonObject.getInteger("code")).equals("200")){
+                    lgEntity.setPushStatus(String.valueOf(jsonObject.getInteger("code")));
+                    lgEntity.setMsg(jsonObject.getString("msg"));
+                    lgEntity.setSendNumber(executionFrequency);
+                    lgEntity.setSuccessPushTime(new Date());
+                    SpringUtil.getBean(PushLgEntityMapper.class).updateById(lgEntity);
+                    try {
+                        QuartzManager.getInstance().removeJob(jobExecutionContext);
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
                 }
             }
+            if (executionFrequency > 10){
+                lgEntity.setSendNumber(executionFrequency);
+                SpringUtil.getBean(PushLgEntityMapper.class).updateById(lgEntity);
+                QuartzManager.getInstance().removeJob(jobExecutionContext);
+            }
+            executionFrequency ++;
+            log.info("lg推送重试任务执行{}",executionFrequency);
+            QuartzManager.getInstance().getContext().put("executionFrequency",executionFrequency);
+        }catch (Exception e){
+            e.printStackTrace();
         }
     }
 }

src/main/java/com/ydtech/modules/lg/SendUtils.java

@@ -29,7 +29,7 @@ public class SendUtils {
         // 获得Http客户端(可以理解为:你得先有一个浏览器;注意:实际上HttpClient与浏览器是不一样的)
         CloseableHttpClient httpClient = HttpClientBuilder.create().build();
         // 创建Post请求
-        HttpPost httpPost = new HttpPost(sendMessageIP + "withdrawal/record/acceptPushWithdrawalData");
+        HttpPost httpPost = new HttpPost(sendMessageIP + "/withdrawal/record/acceptPushWithdrawalData");
         StringEntity entity = new StringEntity(data, "UTF-8");
         // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中
         httpPost.setEntity(entity);

src/main/java/com/ydtech/modules/lg/model/PushLgEntity.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.lg.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -52,5 +53,9 @@ public class PushLgEntity {
 
     private int sendNumber;
 
+    private Date successPushTime;
+
+    @TableField(exist = false)
+    private Long zgUuid;
 
 }

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

@@ -1,32 +0,0 @@
-package com.ydtech.modules.ttqf;
-
-import cn.hutool.extra.spring.SpringUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.quartz.*;
-
-
-@Slf4j
-public class QuartzUserSign implements Job {
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        try {
-            if ((boolean) QuartzManager.getInstance().getContext().get("flag")){
-                JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
-                String idCardNo = String.valueOf(mergedJobDataMap.get("idCardNo"));
-                log.info("用户签约状态查询入参:{}",idCardNo);
-                if (SpringUtil.getBean(RetrieveTTQFApi.class).queryPressing(idCardNo)){
-                    log.info("用户签约状态查询成功");
-                    QuartzManager.getInstance().removeJob(jobExecutionContext);
-                }
-                log.info("当前线程+++++++++++++{}",Thread.currentThread().getId());
-            }else {
-                log.info("获取天天企赋状态退出",jobExecutionContext.getJobDetail().getKey().getName());
-                QuartzManager.getInstance().removeJob(jobExecutionContext);
-            }
-        } catch (SchedulerException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-}

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

@@ -1,77 +0,0 @@
-package com.ydtech.modules.ttqf;
-
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ipaynow.jiaxin.domain.OrderQueryResultModel;
-import com.ipaynow.jiaxin.response.OrderQueryResponse;
-import com.ydtech.modules.ttqf.dao.PaymentNoticeMapper;
-import com.ydtech.modules.ttqf.entity.PaymentNoticeEntity;
-import com.ydtech.utils.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-@Component
-@Slf4j
-public class RegularlyPaymentStatus {
-
-
-    @Async
-    public void  updatePaymentStatus(String orderNo){
-        Timer timer = new Timer();
-        final int[] executionCount = {1};
-        TimerTask task = new TimerTask() {
-            @Override
-            public void run() {
-                try {
-                    log.info("打款状态定时任务入参:{}",orderNo);
-                    OrderQueryResponse response = SpringUtil.getBean(RetrieveTTQFApi.class).orderQuery(orderNo);
-                    log.info("打款状态定时返回执行数据:{}", JSONObject.toJSONString(response.getResultModel()));
-                    if (response == null || !StringUtils.equals(response.getBizCode(),"0000")) {
-                        log.info("获取打款状态任务退出{}");
-                        timer.cancel();
-                    }
-                    if (response.isSuccess()) {
-                        if (Arrays.stream(PayConstantStatus.ORDER_ARRAY).anyMatch(i -> Objects.equals(i,response.getResultModel().getStatus()))){
-                            updatePayLog(orderNo,response.getResultModel());
-                            log.info("获取打款状态任务退出");
-                            timer.cancel();
-                        }
-                    }
-                    log.info("当前线程+++++++++++++{}",Thread.currentThread().getId());
-//                    if (executionCount[0] == 20){
-//                        log.info("获取打款状态任务退出{}");
-//                        timer.cancel();
-//                    }
-                }catch (Exception e){
-                    log.error("定时获取打款状态任务异常:{}",e.getMessage());
-                    timer.cancel();
-                }
-                executionCount[0]++;
-            }
-        };
-        timer.schedule(task, 2000, 5000);
-    }
-
-
-    public void updatePayLog(String orderNo, OrderQueryResultModel resultModel){
-        QueryWrapper<PaymentNoticeEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("order_no",orderNo);
-        PaymentNoticeEntity notice = SpringUtil.getBean(PaymentNoticeMapper.class).selectOne(wrapper);
-        if (null == notice){
-            PaymentNoticeEntity noticeEntity = JSONObject.parseObject(JSONObject.toJSONString(resultModel), PaymentNoticeEntity.class);
-            if (null == noticeEntity.getPayTime()){
-                noticeEntity.setPayTime(new Date());
-            }
-            noticeEntity.setCreateTime(new Date());
-            int update = SpringUtil.getBean(PaymentNoticeMapper.class).insert(noticeEntity);
-            log.info("获取打款状态成功正在保存===========：{}",orderNo ,"+++++", update > 0 ? "保存成功" : "保存失败");
-        }
-    }
-
-
-}

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

@@ -1,71 +0,0 @@
-package com.ydtech.modules.ttqf;
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ipaynow.jiaxin.domain.OrderQueryResultModel;
-import com.ipaynow.jiaxin.response.OrderQueryResponse;
-import com.ydtech.modules.ttqf.dao.PaymentNoticeMapper;
-import com.ydtech.modules.ttqf.entity.PaymentNoticeEntity;
-import com.ydtech.utils.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.quartz.*;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Objects;
-
-
-@Slf4j
-public class RegularlyUpdateStatus implements Job {
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        try {
-            if ((boolean) QuartzManager.getInstance().getContext().get("flag")){
-                JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
-                String orderNo = String.valueOf(mergedJobDataMap.get("orderNo"));
-                log.info("打款状态定时任务入参:{}",orderNo);
-                OrderQueryResponse response = SpringUtil.getBean(RetrieveTTQFApi.class).orderQuery(orderNo);
-                log.info("打款状态定时返回执行数据:{}", JSONObject.toJSONString(response.getResultModel()));
-                if (response == null || !StringUtils.equals(response.getBizCode(),"0000")) {
-                    log.info("获取打款状态任务退出{}");
-                    QuartzManager.getInstance().removeJob(jobExecutionContext);
-                }
-                if (response.isSuccess()) {
-                    if (Arrays.stream(PayConstantStatus.ORDER_ARRAY).anyMatch(i -> Objects.equals(i,response.getResultModel().getStatus()))){
-                        updatePayLog(orderNo,response.getResultModel());
-                        log.info("获取打款状态任务退出");
-                    }
-                    QuartzManager.getInstance().removeJob(jobExecutionContext);
-                }
-                log.info("当前线程+++++++++++++{}",Thread.currentThread().getId());
-            }else {
-                log.info("获取天天企赋状态退出",jobExecutionContext.getJobDetail().getKey().getName());
-                QuartzManager.getInstance().removeJob(jobExecutionContext);
-            }
-
-        } catch (SchedulerException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-
-
-    public void updatePayLog(String orderNo, OrderQueryResultModel resultModel){
-        QueryWrapper<PaymentNoticeEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("order_no",orderNo);
-        PaymentNoticeEntity notice = SpringUtil.getBean(PaymentNoticeMapper.class).selectOne(wrapper);
-        if (null == notice){
-            PaymentNoticeEntity noticeEntity = JSONObject.parseObject(JSONObject.toJSONString(resultModel), PaymentNoticeEntity.class);
-            if (null == noticeEntity.getPayTime()){
-                noticeEntity.setPayTime(new Date());
-            }
-            noticeEntity.setCreateTime(new Date());
-            int update = SpringUtil.getBean(PaymentNoticeMapper.class).insert(noticeEntity);
-            log.info("获取打款状态成功正在保存===========：{}",orderNo ,"+++++", update > 0 ? "保存成功" : "保存失败");
-        }
-    }
-
-
-}

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

@@ -10,7 +10,7 @@ import com.ipaynow.jiaxin.domain.*;
 import com.ipaynow.jiaxin.request.*;
 import com.ipaynow.jiaxin.response.*;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysUserBankCard;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.esm.model.vo.EsmUserImageQueryVo;
 import com.ydtech.modules.esm.service.EsmUserImageService;
 import com.ydtech.modules.order.entity.api.bohai.constants.DocumentClass;
@@ -41,7 +41,6 @@ public class RetrieveTTQFApi {
 
     private static PayUserSignService signService;
 
-    private static RegularlyPaymentStatus paymentStatus;
 
     @Resource
     private void setSignService(PayUserSignService userSignService){
@@ -49,12 +48,6 @@ public class RetrieveTTQFApi {
     }
 
 
-    @Resource
-    private void setPaymentStatus(RegularlyPaymentStatus status){
-        paymentStatus = status;
-    }
-
-
     @Resource
     private void setSavePayOrder(SavePayOrder order){
         savePayOrder = order;
@@ -64,32 +57,44 @@ public class RetrieveTTQFApi {
     private void setConfig(TangClient client){
         tangClient = client;
     }
-    public  static boolean extractBalance(SysUserBankCard bankCard,UserWithdrawal withdrawal){
-        if (queryPressing(bankCard.getIdentity())){
+
+
+
+    public  static boolean extractBalance(SysUser sysUser,UserWithdrawal withdrawal){
+        QueryPresignResultModel resultModel = queryPressing(sysUser.getIdentity());
+        //这俩验证银行卡是否处于绑定状态
+        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())){
             BigDecimal accountBalance = balance();
             if (BigDecimal.ZERO.compareTo(accountBalance) == 0 || (accountBalance.compareTo(withdrawal.getAmount()) == -1)){
                 throw new SystemException("商户余额不足，请联系管理员");
             }
             //用户已经签约  进行打款操作
-            return orderAdd(bankCard, withdrawal.getAmount(), withdrawal.getRemarks());
+            return orderAdd(sysUser, withdrawal);
         } else {
             return false;
         }
     }
 
     
-    public  static boolean orderAdd(SysUserBankCard bankCard,BigDecimal amount,String remark){
+    public  static boolean orderAdd(SysUser sysUser,UserWithdrawal withdrawal){
         OrderAddModel addModel = OrderAddModel.builder()
                 .mchBatchNo(System.currentTimeMillis() + "")
                 .mchOrderNo(GenerateOrderNumberUtils.nextNumber() + "")
                 //收款人姓名
-                .userName(bankCard.getUserName())
+                .userName(sysUser.getName())
                 //收款人手机号
-                .userMobile(bankCard.getMobile())
+                .userMobile(sysUser.getMobile())
                 //收款账号
-                .userBankCardNo(bankCard.getBankNumber())
+                .userBankCardNo(withdrawal.getBankNumber())
                 //收款人身份证号
-                .userIdCardNo(bankCard.getIdentity())
+                .userIdCardNo(sysUser.getIdentity())
                 //工作量衡量标准模板
                 .userWorkload("1849326302238785538")
                 //工作量衡量标准
@@ -98,15 +103,15 @@ public class RetrieveTTQFApi {
                 )
                 //打款金额 Number(15,2)
                 // M 单位为元，风控可调额
-                .amount(amount)
-                .remark(remark)
+                .amount(withdrawal.getAmount())
+                .remark(withdrawal.getRemarks())
                 //收款方式非必填：默认0-银行卡枚举：0-银行卡、1-支付宝、2-微信
                 .paymentType(0)
                 //选填项：微信APPID，若填写，以填写项稳准，否则应用预留配置的微信appid；该字段适用于同主体下含有多个公众号或小程序的场景
                 .wechatAppId("")
                 .notifyUrl(PayConstantStatus.getPaymentNoticeUrl())
                 .build();
-        OrderAddResponse response = testOrderAdd(addModel, bankCard.getUserId());
+        OrderAddResponse response = testOrderAdd(addModel, sysUser.getId());
         if(response.isSuccess()) {
             log.info("成功 ====>orderAdd {}", response.getResultModel());
         } else {
@@ -187,20 +192,20 @@ public class RetrieveTTQFApi {
     /**
      * 用户预签约接口
      */
-    public static String pres(SysUserBankCard bankCard){
+    public static String pres(SysUser sysUser,UserWithdrawal withdrawal){
         PresignRequest request = new PresignRequest();
-        List<EsmUserImageQueryVo> esmUserImageQueryVo = SpringUtil.getBean(EsmUserImageService.class).getEsmUserImageQueryVo(bankCard.getUserId());
+        List<EsmUserImageQueryVo> esmUserImageQueryVo = SpringUtil.getBean(EsmUserImageService.class).getEsmUserImageQueryVo(sysUser.getId());
         if (CollectionUtils.isEmpty(esmUserImageQueryVo)){
             throw new SystemException("用户影像资料不存在，请补全后在申请提现");
         }
         PresignModel presignModel = new PresignModel();
-        presignModel.setName(bankCard.getUserName());
-        presignModel.setMobile(bankCard.getMobile());
-        presignModel.setIdCardNo(bankCard.getIdentity());
-        presignModel.setBankCardNo(bankCard.getBankNumber());
-        if (bankCard.getIdentityTime().contains(",")){
-            presignModel.setExpiryStart(bankCard.getIdentityTime().split(",")[0]);
-            presignModel.setExpiryEnd(bankCard.getIdentityTime().split(",")[1]);
+        presignModel.setName(sysUser.getName());
+        presignModel.setMobile(sysUser.getMobile());
+        presignModel.setIdCardNo(sysUser.getIdentity());
+        presignModel.setBankCardNo(withdrawal.getBankNumber());
+        if (sysUser.getIdentityTime().contains(",")){
+            presignModel.setExpiryStart(sysUser.getIdentityTime().split(",")[0]);
+            presignModel.setExpiryEnd(sysUser.getIdentityTime().split(",")[1]);
         }else {
             throw new SystemException("用户身份证有效日期不全，请检查");
         }
@@ -231,7 +236,7 @@ public class RetrieveTTQFApi {
         PresignResponse response = tangClient.execute(request);
         if(response.isSuccess()) {
             log.info("成功 ====>Pressing {}", response.getResultModel());
-            return contractH5(bankCard.getIdentity());
+            return contractH5(sysUser.getIdentity());
         } else {
             log.error("失败{}", response);
             return response.getBizMsg();
@@ -241,20 +246,16 @@ public class RetrieveTTQFApi {
     /**
      * 用户预签约结果查询接口
      */
-    public static boolean queryPressing(String idCardNo) {
+    public static QueryPresignResultModel queryPressing(String idCardNo) {
         QueryPresignResponse response = tangClient.execute(QueryPresignRequest.builder().requestId(System.currentTimeMillis() + "")
                 .bizModel(new QueryPresignModel(idCardNo)).build());
         if(response.isSuccess()) {
-            QueryPresignResultModel resultModel = response.getResultModel();
-            if (Objects.equals(PayConstantStatus.SIGN_STATUS,resultModel.getSignStatus()) &&
-                    Objects.equals(PayConstantStatus.AUTH_STATUS,resultModel.getAuthStatus())){
-                return true;
-            }
-            log.info("成功 ====>QueryPressing {}", resultModel);
+            log.info("成功 ====>QueryPressing {}", response.getResultModel());
+            return response.getResultModel();
         } else {
             log.error("失败{}", response);
         }
-        return false;
+        return null;
     }
 
     /**
@@ -285,8 +286,13 @@ public class RetrieveTTQFApi {
                 .bizModel(addModel)
                 .build();
         OrderAddResponse response = tangClient.execute(addRequest);
-        boolean confirm = confirm(response.getResultModel().getOrderNo(),response.getResultModel().getBatchNo());
-        savePayOrder.savePayOrder(addRequest.getApiUrl(),response, JSONObject.toJSONString(addModel),JSONObject.toJSONString(response),userId, confirm,addModel.getUserBankCardNo());
+        boolean confirm = false;
+        String sysAmountAuditingId = "";
+        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);
         return response;
     }
 
@@ -350,7 +356,7 @@ public class RetrieveTTQFApi {
             hashMap.put("orderNo",orderNo);
             QuartzManager manager = QuartzManager.getInstance();
             manager.getContext().put("flag",true);
-            manager.addJob(orderNo,"jobGroup" + orderNo, RegularlyUpdateStatus.class,"*/5 * * * * ?",hashMap);
+            //manager.addJob(orderNo,"jobGroup" + orderNo, RegularlyUpdateStatus.class,"*/5 * * * * ?",hashMap);
             manager.start();
         }catch (Exception e){
             e.printStackTrace();

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

@@ -16,7 +16,7 @@ import java.util.Date;
 public class SavePayOrder {
 
     @Async
-    public  void savePayOrder(String url, OrderAddResponse response, String requestData, String responseData, String userId,boolean confirm,String userBankCardNo){
+    public  void savePayOrder(String url, OrderAddResponse response, String requestData, String responseData, String userId,boolean confirm,String sysAmountAuditingId){
         PayTtqfLog ttqfLog = new PayTtqfLog();
         ttqfLog.setSedStatus(response.isSuccess());
         ttqfLog.setApiUrl(url);
@@ -35,7 +35,6 @@ public class SavePayOrder {
         ttqfLog.setAmount(response.getResultModel().getAmount());
         ttqfLog.setFeeAmount(response.getResultModel().getFeeAmount());
         ttqfLog.setPaymentType(response.getResultModel().getPaymentType());
-        String sysAmountAuditingId = SpringUtil.getBean(AmountAuditingService.class).sendMessage(response.getResultModel().getAmount(), userId, userBankCardNo);
         ttqfLog.setSysAmountAuditingId(sysAmountAuditingId);
         SpringUtil.getBean(PayTtqfLogMapper.class).insert(ttqfLog);
     }

src/main/java/com/ydtech/modules/ttqf/controller/TtqfController.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.ttqf.controller;
 
 
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.ttqf.RegularlyPaymentStatus;
 import com.ydtech.modules.ttqf.entity.response.TtqfResponse;
 import com.ydtech.modules.ttqf.entity.vo.UserWithdrawal;
 import com.ydtech.modules.ttqf.service.TtqfService;
@@ -16,15 +15,10 @@ import javax.annotation.Resource;
 public class TtqfController {
 
 
-    private static RegularlyPaymentStatus paymentStatus;
 
     @Resource
     private TtqfService ttqfService;
 
-    @Resource
-    private void setPaymentStatus(RegularlyPaymentStatus regularlyPaymentStatus){
-        paymentStatus = regularlyPaymentStatus;
-    }
 
 
     /**
@@ -110,17 +104,5 @@ public class TtqfController {
     }
 
 
-    @GetMapping("xx/{de}")
-    public String xx(@PathVariable("de")String de) throws Exception {
-        paymentStatus.updatePaymentStatus(de);
-        return "";
-    }
-
-
-    @GetMapping("aa")
-    public void getss() throws Exception {
-
-    }
-
 
 }

src/main/java/com/ydtech/modules/ttqf/entity/vo/UserWithdrawal.java

@@ -13,9 +13,10 @@ public class UserWithdrawal {
 
     private String userId;
 
-
     private BigDecimal amount;
 
     private String remarks;
 
+    private String bankNumber;
+
 }

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

@@ -4,20 +4,24 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 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.ReceiptlDownloadResponse;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.ManagementSource;
 import com.ydtech.modules.admin.dao.SysAmountAuditingMapper;
 import com.ydtech.modules.admin.dao.SysUserAccountHistoryMapper;
 import com.ydtech.modules.admin.dao.SysUserBankCardMapper;
-import com.ydtech.modules.admin.model.po.*;
+import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
+import com.ydtech.modules.admin.model.po.SysAmountAuditingHistory;
+import com.ydtech.modules.admin.model.po.SysUserAccount;
+import com.ydtech.modules.admin.model.po.SysUserAccountHistory;
 import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
-import com.ydtech.modules.admin.service.SysAmountAuditingHistoryService;
-import com.ydtech.modules.admin.service.SysAmountAuditingService;
-import com.ydtech.modules.admin.service.SysSwitchConfigService;
-import com.ydtech.modules.admin.service.SysUserAccountService;
+import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.lg.model.PushLgEntity;
+import com.ydtech.modules.lg.service.PushLgEntityService;
 import com.ydtech.modules.ttqf.LgInformationPush;
 import com.ydtech.modules.ttqf.PayConstantStatus;
 import com.ydtech.modules.ttqf.RetrieveTTQFApi;
@@ -84,6 +88,12 @@ public class TtqfServiceImpl implements TtqfService {
     @Autowired
     private SysAmountAuditingMapper amountAuditingMapper;
 
+    @Autowired
+    private PushLgEntityService pushLgEntityService;
+
+    @Autowired
+    private SysUserService userService;
+
     @Override
     public Object getUserPay(String userId) {
 
@@ -127,22 +137,29 @@ public class TtqfServiceImpl implements TtqfService {
         String parse = TtqfDecrypt.parse(obj);
         if (!StringUtils.isEmpty(parse)){
             PaymentNoticeEntity noticeEntity = JSONObject.parseObject(parse, PaymentNoticeEntity.class);
-            noticeEntity.setCreateTime(new Date());
-            noticeMapper.insert(noticeEntity);
+            if (null != noticeEntity){
+                LambdaQueryWrapper<PaymentNoticeEntity> paymentNoticeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                paymentNoticeEntityLambdaQueryWrapper.eq(PaymentNoticeEntity::getMchOrderNo, noticeEntity.getMchOrderNo());
+                PaymentNoticeEntity notice = noticeMapper.selectOne(paymentNoticeEntityLambdaQueryWrapper);
+                if (null == notice){
+                    noticeEntity.setCreateTime(new Date());
+                    noticeMapper.insert(noticeEntity);
+                }
+            }
             LambdaQueryWrapper<PayTtqfLog> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(PayTtqfLog::getMchOrderNo, noticeEntity.getMchOrderNo());
             PayTtqfLog ttqfLog = logMapper.selectOne(wrapper);
             SysAmountAuditingVo amountAuditingVo = new SysAmountAuditingVo();
             amountAuditingVo.setAmount(noticeEntity.getAmount());
             amountAuditingVo.setUserId(ttqfLog.getUserId());
-            writeRecord(amountAuditingVo,ttqfLog.getSysAmountAuditingId());
+            writeRecord(amountAuditingVo,ttqfLog.getSysAmountAuditingId(),noticeEntity.getFeeAmount());
         }
         log.info("接收打款通知回调 + paymentNotice ================={}", parse);
         return TtqfResponse.ok();
     }
 
 
-    public void writeRecord(SysAmountAuditingVo sysAmountAuditingVo,String id){
+    public void writeRecord(SysAmountAuditingVo sysAmountAuditingVo,String id,BigDecimal feeAmount){
         SysAmountAuditingEntity sysAmountAuditingEntity = sysAmountAuditingService.getById(id);
         if (ObjectUtils.isEmpty(sysAmountAuditingEntity)){
             return;
@@ -152,43 +169,22 @@ public class TtqfServiceImpl implements TtqfService {
         BigDecimal amount = sysAmountAuditingVo.getAmount();
         //提现人
         String userId = sysAmountAuditingVo.getUserId();
-//        SysUserAccount sysUserAccountEntity = new SysUserAccount();
-//      用户扣减金额
+        //      用户扣减金额
         if (StringUtils.isNotEmpty(userId)) {
-//            sysUserAccountEntity.setUserId(userId);
             //提现人账户
             SysUserAccount sysUserAccount = sysUserAccountService.getById(userId);
             if (ObjectUtils.isNotEmpty(sysUserAccount)) {
-                //注释掉原先按类型提现的逻辑 ，改为不区分类型  add by hxl  2024-06-18
-                /**
-                 String amountStatus = sysAmountAuditingVo.getAmountStatus();
-                 if (StringUtils.isNotEmpty(amountStatus)) {
-                 if ("1".equals(amountStatus)) {
-                 sysUserAccount.setHandlingAmountAccount(amount);
-                 sysUserAccount.setHandlingAmountPayment(sysUserAccount.getHandlingAmountPayment().subtract(amount));
-                 //                        sysUserAccountEntity.setHandlingFee(afterAmount);
-                 } else if ("2".equals(amountStatus)) {
-                 sysUserAccount.setDocumentaryAmountAccount(amount);
-                 sysUserAccount.setDocumentaryAmountpayment(sysUserAccount.getDocumentaryAmountpayment().subtract(amount));
-                 //                        sysUserAccountEntity.setDocumentary(afterAmount);
-                 } else {
-                 sysUserAccount.setPromotionAmountAccount(amount);
-                 sysUserAccount.setPromotionAmountPayment(sysUserAccount.getPromotionAmountPayment().subtract(amount));
-                 //                        sysUserAccountEntity.setPromotion(afterAmount);
-                 }
-
-                 }
-                 **/
                 //已到账金额 =  原先的到账金额+ 已到账的金额
                 sysUserAccount.setSumAmountAccount((sysUserAccount.getSumAmountAccount() == null ? BigDecimal.ZERO : sysUserAccount.getSumAmountAccount()).add(amount));
                 //支付中的金额 = 原先的支付金额 -去提现的金额
                 sysUserAccount.setSumAmountPayment((sysUserAccount.getSumAmountPayment() == null ? BigDecimal.ZERO : sysUserAccount.getSumAmountPayment()).subtract(amount));
-
                 sysUserAccountService.updateById(sysUserAccount);
             }
             sysAmountAuditingVo.setAuditingStatus("3");
-            //sysAmountAuditingVo.setAuditingUserId(BaseController.getUser().getId());
             sysAmountAuditingVo.setAuditingTime(new Date());
+            sysAmountAuditingVo.setBankNumber(sysAmountAuditingEntity.getBankNumber());
+            sysAmountAuditingVo.setUserName(userService.getByUserId(sysAmountAuditingEntity.getUserId()).getName());
+            sysAmountAuditingVo.setUserId(sysAmountAuditingEntity.getUserId());
             BeanUtils.copyProperties(sysAmountAuditingVo, sysAmountAuditingEntity);
             sysAmountAuditingEntity.setCreateTime(null);
             amountAuditingMapper.updateById(sysAmountAuditingEntity);
@@ -201,6 +197,7 @@ public class TtqfServiceImpl implements TtqfService {
             //插入轨迹表
             SysAmountAuditingHistory sysAmountAuditingHistory = new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId, new Date(), "4", "1", sysUserAccountHistory.getId());
             sysAmountAuditingHistoryService.save(sysAmountAuditingHistory);
+            sendCollect(sysAmountAuditingEntity,sysAmountAuditingHistory.getAuditingStatus(),feeAmount);
         }
     }
 
@@ -228,19 +225,19 @@ public class TtqfServiceImpl implements TtqfService {
         if (!sysSwitchConfigService.getBalanceExtractStatus()){
             return HttpResult.ok(WithdrawalFRes.builder().bizCode("0").msg("").url("").build());
         }
-        SysUserBankCard bankCard = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
-        if (Objects.isNull(bankCard)){
+        SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
+        if (Objects.isNull(sysUser)){
             return HttpResult.error("用户不存在，请检查");
         }
-        if (StringUtils.isEmpty(bankCard.getIdentity())){
+        if (StringUtils.isEmpty(sysUser.getIdentity())){
             return HttpResult.error("用户身份证号不存在，请检查");
         }
-        if (!ManagementSource.MS_02.getCode().equals(bankCard.getManagementSource())){
+        if (!ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())){
             return HttpResult.ok(WithdrawalFRes.builder().bizCode("0").msg("").url("").build());
         }
-        PayUserSign payUserSign = signService.selectOne(bankCard.getIdentity(),bankCard.getUserId());
+        PayUserSign payUserSign = signService.selectOne(sysUser.getIdentity(),sysUser.getId());
         if (!Objects.isNull(payUserSign)){
-            String signUrl = RetrieveTTQFApi.contractH5(bankCard.getIdentity());
+            String signUrl = RetrieveTTQFApi.contractH5(sysUser.getIdentity());
             if (Objects.equals(PayConstantStatus.SIGN_STATUS,payUserSign.getSign()) &&
                     Objects.equals(PayConstantStatus.AUTH_STATUS,payUserSign.getAuthStatus())){
 
@@ -249,7 +246,12 @@ public class TtqfServiceImpl implements TtqfService {
             return HttpResult.ok(WithdrawalFRes.builder().bizCode("2").msg("签约中").url(signUrl).build());
         }
         try {
-            boolean sign = RetrieveTTQFApi.queryPressing(bankCard.getIdentity());
+            boolean sign = false;
+            QueryPresignResultModel resultModel = RetrieveTTQFApi.queryPressing(sysUser.getIdentity());
+            if (Objects.equals(PayConstantStatus.SIGN_STATUS,resultModel.getSignStatus()) &&
+                    Objects.equals(PayConstantStatus.AUTH_STATUS,resultModel.getAuthStatus())){
+                sign = true;
+            }
             return HttpResult.ok(WithdrawalFRes.builder().bizCode(sign ? "3" : "1").url("").msg(sign ? "已签约" : "未签约").build());
         }catch (Exception e){
             log.info("查询签约状态异常：{}", e.getMessage());
@@ -259,55 +261,59 @@ public class TtqfServiceImpl implements TtqfService {
 
     @Override
     public HttpResult signingAddress(UserWithdrawal withdrawal) {
-        SysUserBankCard bankCard = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
-        if (Objects.isNull(bankCard)){
-            return HttpResult.error("用户不存在，请检查");
-        }
-        if (StringUtils.isEmpty(bankCard.getIdentity())){
-            return HttpResult.error("用户身份证号不存在，请检查");
-        }
-        String pres = RetrieveTTQFApi.pres(bankCard);
-        if (!StringUtils.isEmpty(pres)){
-            signService.saveUserSign(bankCard.getIdentity(),bankCard.getUserId());
+        try {
+            SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
+            if (Objects.isNull(sysUser)){
+                return HttpResult.error("用户不存在，请检查");
+            }
+            if (StringUtils.isEmpty(sysUser.getIdentity())){
+                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());
+            throw new SystemException("提现申请提交失败");
         }
-        return HttpResult.ok(WithdrawalFRes.builder().bizCode("").url(pres).msg("").build());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult userCashOut(UserWithdrawal withdrawal) {
-        SysUserBankCard bankCard = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
-        if (Objects.isNull(bankCard)){
-            return HttpResult.error("用户不存在，请检查");
-        }
-        if (StringUtils.isEmpty(bankCard.getIdentity())){
-            return HttpResult.error("用户身份证号不存在，请检查");
-        }
-        if (!ManagementSource.MS_02.getCode().equals(bankCard.getManagementSource())){
-            return HttpResult.error("用户不是个代，请线下申请提现");
-        }
-        boolean balance = RetrieveTTQFApi.extractBalance(bankCard, withdrawal);
-        if (balance){
-            //推送提现记录
-            sendCollect( bankCard, withdrawal);
+        try {
+            SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
+            if (Objects.isNull(sysUser)){
+                return HttpResult.error("用户不存在，请检查");
+            }
+            if (StringUtils.isEmpty(sysUser.getIdentity())){
+                return HttpResult.error("用户身份证号不存在，请检查");
+            }
+            if (!ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())){
+                return HttpResult.error("用户不是个代，请线下申请提现");
+            }
+            boolean balance = RetrieveTTQFApi.extractBalance(sysUser, withdrawal);
+            return HttpResult.ok(balance);
+        }catch (Exception e){
+            log.error("提现申请提交失败{}",e.getMessage());
+            throw new RuntimeException("提现申请提交失败");
         }
-        return HttpResult.ok(balance);
     }
 
 
-    public void sendCollect(SysUserBankCard bankCard,UserWithdrawal withdrawal){
+    public void sendCollect(SysAmountAuditingEntity sysAmountAuditingEntity,String auditingStatus,BigDecimal feeAmount ){
         PushLgEntity lgEntity = new PushLgEntity();
-
-        SysAmountAuditingVo sysAmountAuditingVo = new SysAmountAuditingVo();
-        sysAmountAuditingVo.setId("");
-        sysAmountAuditingVo.setUserId(bankCard.getUserId());
-        sysAmountAuditingVo.setBankNumber(bankCard.getBankNumber());
-        sysAmountAuditingVo.setAmount(withdrawal.getAmount());
-        sysAmountAuditingVo.setCreateTime(new Date());
-        sysAmountAuditingVo.setAuditingStatus("");
-        sysAmountAuditingVo.setUserName(bankCard.getUserName());
-        sysAmountAuditingVo.setMobile(bankCard.getMobile());
-        //sendCollectUtils.sendCollect(sysAmountAuditingVo);
+        lgEntity.setApplicationTime(new Date());
+        lgEntity.setBusinessUmber(sysAmountAuditingEntity.getId());
+        lgEntity.setPayee(sysAmountAuditingEntity.getUserName());
+        lgEntity.setPayeeId(sysAmountAuditingEntity.getUserId());
+        lgEntity.setReceivingAccount(sysAmountAuditingEntity.getBankNumber());
+        lgEntity.setExtractMoney(sysAmountAuditingEntity.getAmount());
+        lgEntity.setServiceCharge(feeAmount);
+        lgEntity.setExtractStatus(auditingStatus);
+        pushLgEntityService.sendLgData(lgEntity);
     }
 
 

src/main/resources/application-pre.yml

@@ -445,4 +445,4 @@ ttqf:
   tokenUrl: https://test.baoxianzhanggui.com/web-api
 
 #灵活用工平台实时推送ip地址
-sendMessage-zg-yggl-IP: http://192.168.0.29:8080/
+sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api

src/main/resources/application-prod.yml

@@ -443,4 +443,4 @@ ttqf:
   tokenUrl: https://test.baoxianzhanggui.com/web-api
 
 #灵活用工平台实时推送ip地址
-sendMessage-zg-yggl-IP: http://192.168.0.29:8080/
+sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api

src/main/resources/application-test.yml

@@ -528,4 +528,4 @@ customer:
 httpUrl: https://test.baoxianzhanggui.com/copartnerH5/#/pages/index/result?
 
 #灵活用工平台实时推送ip地址
-sendMessage-zg-yggl-IP: http://192.168.0.29:8080/
+sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -149,7 +149,9 @@
             <if test="amountStatus !=null  and amountStatus != ''">
                 and a.amount_status=#{amountStatus}
             </if>
-
+            <if test="amountStatus !=null  and amountStatus != '' and amountStatus = 2">
+                and a.approval != 1
+            </if>
             <if test="id !=null  and id != ''">
                 and a.id=#{id}
             </if>