From cd8dba9b1dfd112507782a671dddfa6ddb6cf95f Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 26 Jun 2024 17:02:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?cbs=20=E6=94=AF=E4=BB=98=20=E4=BB=A3?= =?UTF-8?q?=E5=8F=91=E4=BB=A3=E6=89=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seeyon/cbs8/dao/IAgentPaymentDao.java | 12 ++ .../cbs8/dao/IAgentPaymentDetailDao.java | 12 ++ .../cbs8/dao/impl/AgentPaymentDaoImpl.java | 15 +++ .../dao/impl/AgentPaymentDetailDaoImpl.java | 15 +++ .../cbs8/entity/AgentPaymentDetailEntity.java | 22 +++ .../cbs8/entity/AgentPaymentDetailEntity.xml | 84 ++++++++++++ .../cbs8/entity/AgentPaymentEntity.java | 50 ++++++- .../seeyon/cbs8/entity/AgentPaymentEntity.xml | 126 ++++++++++++++++++ .../seeyon/cbs8/entity/PaymentEntity.java | 27 ++++ .../seeyon/cbs8/entity/PaymentEntity.xml | 103 +++++++++----- .../service/IAgentPaymentDetailService.java | 18 +++ .../cbs8/service/IAgentPaymentService.java | 14 ++ .../impl/AgentPaymentDetailServiceImpl.java | 39 ++++++ .../service/impl/AgentPaymentServiceImpl.java | 54 +++++++- .../cbs8/service/impl/PaymentServiceImpl.java | 8 +- 15 files changed, 565 insertions(+), 34 deletions(-) create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDao.java create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDetailDao.java create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentDetailService.java create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentDetailServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDao.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDao.java new file mode 100644 index 00000000..5336cd91 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDao.java @@ -0,0 +1,12 @@ +package com.hzya.frame.seeyon.cbs8.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; + +/** + * @Description 代发代扣 + * @Author xiangerlin + * @Date 2024/6/26 10:50 + **/ +public interface IAgentPaymentDao extends IBaseDao { +} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDetailDao.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDetailDao.java new file mode 100644 index 00000000..96895bb4 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDetailDao.java @@ -0,0 +1,12 @@ +package com.hzya.frame.seeyon.cbs8.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; + +/** + * @Description 代发代扣明细 + * @Author xiangerlin + * @Date 2024/6/26 10:54 + **/ +public interface IAgentPaymentDetailDao extends IBaseDao { +} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDaoImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDaoImpl.java new file mode 100644 index 00000000..5b2e3852 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDaoImpl.java @@ -0,0 +1,15 @@ +package com.hzya.frame.seeyon.cbs8.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDao; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; +import org.springframework.stereotype.Repository; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/6/26 10:51 + **/ +@Repository("OAAgentPaymentDaoImpl") +public class AgentPaymentDaoImpl extends MybatisGenericDao implements IAgentPaymentDao { +} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java new file mode 100644 index 00000000..2b873067 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java @@ -0,0 +1,15 @@ +package com.hzya.frame.seeyon.cbs8.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; +import org.springframework.stereotype.Repository; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/6/26 10:55 + **/ +@Repository("OAAgentPaymentDetailDaoImpl") +public class AgentPaymentDetailDaoImpl extends MybatisGenericDao implements IAgentPaymentDetailDao { +} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java index 9ab32fc9..4776058c 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java @@ -8,6 +8,7 @@ import com.hzya.frame.web.entity.BaseEntity; * @Date 2024/6/18 14:58 **/ public class AgentPaymentDetailEntity extends BaseEntity { + //每笔明细金额 private String dtlAmount; //收款账号 private String dtlRevAccount; @@ -25,6 +26,11 @@ public class AgentPaymentDetailEntity extends BaseEntity { //明细序号，从1开始递增 private int dtlSeqNum; + //支付结果 + private String payResult; + //支付日期 + private String payDate; + public String getDtlAmount() { return dtlAmount; } @@ -88,4 +94,20 @@ public class AgentPaymentDetailEntity extends BaseEntity { public void setDtlSeqNum(int dtlSeqNum) { this.dtlSeqNum = dtlSeqNum; } + + public String getPayResult() { + return payResult; + } + + public void setPayResult(String payResult) { + this.payResult = payResult; + } + + public String getPayDate() { + return payDate; + } + + public void setPayDate(String payDate) { + this.payDate = payDate; + } } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml new file mode 100644 index 00000000..43869fc1 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + id, + formmainId, + tabName, + dtlSeqNum, + dtlAmount, + dtlRevAccount, + dtlCnapsCode, + dtlRevName, + dtlRevBankName, + payResult, + payDate + + + + + + + + update formson_0225 set + + field0045 =#{payDate}, + field0044 =#{payResult} + + where id = #{id} + + + + + update formson_0225 set + + field0045 =#{payDate}, + field0044 =#{payResult} + + where field0001=#{dtlSeqNum} and field0019=#{dtlAmount} and field0035=#{dtlCnapsCode} and field0037=#{dtlRevName} + + diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java index 001fb42a..b4b2748a 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java @@ -9,6 +9,11 @@ import com.hzya.frame.web.entity.BaseEntity; **/ public class AgentPaymentEntity extends BaseEntity { + //oa id + private String oaId; + private String finishedflag; + //流程标题 + private String title; //业务参考号 private String referenceNum; /** @@ -26,7 +31,10 @@ public class AgentPaymentEntity extends BaseEntity { private String payAccount; //用途 private String purpose; - + //申请单号 + private String applyCode; + //支付结果 + private String payResult; private String tableName;//表名称 private String billName;//单据名称 @@ -94,4 +102,44 @@ public class AgentPaymentEntity extends BaseEntity { public void setBillName(String billName) { this.billName = billName; } + + public String getOaId() { + return oaId; + } + + public void setOaId(String oaId) { + this.oaId = oaId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getFinishedflag() { + return finishedflag; + } + + public void setFinishedflag(String finishedflag) { + this.finishedflag = finishedflag; + } + + public String getApplyCode() { + return applyCode; + } + + public void setApplyCode(String applyCode) { + this.applyCode = applyCode; + } + + public String getPayResult() { + return payResult; + } + + public void setPayResult(String payResult) { + this.payResult = payResult; + } } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml new file mode 100644 index 00000000..c0b0f6f0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + oaId, + tableName, + finishedflag, + title, + billName, + referenceNum, + busType, + amount, + currency, + payAccount, + applyCode, + payResult, + purpose + + + + + + + + + + + update formmain_0224 set + + field0043 =#{applyCode}, + field0046 =#{payResult} + + where id = #{oaId} + + diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java index c52ba289..9f68e3ff 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java @@ -10,6 +10,7 @@ import com.hzya.frame.web.entity.BaseEntity; public class PaymentEntity extends BaseEntity { private String oaId;//主表id + private String formsonId;//明细表id private String payCompany;//付款公司 private String title;//流程标题 private String tableName;//表名称 @@ -19,12 +20,14 @@ public class PaymentEntity extends BaseEntity { private String busType;//业务类型 private String payResultField;//支付结果字段 private String payDateField;//打款日期字段 + private String applyCodeField;//支付申请单号字段 private String receiptFiled;//电子回单字段 private String summaryId;//summaryid private String startDate;//单据日期 private String finishedflag;//流程状态 private String payDate;//打款日期 private String payResult;//支付结果 + private String applyCode;//支付申请单号 private String payAccount;//付款账号 private String payBankName;//付款开户银行 private String amount;//金额 @@ -297,4 +300,28 @@ public class PaymentEntity extends BaseEntity { public void setPayCompanyCode(String payCompanyCode) { this.payCompanyCode = payCompanyCode; } + + public String getFormsonId() { + return formsonId; + } + + public void setFormsonId(String formsonId) { + this.formsonId = formsonId; + } + + public String getApplyCodeField() { + return applyCodeField; + } + + public void setApplyCodeField(String applyCodeField) { + this.applyCodeField = applyCodeField; + } + + public String getApplyCode() { + return applyCode; + } + + public void setApplyCode(String applyCode) { + this.applyCode = applyCode; + } } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml index 9eb9c031..b8d3deee 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml @@ -17,10 +17,13 @@ + + + @@ -34,7 +37,8 @@ - oaId, + oaId, + formsonId, payCompany, payCompanyCode, title, @@ -44,12 +48,14 @@ busType, payResultField, payDateField, + applyCodeField, receiptFiled, summaryId, startDate, finishedflag, payDate, payResult, + applyCode, payAccount, payBankName, amount, @@ -68,39 +74,71 @@ SELECT - formson_0210.id as oaId, - 'formson_0210' as tableName, - COL_SUMMARY.SUBJECT as title, - unit.name as payCompany, + formmain_0209.id as oaId, -- 主表id + formson_0210.formsonId, + 'formson_0210' as tableName, -- 表名 + COL_SUMMARY.SUBJECT as title, -- 单据标题 + unit.name as payCompany, -- 付款公司 '差旅费报销单' as billName, - 'field0072' as payResultField, - 'field0073' as payDateField, - '' as receiptFiled, + 'field0072' as payResultField, -- 支付结果字段 + 'field0073' as payDateField, -- 打款日期字段 + 'field0080' AS applyCodeField,-- CBS支付申请单号 + '' as receiptFiled,-- 电子回单字段 COL_SUMMARY.id as summaryId, - formmain_0209.field0017||'-'||formson_0210.sort as referenceNum, - formmain_0209.START_DATE as startDate, - formmain_0209.FINISHEDFLAG as finishedflag, - formson_0210.field0073 as payDate, - formson_0210.field0072 as payResult, - REGEXP_REPLACE(formmain_0209.field0042, '[[:space:]]', '') as payAccount, - REGEXP_REPLACE(formmain_0209.field0041, '[[:space:]]', '') as payBankName, - formson_0210.field0031 as amount, - formmain_0209.field0038 as purpose, - formmain_0209.field0038 as cbsAbstract, - REGEXP_REPLACE(formson_0210.field0069, '[[:space:]]', '') as revAccount, - formson_0210.field0068 as revBankName, - '测试' as revAccountName, - REGEXP_REPLACE(formson_0210.field0071, '[[:space:]]', '') as cnapsCode, - item.showvalue as personalFlag, - 'OTH' as revBankType, + formmain_0209.field0017||'-'||formson_0210.sort as referenceNum, -- 单据编号 + formmain_0209.START_DATE as startDate, -- 单据日期 + formmain_0209.FINISHEDFLAG as finishedflag, -- 流程状态 + formson_0210.field0073 as payDate, -- 打款日期 + formson_0210.field0072 as payResult, -- 支付结果 + formson_0210.field0080 AS applyCode,-- 支付申请单号 + REGEXP_REPLACE(formmain_0209.field0042, '[[:space:]]', '') as payAccount, -- 付款账户 + REGEXP_REPLACE(formmain_0209.field0041, '[[:space:]]', '') as payBankName, -- 付款开户行 + formson_0210.field0031 as amount, -- 金额 + formmain_0209.field0038 as purpose, -- 用途 + formmain_0209.field0038 as cbsAbstract, -- 摘要 + REGEXP_REPLACE(formson_0210.field0069, '[[:space:]]', '') as revAccount, -- 收款账户 + formson_0210.field0068 as revBankName, -- 收款开户行 + formson_0210.field0075 as revAccountName, -- 收款人 + REGEXP_REPLACE(formson_0210.field0071, '[[:space:]]', '') as cnapsCode, -- 收款联行号 + item.ENUMVALUE as personalFlag,-- 公私标记 + formson_0210.field0079 as revBankType, '10' as currency, '202' as busType, - '' as receipt - from - formson_0210 + '' as receipt -- 电子回单 + FROM + ( + SELECT + WM_CONCAT(id) AS formsonId, + formmain_id, + SUM(field0031) AS field0031, + MIN(sort) AS sort, + field0068, + field0069, + field0071, + field0079, + field0075, + field0070, + field0072, + field0073, + field0080 + FROM + formson_0210 + WHERE + field0067 = '-5486592002512828355' + GROUP BY + formmain_id, + field0068, + field0069, + field0071, + field0079, + field0075, + field0070, + field0072, + field0073, + field0080 + )formson_0210 LEFT JOIN formmain_0209 ON formson_0210.FORMMAIN_ID = formmain_0209.id LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0209.id - -- LEFT JOIN CTP_AFFAIR ON CTP_AFFAIR.object_id = COL_SUMMARY.id left join CTP_ENUM_ITEM item on item.id =formson_0210.field0070 left join ORG_UNIT unit on unit.id =formmain_0209.field0002 @@ -129,6 +167,7 @@ and v.title = #{title} and v.billName = #{billName} and v.payResult = #{payResult} + and v.applyCode = #{applyCode} and v.payBankName = #{payBankName} and v.payType = #{payType} and v.finishedflag = #{finishedflag} @@ -235,7 +274,8 @@ and v.payBankName = #{payBankName} and v.payType = #{payType} and v.finishedflag = #{finishedflag} - + and v.amount > 0 + and v.payResult is null @@ -285,9 +325,10 @@ update ${tableName} set ${payDateField} =#{payDate}, - ${payResultField} =#{payResult} + ${payResultField} =#{payResult}, + ${applyCodeField} =#{applyCode} - where id = #{oaId} + where id = #{formsonId} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentDetailService.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentDetailService.java new file mode 100644 index 00000000..f0a4811b --- /dev/null +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentDetailService.java @@ -0,0 +1,18 @@ +package com.hzya.frame.seeyon.cbs8.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; + +/** + * @Description 代发代扣明细 + * @Author xiangerlin + * @Date 2024/6/26 11:00 + **/ +public interface IAgentPaymentDetailService extends IBaseService { + /** + * 更新明细表支付状态 + * @param detail + */ + void updatePayResult(AgentPaymentDetailEntity detail); +} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentService.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentService.java index 707c226b..dcb6d78f 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentService.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentService.java @@ -21,6 +21,14 @@ public interface IAgentPaymentService extends IBaseService queryUnpaid(AgentPaymentEntity entity) throws Exception; + /** + * 根据支付申请单号查询 + * @param agentPayment + * @return + * @throws Exception + */ + AgentPaymentEntity queryByApplyCode(AgentPaymentEntity agentPayment)throws Exception; + /** * 查询明细表 * @param entity @@ -28,4 +36,10 @@ public interface IAgentPaymentService extends IBaseService queryDetails(AgentPaymentDetailEntity entity)throws Exception; + + /** + * 更新支付状态 + * @param entity + */ + void updateResult(AgentPaymentEntity entity); } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentDetailServiceImpl.java new file mode 100644 index 00000000..8bbbad34 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentDetailServiceImpl.java @@ -0,0 +1,39 @@ +package com.hzya.frame.seeyon.cbs8.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; +import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentDetailService; +import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/6/26 11:01 + **/ +@Service("OAAgentPaymentDetailServiceImpl") +public class AgentPaymentDetailServiceImpl extends BaseService implements IAgentPaymentDetailService { + + private IAgentPaymentDetailDao agentPaymentDetailDao; + + @Autowired + public void setAgentPaymentDetailDao(IAgentPaymentDetailDao agentPaymentDetailDao) { + this.agentPaymentDetailDao = agentPaymentDetailDao; + this.dao = agentPaymentDetailDao; + } + + /** + * 更新明细表支付状态 + * + * @param detail + */ + @DS("#detail.dataSourceCode") + @Override + public void updatePayResult(AgentPaymentDetailEntity detail) { + agentPaymentDetailDao.update("com.hzya.frame.seeyon.cbs8.dao.impl.AgentPaymentDetailDaoImpl.entity_update_result",detail); + } +} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentServiceImpl.java index e06b2998..ab3ab4b9 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentServiceImpl.java @@ -1,9 +1,17 @@ package com.hzya.frame.seeyon.cbs8.service.impl; +import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDao; +import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao; import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; +import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentDetailService; import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService; +import com.hzya.frame.web.exception.BaseSystemException; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -15,6 +23,16 @@ import java.util.List; **/ @Service(value = "cbs8AgentPaymentServiceImpl") public class AgentPaymentServiceImpl extends BaseService implements IAgentPaymentService { + + private IAgentPaymentDao agentPaymentDao; + + @Autowired + private IAgentPaymentDetailService agentPaymentDetailService; + @Autowired + public void setAgentPaymentDao(IAgentPaymentDao agentPaymentDao) { + this.agentPaymentDao = agentPaymentDao; + this.dao = agentPaymentDao; + } /** * 查询待支付待代发代扣 主表 * @@ -22,8 +40,31 @@ public class AgentPaymentServiceImpl extends BaseService queryUnpaid(AgentPaymentEntity entity) throws Exception { + List list = agentPaymentDao.queryList(entity, "com.hzya.frame.seeyon.cbs8.dao.impl.AgentPaymentDaoImpl.entity_list_base_unpaid"); + return list; + } + + /** + * 根据支付申请单号查询 + * + * @param entity + * @return + * @throws Exception + */ + @Override + public AgentPaymentEntity queryByApplyCode(AgentPaymentEntity entity) throws Exception { + if (null != entity && StrUtil.isNotEmpty(entity.getApplyCode())){ + List list = agentPaymentDao.query(entity); + if (CollectionUtils.isNotEmpty(list)){ + if (list.size() > 1){ + throw new BaseSystemException("根据"+entity.getApplyCode()+"查询到多条记录"); + } + return list.get(0); + } + } return null; } @@ -34,8 +75,19 @@ public class AgentPaymentServiceImpl extends BaseService queryDetails(AgentPaymentDetailEntity entity) throws Exception { - return null; + List list = agentPaymentDetailService.query(entity); + return list; + } + + /** + * @param entity + */ + @DS("#entity.dataSourceCode") + @Override + public void updateResult(AgentPaymentEntity entity) { + agentPaymentDao.update("com.hzya.frame.seeyon.cbs8.dao.impl.AgentPaymentDaoImpl.entity_update",entity); } } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java index 3c59ab96..dc593153 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java @@ -120,9 +120,15 @@ public class PaymentServiceImpl extends BaseService implem if (null != entity && StrUtil.isNotEmpty(entity.getTableName()) && StrUtil.isNotEmpty(entity.getOaId()) + && StrUtil.isNotEmpty(entity.getFormsonId()) && StrUtil.isNotEmpty(entity.getPayDateField()) && StrUtil.isNotEmpty(entity.getPayResultField())){ - paymentDao.update("com.hzya.frame.seeyon.cbs8.entity.PaymentEntity.PaymentEntity_update_payState",entity); + String formsonId = entity.getFormsonId(); + String[] formsonIdArray = formsonId.split(","); + for (String s : formsonIdArray) { + entity.setFormsonId(s); + paymentDao.update("com.hzya.frame.seeyon.cbs8.entity.PaymentEntity.PaymentEntity_update_payState",entity); + } } } From 3b772bf43bb98c38c3508dbcc2f1c802b07f035b Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 26 Jun 2024 17:02:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?cbs=E6=94=AF=E4=BB=98=20=E4=BB=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AgentPayResultPluginInitializer.java | 7 +- .../PayApplyAgentPluginInitializer.java | 16 +- .../plugin/PayApplyPluginInitializer.java | 2 +- .../cbs8/service/ICbsPluginService.java | 3 +- .../service/impl/CbsPluginServiceImpl.java | 152 +++++++++++++++--- 5 files changed, 136 insertions(+), 44 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/AgentPayResultPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/AgentPayResultPluginInitializer.java index ac1c5224..118e47b4 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/AgentPayResultPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/AgentPayResultPluginInitializer.java @@ -1,8 +1,10 @@ package com.hzya.frame.plugin.cbs8.plugin; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.cbs8.dto.req.AgentPayResultRequestDTO; +import com.hzya.frame.cbs8.dto.res.AgentPayQueryDTO; import com.hzya.frame.cbs8.dto.res.AgentPayResultResDTO; import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; import com.hzya.frame.web.entity.JsonResultEntity; @@ -11,6 +13,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + /** * @Description * @Author xiangerlin @@ -102,9 +106,8 @@ public class AgentPayResultPluginInitializer extends PluginBaseEntity { //1、查询代发代扣交易未完成代 //2、调用cbs接口 AgentPayResultRequestDTO agentPayResultRequestDTO = new AgentPayResultRequestDTO(); - agentPayResultRequestDTO.setBusNum(""); + agentPayResultRequestDTO.setBusNum("PA00034224062600011"); AgentPayResultResDTO agentPayResultResDTO = cbsPluginService.agentPayResult(agentPayResultRequestDTO); - //更新OA表单 //记录日志 return null; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java index 3866684d..9c90a865 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java @@ -109,20 +109,8 @@ public class PayApplyAgentPluginInitializer extends PluginBaseEntity { public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { //1、查询代支付的 AgentPaymentEntity agentPaymentEntity = new AgentPaymentEntity(); - List agentPaymentList = agentPaymentService.queryUnpaid(agentPaymentEntity); - if (CollectionUtils.isNotEmpty(agentPaymentList)){ - for (AgentPaymentEntity paymentEntity : agentPaymentList) { - AgentPaymentDetailEntity detailEntity = new AgentPaymentDetailEntity(); - detailEntity.setFormmainId(paymentEntity.getId()); - List agentPaymentDetailList = agentPaymentService.queryDetails(detailEntity); - if (CollectionUtils.isNotEmpty(agentPaymentDetailList)){ - //调用代发代扣接口 - PayResponseDTO payResponseDTO = cbsPluginService.applyAgentPay(paymentEntity, agentPaymentDetailList); - //更新OA表单 - //记录日志 - } - } - } + agentPaymentEntity.setOaId("4442823497745714629"); + cbsPluginService.applyAgentPay(agentPaymentEntity); return null; } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java index 83886054..36baa131 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java @@ -105,7 +105,7 @@ public class PayApplyPluginInitializer extends PluginBaseEntity { if (null == paymentEntity) paymentEntity = new PaymentEntity(); //支付申请 - paymentEntity.setOaId("5490849762671477371"); + paymentEntity.setOaId("8475071606892874568"); cbsPluginService.applyPay(paymentEntity); return null; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/ICbsPluginService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/ICbsPluginService.java index 8fc1f712..dd07a04b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/ICbsPluginService.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/ICbsPluginService.java @@ -57,9 +57,8 @@ public interface ICbsPluginService { /** * 代发代扣 支付申请 * @param paymentEntity - * @param agentPaymentDetailList */ - PayResponseDTO applyAgentPay(AgentPaymentEntity paymentEntity, List agentPaymentDetailList); + void applyAgentPay(AgentPaymentEntity paymentEntity); /** * 代发代扣 结果详情查询 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java index cdf26b9e..f560a661 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java @@ -5,22 +5,23 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.map.MapBuilder; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.hzya.frame.cbs8.dto.req.*; import com.hzya.frame.cbs8.dto.res.*; import com.hzya.frame.cbs8.service.ICbs8Service; import com.hzya.frame.cbs8.util.CBSUtil; +import com.hzya.frame.cbs8.util.CurrencyEnum; import com.hzya.frame.cbs8.util.PayState; import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; import com.hzya.frame.seeyon.cap4.form.dto.*; import com.hzya.frame.seeyon.cbs8.entity.*; -import com.hzya.frame.seeyon.cbs8.service.ICbsLogService; -import com.hzya.frame.seeyon.cbs8.service.IPaymentService; -import com.hzya.frame.seeyon.cbs8.service.ITransactionDetailService; +import com.hzya.frame.seeyon.cbs8.service.*; import com.hzya.frame.seeyon.entity.CtpAttachmentEntity; import com.hzya.frame.seeyon.entity.CtpFileEntity; import com.hzya.frame.seeyon.service.ICtpAttachmentService; @@ -38,6 +39,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Description @@ -57,6 +59,10 @@ public class CbsPluginServiceImpl implements ICbsPluginService { private ICtpAttachmentService ctpAttachmentService; @Autowired private ITransactionDetailService transactionDetailService; + @Autowired + private IAgentPaymentService agentPaymentService; + @Autowired + private IAgentPaymentDetailService agentPaymentDetailService; @Autowired private RestUtil restUtil; @@ -104,6 +110,7 @@ public class CbsPluginServiceImpl implements ICbsPluginService { } //4、更新OA表单 pay.setDataSourceCode(oa_data_source_code); + pay.setApplyCode(payResponseDTO.getBusNum()); paymentService.updatePayState(pay); //5、记录操作日志 savePayLog(pay,payResponseDTO); @@ -174,6 +181,7 @@ public class CbsPluginServiceImpl implements ICbsPluginService { //如果支付状态为空，保存支付申请状态，如果支付状态不为空，则保存支付状态 PaymentEntity paymentEntity = new PaymentEntity(); paymentEntity.setOaId(entity.getOa_id()); + paymentEntity.setApplyCode(entity.getCbs_apply_code()); paymentEntity.setDataSourceCode(oa_data_source_code); List paymentList = paymentService.query(paymentEntity); if (CollectionUtils.isNotEmpty(paymentList)){ @@ -300,21 +308,53 @@ public class CbsPluginServiceImpl implements ICbsPluginService { * 代发代扣 支付申请 * * @param paymentEntity - * @param agentPaymentDetailList + */ @Override - public PayResponseDTO applyAgentPay(AgentPaymentEntity paymentEntity, List agentPaymentDetailList) { - if (null != paymentEntity && CollectionUtils.isNotEmpty(agentPaymentDetailList)){ - PaymentApplySubmitReqDTO paymentApplySubmitReqDTO = BeanUtil.copyProperties(paymentEntity,PaymentApplySubmitReqDTO.class); - List paymentApplyAgentList = new ArrayList<>(); - for (AgentPaymentDetailEntity detailEntity : agentPaymentDetailList) { - PaymentApplyAgentDTO detailDTO = BeanUtil.copyProperties(detailEntity,PaymentApplyAgentDTO.class); - paymentApplyAgentList.add(detailDTO); + public void applyAgentPay(AgentPaymentEntity paymentEntity) { + try { + if (null != paymentEntity ){ + paymentEntity.setDataSourceCode(oa_data_source_code); + List agentPaymentList = agentPaymentService.queryUnpaid(paymentEntity); + if (CollectionUtils.isNotEmpty(agentPaymentList)){ + for (AgentPaymentEntity agentPay : agentPaymentList) { + AgentPaymentDetailEntity detailEntity = new AgentPaymentDetailEntity(); + detailEntity.setFormmainId(agentPay.getOaId()); + detailEntity.setDataSourceCode(oa_data_source_code); + List agentPaymentDetailList = agentPaymentService.queryDetails(detailEntity); + if (CollectionUtils.isNotEmpty(agentPaymentDetailList)){ + PaymentApplySubmitReqDTO paymentApplySubmitReqDTO = BeanUtil.copyProperties(agentPay,PaymentApplySubmitReqDTO.class); + List paymentApplyAgentList = new ArrayList<>(); + for (AgentPaymentDetailEntity detail : agentPaymentDetailList) { + PaymentApplyAgentDTO detailDTO = BeanUtil.copyProperties(detail,PaymentApplyAgentDTO.class); + paymentApplyAgentList.add(detailDTO); + } + //招行这里要传203 + paymentApplySubmitReqDTO.setBankExtend5("203"); + PayResponseDTO payResponseDTO = cbs8Service.agentPayApply(paymentApplySubmitReqDTO,paymentApplyAgentList); + if (null != payResponseDTO){ + Boolean successed = payResponseDTO.getSuccessed(); + AgentPaymentEntity pay = new AgentPaymentEntity(); + pay.setOaId(paymentEntity.getOaId()); + pay.setDataSourceCode(oa_data_source_code); + if (successed){ + //更新申请单号到OA + pay.setApplyCode(payResponseDTO.getBusNum()); + pay.setPayResult("审批中"); + }else { + pay.setPayResult(payResponseDTO.getErrorMsg()); + } + agentPaymentService.updateResult(pay); + System.out.println(JSONObject.toJSONString(payResponseDTO)); + } + } + } + } + }else { + throw new BaseSystemException("参数不能为空"); } - PayResponseDTO payResponseDTO = cbs8Service.agentPayApply(paymentApplySubmitReqDTO,paymentApplyAgentList); - return payResponseDTO; - }else { - throw new BaseSystemException("参数不能为空"); + }catch (Exception e){ + logger.error("代发代扣出错:{}",e); } } @@ -326,9 +366,49 @@ public class CbsPluginServiceImpl implements ICbsPluginService { */ @Override public AgentPayResultResDTO agentPayResult(AgentPayResultRequestDTO agentPayResultRequestDTO) { - if (null != agentPayResultRequestDTO && StrUtil.isNotEmpty(agentPayResultRequestDTO.getBusNum())){ - AgentPayResultResDTO agentPayResultResDTO = cbs8Service.agentPayResult(agentPayResultRequestDTO); - return agentPayResultResDTO; + try { + if (null != agentPayResultRequestDTO && StrUtil.isNotEmpty(agentPayResultRequestDTO.getBusNum())){ + AgentPayResultResDTO agentPayResultResDTO = cbs8Service.agentPayResult(agentPayResultRequestDTO); + //更新OA表单 + String busNum = agentPayResultResDTO.getBusNum(); + if (StringUtils.isNotEmpty(busNum)){ + AgentPaymentEntity agentPaymentEntity = new AgentPaymentEntity(); + agentPaymentEntity.setApplyCode(busNum); + agentPaymentEntity.setDataSourceCode(oa_data_source_code); + AgentPaymentEntity entity = agentPaymentService.queryByApplyCode(agentPaymentEntity); + String pay_status = agentPayResultResDTO.getPayStatus(); + String status = agentPayResultResDTO.getStatus(); + if (null != entity){ + AgentPaymentEntity result = new AgentPaymentEntity(); + result.setOaId(entity.getOaId()); + result.setDataSourceCode(oa_data_source_code); + //更新主表 + if (StrUtil.isEmpty(pay_status)) { + result.setPayResult(PayState.payStateGetValue(status));//支付申请状态 支付状态和支付申请状态用一个 + } else { + result.setPayResult(PayState.payStateGetValue(pay_status));//支付状态 支付状态和支付申请状态用一个 + } + agentPaymentService.updateResult(result); + //更新明细表 + List agentDetails = agentPayResultResDTO.getAgentDetails(); + for (AgentPayQueryDTO d : agentDetails) { + AgentPaymentDetailEntity detail = new AgentPaymentDetailEntity(); + detail.setFormmainId(entity.getOaId()); + detail.setDtlAmount(d.getDtlAmount()); + detail.setDtlCnapsCode(d.getDtlCnapsCode()); + detail.setDtlRevName(d.getDtlRevName()); + detail.setDtlSeqNum(Integer.valueOf(d.getDtlSeqNum())); + detail.setPayResult(PayState.payStateGetValue(d.getDtlStatus())); + detail.setPayDate(CBSUtil.convertTimestampToString(d.getDtlPayTime())); + detail.setDataSourceCode(oa_data_source_code); + agentPaymentDetailService.updatePayResult(detail); + } + } + } + return agentPayResultResDTO; + } + }catch (Exception e){ + logger.error("代发代扣详情结果查询出错{}",e); } return null; } @@ -336,16 +416,38 @@ public class CbsPluginServiceImpl implements ICbsPluginService { /** * 保存交易明细到OA底表 * - * @param transactionDetailList + * @param transactionlList */ @Override - public void saveTransactionDetail(List transactionDetailList) { - if (CollectionUtils.isNotEmpty(transactionDetailList)){ + public void saveTransactionDetail(List transactionlList) { + if (CollectionUtils.isNotEmpty(transactionlList)){ //过滤已经保存过的数据 - for (TransactionDetailDTO dto : transactionDetailList) { - TransactionDetailEntity transactionDetail = new TransactionDetailEntity(); - BeanUtil.copyProperties(dto,transactionDetail); - transactionDetailService.restSave(transactionDetail); + //收款档案表的数据 + TransactionDetailEntity transactionDetailEntity = new TransactionDetailEntity(); + transactionDetailEntity.setBankTransactionDate(DateUtil.lastWeek().toDateStr()); + transactionDetailEntity.setDataSourceCode(oa_data_source_code); + List transactionDetailList = transactionDetailService.querySerialNumber(transactionDetailEntity); + //过滤已经保存的数据 + if (CollectionUtils.isNotEmpty(transactionDetailList)){ + //过滤transactionlList 去除已经存在transactionDetailList中的数据，条件为transactionSerialNumber相等 + if (CollectionUtils.isNotEmpty(transactionlList)){ + transactionlList = transactionlList.stream() + .filter(item -> transactionDetailList.stream() + .noneMatch(detailItem -> item.getTransactionSerialNumber().equals(detailItem.getTransactionSerialNumber()))) + .collect(Collectors.toList()); + } + } + if (CollectionUtils.isNotEmpty(transactionlList)){ + //保存到OA底表 + for (TransactionDetailDTO dto : transactionlList) { + TransactionDetailEntity transactionDetail = new TransactionDetailEntity(); + BeanUtil.copyProperties(dto,transactionDetail); + transactionDetail.setCurrency(CurrencyEnum.getChineseNameByCode(dto.getCurrency())); + if (NumberUtil.isNumber(dto.getBankTransactionDate())){//如果是时间戳 转换成日期字符串 + transactionDetail.setBankTransactionDate(CBSUtil.convertTimestampToString(dto.getBankTransactionDate())); + } + transactionDetailService.restSave(transactionDetail); + } } } } From 2ff34ebe7edc390868b42ac85827f0577e891796 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 26 Jun 2024 17:02:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?cbs=E6=94=AF=E4=BB=98=20=E4=BB=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/req/PaymentApplySubmitReqDTO.java | 63 +++++++++++++++++++ .../cbs8/service/impl/Cbs8ServiceImpl.java | 2 +- .../com/hzya/frame/cbs8/util/PayState.java | 6 +- 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java b/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java index ed5e55a7..863ecb63 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java +++ b/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java @@ -44,6 +44,13 @@ public class PaymentApplySubmitReqDTO { private String cityFlag; //银行备用字段 一共8个 private String bankExtend1; + private String bankExtend2; + private String bankExtend3; + private String bankExtend4; + private String bankExtend5; + private String bankExtend6; + private String bankExtend7; + private String bankExtend8; //客户备用字段1 private String erpExtend1; @@ -179,4 +186,60 @@ public class PaymentApplySubmitReqDTO { public void setErpExtend3(String erpExtend3) { this.erpExtend3 = erpExtend3; } + + public String getBankExtend2() { + return bankExtend2; + } + + public void setBankExtend2(String bankExtend2) { + this.bankExtend2 = bankExtend2; + } + + public String getBankExtend3() { + return bankExtend3; + } + + public void setBankExtend3(String bankExtend3) { + this.bankExtend3 = bankExtend3; + } + + public String getBankExtend4() { + return bankExtend4; + } + + public void setBankExtend4(String bankExtend4) { + this.bankExtend4 = bankExtend4; + } + + public String getBankExtend5() { + return bankExtend5; + } + + public void setBankExtend5(String bankExtend5) { + this.bankExtend5 = bankExtend5; + } + + public String getBankExtend6() { + return bankExtend6; + } + + public void setBankExtend6(String bankExtend6) { + this.bankExtend6 = bankExtend6; + } + + public String getBankExtend7() { + return bankExtend7; + } + + public void setBankExtend7(String bankExtend7) { + this.bankExtend7 = bankExtend7; + } + + public String getBankExtend8() { + return bankExtend8; + } + + public void setBankExtend8(String bankExtend8) { + this.bankExtend8 = bankExtend8; + } } diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java index d361c63b..6b57738e 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java @@ -210,7 +210,7 @@ public class Cbs8ServiceImpl implements ICbs8Service { List dataList = cbsResponseDTO.getData(); if (CollectionUtils.isNotEmpty(dataList)){ JSONObject o = dataList.get(0); - PayResponseDTO payResponseDTO = JSON.toJavaObject(o, PayResponseDTO.class); + PayResponseDTO payResponseDTO = JSON.toJavaObject(o, PayResponseDTO.class); return payResponseDTO; } } diff --git a/service/src/main/java/com/hzya/frame/cbs8/util/PayState.java b/service/src/main/java/com/hzya/frame/cbs8/util/PayState.java index 8e1626b0..0ab494c7 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/util/PayState.java +++ b/service/src/main/java/com/hzya/frame/cbs8/util/PayState.java @@ -25,13 +25,15 @@ public enum PayState { one("1","待处理"), two("2","审批中"), three("3","处理失败"), - four("4","审批通过"), + four("4","审批完成"), five("5","审批撤销"), six("6","审批拒绝"), seven("7","待发送审批"), eight("8","集中受理中"), nine("9","审批退回"), - ten("10","未处理"); + ten("10","预处理中"), + eleven("11","预处理拒绝"), + twelve("12","资金监控审批中"); //类型