Commit b79e61b6 authored by hongguangwu's avatar hongguangwu

1.7.20-非扣税银企

parent a5281688
...@@ -175,7 +175,7 @@ public class EkpBankGrantDetail { ...@@ -175,7 +175,7 @@ public class EkpBankGrantDetail {
@Schema(description = "附件名称") @Schema(description = "附件名称")
private String fdAttaName; private String fdAttaName;
/** /**
* 附件资源路径 * 附件资源路径(非扣税存储serialNo(f_seq_no),用来查询结果等)
*/ */
@ExcelAttribute(name = "附件资源路径", maxLength = 200) @ExcelAttribute(name = "附件资源路径", maxLength = 200)
@Length(max = 200, message = "附件资源路径不能超过200个字符") @Length(max = 200, message = "附件资源路径不能超过200个字符")
......
...@@ -64,7 +64,7 @@ public class EkpBankIcbcLog { ...@@ -64,7 +64,7 @@ public class EkpBankIcbcLog {
@Schema(description = "关联ID") @Schema(description = "关联ID")
private String fdParentId; private String fdParentId;
/** /**
* 类型 * 类型3非扣税提交,4非扣税提交反馈 6非扣税获取结果
*/ */
@ExcelAttribute(name = "类型", maxLength = 1) @ExcelAttribute(name = "类型", maxLength = 1)
@Length(max = 36, message = "类型不能超过1个字符") @Length(max = 36, message = "类型不能超过1个字符")
......
...@@ -218,7 +218,7 @@ public class EkpBankPayTask { ...@@ -218,7 +218,7 @@ public class EkpBankPayTask {
@Schema(description = "附件名称") @Schema(description = "附件名称")
private String fdAttaName; private String fdAttaName;
/** /**
* 附件资源路径 * 附件资源路径(非扣税存储serialNo(f_seq_no),用来查询结果等)
*/ */
@ExcelAttribute(name = "附件资源路径", maxLength = 200) @ExcelAttribute(name = "附件资源路径", maxLength = 200)
@Length(max = 200, message = "附件资源路径不能超过200个字符") @Length(max = 200, message = "附件资源路径不能超过200个字符")
......
package com.yifu.cloud.plus.v1.ekp.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author hgw
* @Date 2024-11-18 10:23:18
* @Description EKP银企付款下载文件Vo
* @Version 1.0
*/
@Data
public class EkpBankExcelNoTaxVo extends EkpBankExcelVo {
// 日期 明细标志 顺序号 报销号 单据张数 付款账号开户行 付款账号/卡号 付款账号名称/卡名称 收款账号开户行
// 收款地区 收款银行人行行号 汇款方式 收款账号 收款账号名称 金额 汇款用途 备注信息 收款账户短信通知手机号码
private String fdId;
}
...@@ -33,4 +33,9 @@ public class EkpBankResultVo implements Serializable { ...@@ -33,4 +33,9 @@ public class EkpBankResultVo implements Serializable {
private Integer fdGrantNum; private Integer fdGrantNum;
private Integer fdFailNum; private Integer fdFailNum;
private Integer num; private Integer num;
// 非扣税存储serialNo(f_seq_no),用来查询结果等
private String fdAttaSrc;
// 非扣税使用的金额,授权失败记录金额
private String fdMoney;
} }
...@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*; ...@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.net.URISyntaxException;
/** /**
* 聚富通代发工资相关 * 聚富通代发工资相关
...@@ -150,7 +149,11 @@ public class IcbcTransactionFlowIssueController { ...@@ -150,7 +149,11 @@ public class IcbcTransactionFlowIssueController {
@Inner @Inner
@PostMapping("/inner/doGetEkpBankStatus") @PostMapping("/inner/doGetEkpBankStatus")
public R<String> doGetEkpBankStatus() { public R<String> doGetEkpBankStatus() {
return icbcTransactionFlowIssueService.doGetEkpBankStatus(); // 工资
icbcTransactionFlowIssueService.doGetEkpBankStatus();
// 非扣税
icbcTransactionFlowIssueService.doGetEkpBankNoTaxStatus();
return R.ok();
} }
@Operation(summary = "定时任务获取回单文件", description = "定时任务获取回单文件") @Operation(summary = "定时任务获取回单文件", description = "定时任务获取回单文件")
......
...@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.ekp.mapper; ...@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.ekp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantDetail; import com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantDetail;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankCodeConfiglVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpBankCodeConfiglVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -40,8 +41,11 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail> ...@@ -40,8 +41,11 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail>
// 查询主表下的全部数据 // 查询主表下的全部数据
List<EkpBankExcelVo> getEkpBankExcelVoByIdAndMain(@Param("fdParentId") String fdParentId); List<EkpBankExcelVo> getEkpBankExcelVoByIdAndMain(@Param("fdParentId") String fdParentId);
List<EkpBankExcelNoTaxVo> getEkpBankExcelVoByIdAndMainNoTax(@Param("fdParentId") String fdParentId);
// 查询详情里的1条数据 // 查询详情里的1条数据
List<EkpBankExcelVo> getEkpBankExcelVoByIdAndDetail(@Param("fdId") String fdId); List<EkpBankExcelVo> getEkpBankExcelVoByIdAndDetail(@Param("fdId") String fdId);
List<EkpBankExcelNoTaxVo> getEkpBankExcelVoByIdAndDetailNoTax(@Param("fdId") String fdId);
// 编号查重 // 编号查重
String getWxNoByWxNo(@Param("wxNo") String wxNo); String getWxNoByWxNo(@Param("wxNo") String wxNo);
......
...@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.ekp.entity.EkpBankPayTask; import com.yifu.cloud.plus.v1.ekp.entity.EkpBankPayTask;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -34,9 +35,9 @@ import java.util.List; ...@@ -34,9 +35,9 @@ import java.util.List;
public interface EkpBankPayTaskMapper extends BaseMapper<EkpBankPayTask> { public interface EkpBankPayTaskMapper extends BaseMapper<EkpBankPayTask> {
// 获取发放中的主表,查询结果 // 获取发放中的主表,查询结果
List<EkpBankResultVo> getEkpBankMainByNeedResultMain(); List<EkpBankResultVo> getEkpBankMainByNeedResultMain(@Param("typeName") String typeName);
// 获取发放中的明细表,查询结果 // 获取发放中的明细表,查询结果
List<EkpBankResultVo> getEkpBankMainByNeedResultDetail(); List<EkpBankResultVo> getEkpBankMainByNeedResultDetail(@Param("typeName") String typeName);
} }
...@@ -20,8 +20,8 @@ package com.yifu.cloud.plus.v1.ekp.service; ...@@ -20,8 +20,8 @@ package com.yifu.cloud.plus.v1.ekp.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantDetail; import com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantDetail;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankCodeConfiglVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpBankCodeConfiglVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -39,9 +39,12 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail> ...@@ -39,9 +39,12 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail>
// 查询下载的待发 明细数据 // 查询下载的待发 明细数据
List<EkpBankExcelVo> getEkpBankExcelVoByIdAndMain(String fdParentId); List<EkpBankExcelVo> getEkpBankExcelVoByIdAndMain(String fdParentId);
// 查询非扣税的待发 明细数据
List<EkpBankExcelNoTaxVo> getEkpBankExcelVoByIdAndMainNoTax(String fdParentId);
// 查询下载的待发 明细数据 // 查询下载的待发 明细数据
List<EkpBankExcelVo> getEkpBankExcelVoByIdAndDetail(String fdId); List<EkpBankExcelVo> getEkpBankExcelVoByIdAndDetail(String fdId);
List<EkpBankExcelNoTaxVo> getEkpBankExcelVoByIdAndDetailNoTax(String fdId);
// 查询编码是否重复 // 查询编码是否重复
String getWxNoByWxNo(String wxNo); String getWxNoByWxNo(String wxNo);
......
...@@ -37,7 +37,7 @@ public interface EkpBankPayTaskService extends IService<EkpBankPayTask> { ...@@ -37,7 +37,7 @@ public interface EkpBankPayTaskService extends IService<EkpBankPayTask> {
* @Date: 2024-11-25 10:25:58 * @Date: 2024-11-25 10:25:58
* @return: com.yifu.cloud.plus.v1.ekp.entity.EkpBankPayTask * @return: com.yifu.cloud.plus.v1.ekp.entity.EkpBankPayTask
**/ **/
List<EkpBankResultVo> getEkpBankMainByNeedResultMain(); List<EkpBankResultVo> getEkpBankMainByNeedResultMain(String typeName);
/** /**
* @Description: 获取发放中的明细表,查询结果 * @Description: 获取发放中的明细表,查询结果
...@@ -45,6 +45,6 @@ public interface EkpBankPayTaskService extends IService<EkpBankPayTask> { ...@@ -45,6 +45,6 @@ public interface EkpBankPayTaskService extends IService<EkpBankPayTask> {
* @Date: 2024/11/25 10:38 * @Date: 2024/11/25 10:38
* @return: java.util.List<com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo> * @return: java.util.List<com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo>
**/ **/
List<EkpBankResultVo> getEkpBankMainByNeedResultDetail(); List<EkpBankResultVo> getEkpBankMainByNeedResultDetail(String typeName);
} }
...@@ -79,13 +79,21 @@ public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo> ...@@ -79,13 +79,21 @@ public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo>
void exportAll(HttpServletResponse response); void exportAll(HttpServletResponse response);
/** /**
* @Description: 每小时获取银企付款结果 * @Description: 每小时获取银企付款结果——工资
* @Author: hgw * @Author: hgw
* @Date: 2024/11/22 16:56 * @Date: 2024/11/22 16:56
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
R<String> doGetEkpBankStatus(); R<String> doGetEkpBankStatus();
/**
* @Description: 每小时获取非扣税银企付款结果——非扣税
* @Author: hgw
* @Date: 2026/2/26 16:56
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R<String> doGetEkpBankNoTaxStatus();
R getPdfFile() throws IOException; R getPdfFile() throws IOException;
} }
package com.yifu.cloud.plus.v1.ekp.service; package com.yifu.cloud.plus.v1.ekp.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.icbc.api.DefaultIcbcClient;
import com.icbc.api.IcbcApiException; import com.icbc.api.IcbcApiException;
import com.icbc.api.response.MybankEnterprisePayQpayentResponseV1;
import com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet; import com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet;
import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo; import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import java.util.List; import java.util.List;
...@@ -54,8 +58,11 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo> ...@@ -54,8 +58,11 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
// 工行非税支付 // 工行非税支付
// type 0 对公; 1 对私. // type 0 对公; 1 对私.
R<String> submitIcbcToNoTax(String totalAmt, String totalCount, String wxNo R<String> submitIcbcToNoTax(String totalAmt, String totalCount, String wxNo
, List<EkpBankExcelVo> detailList, int type, String fdId); , List<EkpBankExcelNoTaxVo> detailList, int type, String fdId);
R submitSearch(); R submitSearch();
// 查询非扣税结果
MybankEnterprisePayQpayentResponseV1 getResultNoTax(EkpBankResultVo task, String tranDate, String tranTime, String seqNo, DefaultIcbcClient client);
} }
...@@ -21,6 +21,7 @@ import com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantDetail; ...@@ -21,6 +21,7 @@ import com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantDetail;
import com.yifu.cloud.plus.v1.ekp.mapper.EkpBankGrantDetailMapper; import com.yifu.cloud.plus.v1.ekp.mapper.EkpBankGrantDetailMapper;
import com.yifu.cloud.plus.v1.ekp.service.EkpBankGrantDetailService; import com.yifu.cloud.plus.v1.ekp.service.EkpBankGrantDetailService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankCodeConfiglVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpBankCodeConfiglVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -50,10 +51,19 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai ...@@ -50,10 +51,19 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai
return baseMapper.getEkpBankExcelVoByIdAndMain(fdParentId); return baseMapper.getEkpBankExcelVoByIdAndMain(fdParentId);
} }
@Override
public List<EkpBankExcelNoTaxVo> getEkpBankExcelVoByIdAndMainNoTax(String fdParentId) {
return baseMapper.getEkpBankExcelVoByIdAndMainNoTax(fdParentId);
}
@Override @Override
public List<EkpBankExcelVo> getEkpBankExcelVoByIdAndDetail(String fdId) { public List<EkpBankExcelVo> getEkpBankExcelVoByIdAndDetail(String fdId) {
return baseMapper.getEkpBankExcelVoByIdAndDetail(fdId); return baseMapper.getEkpBankExcelVoByIdAndDetail(fdId);
} }
@Override
public List<EkpBankExcelNoTaxVo> getEkpBankExcelVoByIdAndDetailNoTax(String fdId) {
return baseMapper.getEkpBankExcelVoByIdAndDetailNoTax(fdId);
}
@Override @Override
public String getWxNoByWxNo(String wxNo) { public String getWxNoByWxNo(String wxNo) {
......
...@@ -43,8 +43,8 @@ public class EkpBankPayTaskServiceImpl extends ServiceImpl<EkpBankPayTaskMapper, ...@@ -43,8 +43,8 @@ public class EkpBankPayTaskServiceImpl extends ServiceImpl<EkpBankPayTaskMapper,
* @return: java.util.List<com.yifu.cloud.plus.v1.ekp.entity.EkpBankPayTask> * @return: java.util.List<com.yifu.cloud.plus.v1.ekp.entity.EkpBankPayTask>
**/ **/
@Override @Override
public List<EkpBankResultVo> getEkpBankMainByNeedResultMain() { public List<EkpBankResultVo> getEkpBankMainByNeedResultMain(String typeName) {
return baseMapper.getEkpBankMainByNeedResultMain(); return baseMapper.getEkpBankMainByNeedResultMain(typeName);
} }
/** /**
...@@ -54,7 +54,7 @@ public class EkpBankPayTaskServiceImpl extends ServiceImpl<EkpBankPayTaskMapper, ...@@ -54,7 +54,7 @@ public class EkpBankPayTaskServiceImpl extends ServiceImpl<EkpBankPayTaskMapper,
* @return: java.util.List<com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo> * @return: java.util.List<com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo>
**/ **/
@Override @Override
public List<EkpBankResultVo> getEkpBankMainByNeedResultDetail() { public List<EkpBankResultVo> getEkpBankMainByNeedResultDetail(String typeName) {
return baseMapper.getEkpBankMainByNeedResultDetail(); return baseMapper.getEkpBankMainByNeedResultDetail(typeName);
} }
} }
...@@ -19,7 +19,9 @@ import com.yifu.cloud.plus.v1.ekp.service.EkpBankCodeSetService; ...@@ -19,7 +19,9 @@ import com.yifu.cloud.plus.v1.ekp.service.EkpBankCodeSetService;
import com.yifu.cloud.plus.v1.ekp.service.EkpBankIcbcLogService; import com.yifu.cloud.plus.v1.ekp.service.EkpBankIcbcLogService;
import com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService; import com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService;
import com.yifu.cloud.plus.v1.ekp.vo.EKPEntryPushParam; import com.yifu.cloud.plus.v1.ekp.vo.EKPEntryPushParam;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
...@@ -680,7 +682,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -680,7 +682,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
// 改造自上面的demo接口:executePayment // 改造自上面的demo接口:executePayment
// type 0 对公; 1 对私. // type 0 对公; 1 对私.
public R<String> submitIcbcToNoTax(String totalAmt, String totalCount, String wxNo public R<String> submitIcbcToNoTax(String totalAmt, String totalCount, String wxNo
, List<EkpBankExcelVo> detailList, int type, String fdId) { , List<EkpBankExcelNoTaxVo> detailList, int type, String fdId) {
// 获取当前时间 // 获取当前时间
LocalTime currentTime = LocalTime.now(); LocalTime currentTime = LocalTime.now();
// 使用DateTimeFormatter格式化 // 使用DateTimeFormatter格式化
...@@ -719,7 +721,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -719,7 +721,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
List<MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2> rd = new ArrayList<>(); List<MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2> rd = new ArrayList<>();
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 rdDetail; MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 rdDetail;
for (EkpBankExcelVo detail : detailList) { for (EkpBankExcelNoTaxVo detail : detailList) {
// 0 对公 // 0 对公
if (CommonConstants.ZERO_INT == type) { if (CommonConstants.ZERO_INT == type) {
rdDetail = buildPayRecordDuiGong(detail); rdDetail = buildPayRecordDuiGong(detail);
...@@ -809,6 +811,29 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -809,6 +811,29 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
} }
} }
@Override
public MybankEnterprisePayQpayentResponseV1 getResultNoTax(EkpBankResultVo task, String tranDate, String tranTime, String seqNo, DefaultIcbcClient client) {
try {
MybankEnterprisePayQpayentRequestV1.MybankEnterprisePayQpayentRequestBizV1 bizContent =
new MybankEnterprisePayQpayentRequestV1.MybankEnterprisePayQpayentRequestBizV1();
MybankEnterprisePayQpayentRequestV1 request = new MybankEnterprisePayQpayentRequestV1();
bizContent.setTransCode("QHISD");
bizContent.setTranDate(tranDate);
bizContent.setTranTime(tranTime);
bizContent.setLanguage("zh_CN");
bizContent.setfSeqNo(seqNo);
bizContent.setQryfSeqno("null");
//待查平台交易序列号
bizContent.setQrySerialNo(task.getFdAttaSrc());
request.setServiceUrl("https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/qpayent/V1");
request.setBizContent(bizContent);
return client.execute(request);
} catch (Exception e) {
log.error("工行【非扣税】支付指令查询失败", e);
throw new RuntimeException("【非扣税】支付指令查询失败", e);
}
}
// 对公 // 对公
private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecord() { private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecord() {
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord = MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord =
...@@ -924,7 +949,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -924,7 +949,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
} }
// 对公 // 对公
private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiGong(EkpBankExcelVo detail) { private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiGong(EkpBankExcelNoTaxVo detail) {
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord = MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord =
new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2(); new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2();
...@@ -975,11 +1000,12 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -975,11 +1000,12 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//用途代码 //用途代码
// payRecord.setPurposeCode(record.getPurposeCode()); // payRecord.setPurposeCode(record.getPurposeCode());
//用途中文描述:用途代码和用途中文描述二选一上送 //用途中文描述:用途代码和用途中文描述二选一上送
if (Common.isNotNull(detail.getFdRemittancePurpose())) { // 2026-02-27 李连琴要转款备注,若空,要二级分类
if (detail.getFdRemittancePurpose().length()>20) { if (Common.isNotNull(detail.getFdCoverRemark())) {
detail.setFdRemittancePurpose(detail.getFdRemittancePurpose().substring(0,20)); if (detail.getFdCoverRemark().length()>20) {
detail.setFdCoverRemark(detail.getFdCoverRemark().substring(0,20));
} }
payRecord.setPurpose(detail.getFdRemittancePurpose()); payRecord.setPurpose(detail.getFdCoverRemark());
} else { } else {
payRecord.setPurpose("转账"); payRecord.setPurpose("转账");
} }
...@@ -994,7 +1020,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -994,7 +1020,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//相关业务编号 //相关业务编号
// payRecord.setRelatedRefNo(record.getRelatedRefNo()); // payRecord.setRelatedRefNo(record.getRelatedRefNo());
//ERP流水号 //ERP流水号
// payRecord.setErpSerialNo(record.getErpSerialNo()); payRecord.setErpSerialNo(detail.getFdId());
//ERP支票号 //ERP支票号
// payRecord.setErpCheckNo(record.getErpCheckNo()); // payRecord.setErpCheckNo(record.getErpCheckNo());
//业务代码 //业务代码
...@@ -1012,7 +1038,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1012,7 +1038,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
return payRecord; return payRecord;
} }
private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiSi(EkpBankExcelVo detail) { private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiSi(EkpBankExcelNoTaxVo detail) {
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord = MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord =
new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2(); new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2();
//业务唯一编号:相同指令不重复 //业务唯一编号:相同指令不重复
...@@ -1055,14 +1081,16 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1055,14 +1081,16 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//同城异地标志:1:同城;2:异地 非必填 //同城异地标志:1:同城;2:异地 非必填
payRecord.setSameCityFlag(""); payRecord.setSameCityFlag("");
payRecord.setAmount(Long.valueOf(detail.getFdMoney())); payRecord.setAmount(Long.valueOf(detail.getFdMoney()));
if (Common.isNotNull(detail.getFdRemittancePurpose())) { // 2026-02-27 李连琴要转款备注,若空,要二级分类
if (detail.getFdRemittancePurpose().length()>20) { if (Common.isNotNull(detail.getFdCoverRemark())) {
detail.setFdRemittancePurpose(detail.getFdRemittancePurpose().substring(0,20)); if (detail.getFdCoverRemark().length()>20) {
detail.setFdCoverRemark(detail.getFdCoverRemark().substring(0,20));
} }
payRecord.setPurpose(detail.getFdRemittancePurpose()); payRecord.setPurpose(detail.getFdCoverRemark());
} else { } else {
payRecord.setPurpose("转账"); payRecord.setPurpose("转账");
} }
payRecord.setErpSerialNo(detail.getFdId());
//摘要 //摘要
//payRecord.setSummary("12"); //payRecord.setSummary("12");
return payRecord; return payRecord;
......
...@@ -77,6 +77,32 @@ ...@@ -77,6 +77,32 @@
left join ekp_bank_code_set c on c.fd_payee_account=a.fd_payee_account left join ekp_bank_code_set c on c.fd_payee_account=a.fd_payee_account
where where
</sql> </sql>
<sql id="Base_No_Tax_Sql">
select
DATE_FORMAT(now(),'%Y%m%d') nowDate,
'2' detailTag,
a.fd_serial_number fdSerialNumber,
'' baoXiaoNumber,
'0' danJuNumber,
m.fd_bank_name fdBankName,
m.fd_bank_no fdBankNo,
m.fd_bank_account fdBankAccount,
ifnull(c.fd_recipient_bank,a.fd_recipient_bank) fdRecipientBank,
'' fdRecipientAdress,
c.fd_recipient_bank_code fdRecipientBankCode,
'2' payType,
a.fd_payee_account fdPayeeAccount,
a.fd_payee_name fdPayeeName,
concat('',round(a.fd_money * 100,0)) fdMoney,
a.fd_remittance_purpose fdRemittancePurpose,
ifnull(a.fd_remark,'转账') fdCoverRemark,
a.fd_emp_phone fdEmpPhone,
a.fd_id fdId
from ekp_bank_grant_detail a
left join ekp_bank_pay_task m on a.fd_parent_id=m.fd_id
left join ekp_bank_code_set c on c.fd_payee_account=a.fd_payee_account
where
</sql>
<!-- 查询待发放条数 --> <!-- 查询待发放条数 -->
<select id="getCountByIdAndMain" resultType="java.lang.Integer"> <select id="getCountByIdAndMain" resultType="java.lang.Integer">
...@@ -93,6 +119,13 @@ ...@@ -93,6 +119,13 @@
GROUP BY a.fd_id GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc ORDER BY (a.fd_serial_number-0) asc
</select> </select>
<!-- 查询主表下的所有待发放数据 -->
<select id="getEkpBankExcelVoByIdAndMainNoTax" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo">
<include refid="Base_No_Tax_Sql"/>
(a.fd_handle_status is null or a.fd_handle_status = '待发放') and a.fd_parent_id = #{fdParentId}
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc
</select>
<!-- 查询主表下的所有待发放数据 --> <!-- 查询主表下的所有待发放数据 -->
<select id="getEkpBankExcelVoByIdAndDetail" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo"> <select id="getEkpBankExcelVoByIdAndDetail" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo">
...@@ -101,6 +134,13 @@ ...@@ -101,6 +134,13 @@
GROUP BY a.fd_id GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc ORDER BY (a.fd_serial_number-0) asc
</select> </select>
<!-- 查询主表下的所有待发放数据 -->
<select id="getEkpBankExcelVoByIdAndDetailNoTax" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo">
<include refid="Base_No_Tax_Sql"/>
a.fd_handle_status = '待发放' and a.fd_id = #{fdId}
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc
</select>
<!-- 查询编号是否重复 --> <!-- 查询编号是否重复 -->
<select id="getWxNoByWxNo" resultType="java.lang.String"> <select id="getWxNoByWxNo" resultType="java.lang.String">
......
...@@ -91,9 +91,9 @@ ...@@ -91,9 +91,9 @@
<select id="getEkpBankMainByNeedResultMain" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo"> <select id="getEkpBankMainByNeedResultMain" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo">
select a.fd_id fdId,a.fd_wx_no fdWxNo select a.fd_id fdId,a.fd_wx_no fdWxNo
,count(d.fd_id) num,a.fd_bank_name fdBankName,a.fd_bank_no fdBankNo,a.fd_bank_account fdBankAccount ,count(d.fd_id) num,a.fd_bank_name fdBankName,a.fd_bank_no fdBankNo,a.fd_bank_account fdBankAccount
,a.fd_grant_num fdGrantNum ,a.fd_grant_num fdGrantNum,a.fd_atta_src fdAttaSrc
from ekp_bank_pay_task a left join ekp_bank_grant_detail d on a.fd_id = d.fd_parent_id from ekp_bank_pay_task a left join ekp_bank_grant_detail d on a.fd_id = d.fd_parent_id
where a.fd_grant_status = '发放中' where a.fd_grant_status = '发放中' and a.fd_pay_type = #{typeName}
GROUP BY a.fd_id GROUP BY a.fd_id
</select> </select>
...@@ -101,9 +101,11 @@ ...@@ -101,9 +101,11 @@
<select id="getEkpBankMainByNeedResultDetail" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo"> <select id="getEkpBankMainByNeedResultDetail" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo">
select d.fd_id fdId,d.fd_wx_no fdWxNo,d.fd_parent_id fdParentId,d.fd_fail_num fdFailNum,d.fd_salary_id fdSalaryId select d.fd_id fdId,d.fd_wx_no fdWxNo,d.fd_parent_id fdParentId,d.fd_fail_num fdFailNum,d.fd_salary_id fdSalaryId
,'1' num,a.fd_bank_name fdBankName,a.fd_bank_no fdBankNo,a.fd_bank_account fdBankAccount,d.fd_payee_name fdPayeeName ,'1' num,a.fd_bank_name fdBankName,a.fd_bank_no fdBankNo,a.fd_bank_account fdBankAccount,d.fd_payee_name fdPayeeName
,d.fd_grant_num fdGrantNum,d.fd_recipient_bank fdRecipientBank ,d.fd_grant_num fdGrantNum,d.fd_recipient_bank fdRecipientBank,a.fd_atta_src fdAttaSrc,d.fd_money fdMoney
from ekp_bank_grant_detail d left join ekp_bank_pay_task a on a.fd_id = d.fd_parent_id from ekp_bank_grant_detail d left join ekp_bank_pay_task a on a.fd_id = d.fd_parent_id
where a.fd_grant_status = '已发放' and d.fd_grant_status = '发放失败' and d.fd_handle_status = '发放中' where a.fd_grant_status = '已发放' and d.fd_grant_status = '发放失败' and d.fd_handle_status = '发放中' and a.fd_pay_type = #{typeName}
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment