From 043f7704aade23c98d73a1ef132b1c2402c59e11 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 10 Jul 2024 18:33:47 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=87=8D=E8=AF=95=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/cbs8/service/impl/Cbs8ExtServiceImpl.java | 5 ----- .../hzya/frame/seeyon/cbs8/entity/PaymentEntity.java | 11 +++++++++++ .../hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml | 8 +++++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java index 2a82f8e6..ffa6606b 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java @@ -286,14 +286,11 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { * @return */ private Map headersValueOf(String sign, long timestamp) { - logger.info("开始组装请求头参数:{},{}",sign,timestamp); Map header = new HashMap(); header.put(CBSUtil.SIGN_HEADER_NAME, sign); header.put(CBSUtil.TIMESTAMP_HEADER, Long.toString(timestamp)); header.put(HTTP.CONTENT_TYPE, CBSUtil.TARGET_CONTENT_TYPE); - logger.info("准备获取token"); header.put(CBSUtil.AUTHORIZATION, CBSUtil.BEARER + CbsAccessToken.getToken()); - logger.info("组装后的header参数:{}",JSONObject.toJSONString(header)); return header; } @@ -306,7 +303,6 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { private void encrypAndsign(SysExtensionApiEntity entity, String requestData) { //签名 long timestamp = System.currentTimeMillis(); - logger.info("CBS请求参数明文:{}", requestData); String sign = CBSUtil.sign(requestData, timestamp); //加密 byte[] encryptedData = CBSUtil.encrypt(requestData); @@ -314,6 +310,5 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { header.put("hzyaExtData", requestData); entity.setByteBodys(encryptedData); entity.setHeaders(header); - logger.info("加密，签名方法执行完毕"); } } 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 9f68e3ff..811c0dd5 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 @@ -45,6 +45,9 @@ public class PaymentEntity extends BaseEntity { private String payType;//付款类别 private String payCompanyCode;//付款公司编码 + //是否重试 + private String retry_flag; + public String getOaId() { return oaId; } @@ -324,4 +327,12 @@ public class PaymentEntity extends BaseEntity { public void setApplyCode(String applyCode) { this.applyCode = applyCode; } + + public String getRetry_flag() { + return retry_flag; + } + + public void setRetry_flag(String retry_flag) { + this.retry_flag = retry_flag; + } } 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 410dca31..83bc3a7f 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 @@ -412,9 +412,11 @@ and v.payBankName = #{payBankName} and v.payType = #{payType} and v.finishedflag = #{finishedflag} - and v.amount > 0 - and v.payResult is null - and v.finishedflag = 1 + + and v.payResult is null + and v.amount > 0 + and v.finishedflag = 1 + From 943829f8d73d55bb17dc3b73abd85edac16f7da9 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 10 Jul 2024 18:34:01 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=87=8D=E8=AF=95=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/PayApplyPluginInitializer.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 d013e070..e3cb8535 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 @@ -1,9 +1,12 @@ package com.hzya.frame.plugin.cbs8.plugin; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +22,8 @@ public class PayApplyPluginInitializer extends PluginBaseEntity { @Autowired private ICbsPluginService cbsPluginService; - + @Autowired + private IIntegrationTaskLivingDetailsService taskLivingDetailsService; /*** * 插件初始化方法 * @Author 👻👻👻👻👻👻👻👻 gjh @@ -102,8 +106,20 @@ public class PayApplyPluginInitializer extends PluginBaseEntity { requestJson.remove("jsonStr"); paymentEntity = JSONObject.parseObject(requestJson.toString(),PaymentEntity.class); } - if (null == paymentEntity) + if (null == paymentEntity){ paymentEntity = new PaymentEntity(); + } + String id = requestJson.getString("integration_task_living_details_id"); + if (StrUtil.isNotEmpty(id)){ + //查询日志里的参数 + //查询日志表 + IntegrationTaskLivingDetailsEntity taskDetailEntity = taskLivingDetailsService.get(id); + if (null != taskDetailEntity){ + //重试标记 + paymentEntity.setRetry_flag("1"); + paymentEntity.setReferenceNum(taskDetailEntity.getRootAppBill()); + } + } //支付申请 //paymentEntity.setOaId("8475071606892874568"); cbsPluginService.applyPay(paymentEntity); From 97d5129ca54dc39f57e2c698a7a992750022923f Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Thu, 11 Jul 2024 10:45:13 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cbs8/service/impl/Cbs8ExtServiceImpl.java | 21 +++++++++++++------ .../seeyon/cbs8/entity/PaymentEntity.java | 21 +++++++++++++------ .../seeyon/cbs8/entity/PaymentEntity.xml | 2 +- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java index ffa6606b..3b32db81 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java @@ -45,7 +45,6 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { @Override public SysExtensionApiEntity payApply(SysExtensionApiEntity entity) { String bodys = entity.getBodys(); - logger.info("Cbs8ExtServiceImpl.payApply方法body参数:{}",bodys); if (StrUtil.isNotEmpty(bodys)) { PaymentEntity paymentEntity = JSONObject.parseObject(bodys, PaymentEntity.class); if (null != paymentEntity) { @@ -73,10 +72,11 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { String requestData = JSONObject.toJSONString(list); //加密 签名 encrypAndsign(entity, requestData); + //重试日志id + entity.getHeaders().put("integration_task_living_details_id",paymentEntity.getTaskDetailId()); entity.setBodys(requestData); } } - logger.info("Cbs8ExtServiceImpl.payApply方法执行完毕:{}",JSONObject.toJSONString(entity)); return entity; } @@ -96,6 +96,7 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { JSONObject sourceBody = sourceData.getJSONObject("body");//源数据body //自定义参数，存放的是请求报文明文 String hzyaExtData = targetHeaders.getString("hzyaExtData"); + String taskDetailId = targetHeaders.getString("integration_task_living_details_id"); String returnDataBase64 = logEntity.getReturnData(); byte[] secretResByte = Base64.getDecoder().decode(returnDataBase64); //解密报文 @@ -111,11 +112,19 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { //调用接口请求参数 logTask.setRootAppNewData(hzyaExtData); PayResponseDTO payResponseDTO = PayResponseDTO.payResValueOf(decryptRes); - //为true是成功 - if (payResponseDTO.getSuccessed()) { - taskLivingDetailsService.saveLogToSuccess(logTask); + if (StrUtil.isEmpty(taskDetailId)){ + //为true是成功 + if (payResponseDTO.getSuccessed()) { + taskLivingDetailsService.saveLogToSuccess(logTask); + }else { + taskLivingDetailsService.saveLogToFail(logTask); + } }else { - taskLivingDetailsService.saveLogToFail(logTask); + if (payResponseDTO.getSuccessed()){ + taskLivingDetailsService.saveLogFailToSuccess(logTask); + }else { + taskLivingDetailsService.updateLogFailToSuccess(logTask); + } } } catch (Exception e) { logger.info("payApplyCallBack方法执行出错:{}",e); 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 811c0dd5..e2e46f98 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 @@ -46,8 +46,9 @@ public class PaymentEntity extends BaseEntity { private String payCompanyCode;//付款公司编码 //是否重试 - private String retry_flag; - + private String retryFlag; + //重试日志id + private String taskDetailId; public String getOaId() { return oaId; } @@ -328,11 +329,19 @@ public class PaymentEntity extends BaseEntity { this.applyCode = applyCode; } - public String getRetry_flag() { - return retry_flag; + public String getRetryFlag() { + return retryFlag; } - public void setRetry_flag(String retry_flag) { - this.retry_flag = retry_flag; + public void setRetryFlag(String retryFlag) { + this.retryFlag = retryFlag; + } + + public String getTaskDetailId() { + return taskDetailId; + } + + public void setTaskDetailId(String taskDetailId) { + this.taskDetailId = taskDetailId; } } 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 83bc3a7f..fcc971c9 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 @@ -412,7 +412,7 @@ and v.payBankName = #{payBankName} and v.payType = #{payType} and v.finishedflag = #{finishedflag} - + and v.payResult is null and v.amount > 0 and v.finishedflag = 1 From 5fc9b8319e17a4738f120b0e1c4bb41a4850fecb Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 12 Jul 2024 16:22:43 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E4=BB=A3=E5=8F=91=2020?= =?UTF-8?q?24=E5=B9=B47=E6=9C=8812=E6=97=A5=2016:22:31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/PayApplyPluginInitializer.java | 16 ++++-- .../service/impl/CbsPluginServiceImpl.java | 57 ++++++++++++++++++- 2 files changed, 65 insertions(+), 8 deletions(-) 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 e3cb8535..0f802dc8 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 @@ -7,6 +7,7 @@ import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,20 +110,23 @@ public class PayApplyPluginInitializer extends PluginBaseEntity { if (null == paymentEntity){ paymentEntity = new PaymentEntity(); } - String id = requestJson.getString("integration_task_living_details_id"); - if (StrUtil.isNotEmpty(id)){ + String taskDetailId = requestJson.getString("integration_task_living_details_id"); + if (StrUtil.isNotEmpty(taskDetailId)){ //查询日志里的参数 //查询日志表 - IntegrationTaskLivingDetailsEntity taskDetailEntity = taskLivingDetailsService.get(id); + IntegrationTaskLivingDetailsEntity taskDetailEntity = taskLivingDetailsService.get(taskDetailId); if (null != taskDetailEntity){ //重试标记 - paymentEntity.setRetry_flag("1"); + paymentEntity.setRetryFlag("1"); paymentEntity.setReferenceNum(taskDetailEntity.getRootAppBill()); + paymentEntity.setTaskDetailId(taskDetailId); + }else { + return BaseResult.getFailureMessageEntity("根据id:{}，查不到记录",taskDetailId); } } //支付申请 - //paymentEntity.setOaId("8475071606892874568"); + //paymentEntity.setOaId("-5026223055769156433"); cbsPluginService.applyPay(paymentEntity); - return null; + return BaseResult.getSuccessMessageEntity("cbs8支付申请插件执行完成"); } } 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 81d79be3..36b443de 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 @@ -84,6 +84,10 @@ public class CbsPluginServiceImpl implements ICbsPluginService { if (CollectionUtils.isNotEmpty(paymentList)){ for (PaymentEntity pay : paymentList) { //调用支付申请接口 + pay.setTaskDetailId(paymentEntity.getTaskDetailId()); + if (StrUtil.isNotEmpty(paymentEntity.getTaskDetailId())){ + pay.setReferenceNumNew(spliceBillCode(pay.getReferenceNum())); + } PayResponseDTO payResponseDTO = cbs8Service.payApply(pay); boolean successed = payResponseDTO.getSuccessed(); if (successed){ @@ -312,8 +316,9 @@ public class CbsPluginServiceImpl implements ICbsPluginService { PaymentApplyAgentDTO detailDTO = BeanUtil.copyProperties(detail,PaymentApplyAgentDTO.class); paymentApplyAgentList.add(detailDTO); } - //招行这里要传203 - paymentApplySubmitReqDTO.setBankExtend5("203"); + + //不同银行添加 处理不一样 + addAttribute(agentPay,paymentApplySubmitReqDTO,paymentApplyAgentList); PayResponseDTO payResponseDTO = cbs8Service.agentPayApply(paymentApplySubmitReqDTO,paymentApplyAgentList); if (null != payResponseDTO){ Boolean successed = payResponseDTO.getSuccessed(); @@ -341,6 +346,48 @@ public class CbsPluginServiceImpl implements ICbsPluginService { } } + /** + * 不同银行设置不同的字段 + * @param agentPay + * @param paymentApplySubmitReqDTO 表头 + * @param list 表体 + */ + private void addAttribute(AgentPaymentEntity agentPay, PaymentApplySubmitReqDTO paymentApplySubmitReqDTO,List list) { + //招商 CMB + //代发类型 + paymentApplySubmitReqDTO.setBankExtend5("203"); + + + //浦东发展银行 PDB + paymentApplySubmitReqDTO.setPersonalFlag("1"); + //代发类型 + paymentApplySubmitReqDTO.setBankExtend5("203"); + //单位编号 + paymentApplySubmitReqDTO.setBankExtend6("203"); + //代发信息 1002表示代发工资 + paymentApplySubmitReqDTO.setBankExtend8("1002"); + for (PaymentApplyAgentDTO p : list) { + p.setDtlBankFlag("N"); + } + + //民生银行 CMC + //1表示代发工资 + paymentApplySubmitReqDTO.setBankExtend5("1"); + for (PaymentApplyAgentDTO p : list) { + p.setDtlBankFlag("N"); + } + + //农业银行 ABC + //200表示同行代发工资 + paymentApplySubmitReqDTO.setBankExtend2("200"); + //99020001表示工资发放 + paymentApplySubmitReqDTO.setBankExtend8("99020001"); + + //光大银行 CEB + paymentApplySubmitReqDTO.setBankExtend1("00000000"); + paymentApplySubmitReqDTO.setBankExtend8("0"); + } + /** * 代发代扣 结果详情查询 * @@ -495,4 +542,10 @@ public class CbsPluginServiceImpl implements ICbsPluginService { } } + //拼接新的单据号 + private String spliceBillCode(String code){ + String hour = Convert.toStr(DateUtil.hour(new Date(),true)); + String minute = Convert.toStr(DateUtil.minute(new Date())); + return code+"-"+hour+minute; + } } From 357453c017afedc89412c67716f2bdd25e88ac01 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 12 Jul 2024 16:23:18 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E4=BB=A3=E5=8F=91=2020?= =?UTF-8?q?24=E5=B9=B47=E6=9C=8812=E6=97=A5=2016:23:11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/cbs8/service/impl/Cbs8ExtServiceImpl.java | 12 +++++++++--- .../com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java | 7 +++++++ .../frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java | 13 +++++++++++++ .../hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml | 1 + .../seeyon/cbs8/service/impl/CbsLogServiceImpl.java | 7 ++++--- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java index 3b32db81..f993438d 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java @@ -103,16 +103,20 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { String decryptRes = CBSUtil.decrypt(secretResByte); //6、记录系统日志 IntegrationTaskLivingDetailsEntity logTask = new IntegrationTaskLivingDetailsEntity(); - logTask.setRootAppPk(sourceBody.getString("formsonId")); - logTask.setRootAppBill(sourceBody.getString("referenceNum")); + logTask.setRootAppPk(sourceBody.getString("oaId")); + String ferenceNum = Convert.toStr(sourceBody.getString("referenceNumNew"), sourceBody.getString("referenceNum")); + logTask.setRootAppBill(ferenceNum); logTask.setPluginId("CBS8PayApplyPlugin"); //对方接口返回信息 logTask.setNewTransmitInfo(decryptRes); - logTask.setNewPushDate(new Date()); + Date date = new Date(); + logTask.setNewPushDate(date); //调用接口请求参数 logTask.setRootAppNewData(hzyaExtData); PayResponseDTO payResponseDTO = PayResponseDTO.payResValueOf(decryptRes); if (StrUtil.isEmpty(taskDetailId)){ + logTask.setCreate_time(date); + logTask.setModify_time(date); //为true是成功 if (payResponseDTO.getSuccessed()) { taskLivingDetailsService.saveLogToSuccess(logTask); @@ -120,6 +124,8 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { taskLivingDetailsService.saveLogToFail(logTask); } }else { + logTask.setId(taskDetailId); + logTask.setModify_time(date); if (payResponseDTO.getSuccessed()){ taskLivingDetailsService.saveLogFailToSuccess(logTask); }else { diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java index 032d1a3e..99a7f7d3 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java @@ -9,4 +9,11 @@ import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity; * @Date 2024/6/14 17:30 **/ public interface ICbsLogDao extends IBaseDao { + + /** + * 更新日志 + * @param entity + * @return + */ + int updateLog(CbsLogEntity entity); } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java index a42437b0..bdd0ff3c 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.seeyon.cbs8.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.seeyon.cbs8.dao.ICbsLogDao; import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity; @@ -12,4 +13,16 @@ import org.springframework.stereotype.Repository; **/ @Repository() public class CbsLogDaoImpl extends MybatisGenericDao implements ICbsLogDao { + /** + * 更新日志 + * + * @param entity + * @return + */ + @DS("#entity.dataSourceCode") + @Override + public int updateLog(CbsLogEntity entity) { + this.update(getSqlIdPrifx()+"entity_update",entity); + return 0; + } } diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml index 3e03a88a..5ce3318f 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml @@ -106,6 +106,7 @@ field0010 =#{pay_state}, field0011 =#{message}, field0012 =#{apply_state}, + field0005 =#{cbs_apply_code}, field0014 =#{successed} where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java index 4446877b..fc70519e 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java @@ -109,12 +109,13 @@ public class CbsLogServiceImpl extends BaseService implemen logEntity.setApply_state(apply_state); logEntity.setSuccessed(successed); logEntity.setBill_code(cbsLogEntity.getBill_code()); + logEntity.setCbs_apply_code(cbs_apply_code); logEntity.setDataSourceCode(oa_data_source_code); try { updateLog(logEntity); }catch (Exception e){ e.printStackTrace(); - logger.error("更新"); + logger.error("更新cbs交易日志出错:{}",e); } } } @@ -186,10 +187,10 @@ public class CbsLogServiceImpl extends BaseService implemen * * @param logEntity */ - @DS("#logEntity.dataSourceCode") + // @DS("#logEntity.dataSourceCode") @Override public void updateLog(CbsLogEntity logEntity) { - cbsLogDao.update(logEntity); + cbsLogDao.updateLog(logEntity); } //获取xml模板 From 59de26703834ad9ad27736bb652aa06096709206 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Mon, 15 Jul 2024 10:39:51 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=2020?= =?UTF-8?q?24=E5=B9=B47=E6=9C=8815=E6=97=A5=2010:39:42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cbs8/entity/AgentPaymentDetailEntity.java | 21 ++++++++++++++++++- .../cbs8/entity/AgentPaymentDetailEntity.xml | 7 +++++++ .../cbs8/entity/AgentPaymentEntity.java | 10 +++++++++ .../seeyon/cbs8/entity/AgentPaymentEntity.xml | 4 +++- 4 files changed, 40 insertions(+), 2 deletions(-) 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 4776058c..d3637a10 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 @@ -25,7 +25,10 @@ public class AgentPaymentDetailEntity extends BaseEntity { //明细序号，从1开始递增 private int dtlSeqNum; - + //明细用途 + private String dtlPurpose; + //是否跨行 Y表示跨行 N表示同行 + private String dtlBankFlag; //支付结果 private String payResult; //支付日期 @@ -110,4 +113,20 @@ public class AgentPaymentDetailEntity extends BaseEntity { public void setPayDate(String payDate) { this.payDate = payDate; } + + public String getDtlPurpose() { + return dtlPurpose; + } + + public void setDtlPurpose(String dtlPurpose) { + this.dtlPurpose = dtlPurpose; + } + + public String getDtlBankFlag() { + return dtlBankFlag; + } + + public void setDtlBankFlag(String dtlBankFlag) { + this.dtlBankFlag = dtlBankFlag; + } } 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 index 43869fc1..3b9526f6 100644 --- 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 @@ -11,6 +11,8 @@ + + @@ -25,6 +27,8 @@ dtlCnapsCode, dtlRevName, dtlRevBankName, + dtlPurpose, + dtlBankFlag, payResult, payDate @@ -39,16 +43,19 @@ formson_0225.id, formson_0225.formmain_id AS formmainId, 'formson_0225' AS tabName, + 'N' AS dtlBankFlag, formson_0225.field0001 AS dtlSeqNum, formson_0225.field0019 AS dtlAmount, formson_0225.field0036 AS dtlRevAccount, formson_0225.field0035 AS dtlCnapsCode, formson_0225.field0037 AS dtlRevName, formson_0225.field0034 AS dtlRevBankName, + to_char(formmain_0224.field0030,'yyyy-MM')||'月'||'工资'AS dtlPurpose, formson_0225.field0044 AS payResult, formson_0225.field0045 AS payDate FROM formson_0225 + LEFT JOIN formmain_0224 ON formmain_0224.id = formson_0225.formmain_id )formson_0225 formson_0225.id = #{id} 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 65b9ea9a..be06fc7b 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 @@ -40,6 +40,8 @@ public class AgentPaymentEntity extends BaseEntity { private String tableName;//表名称 private String billName;//单据名称 + private String payBankType;//付款银行类型 + public String getReferenceNum() { return referenceNum; } @@ -151,4 +153,12 @@ public class AgentPaymentEntity extends BaseEntity { public void setPayDate(String payDate) { this.payDate = payDate; } + + public String getPayBankType() { + return payBankType; + } + + public void setPayBankType(String payBankType) { + this.payBankType = payBankType; + } } 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 index e83daca0..a74d8911 100644 --- 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 @@ -27,6 +27,7 @@ busType, amount, currency, + payBankType, payAccount, applyCode, payResult, @@ -52,7 +53,8 @@ '755915707610112' AS payAccount, formmain_0224.field0043 AS applyCode, formmain_0224.field0046 AS payResult, - '工资' AS purpose + formmain_0224.field0053 as payBankType, + to_char(formmain_0224.field0030,'yyyy-MM')||'月'||''工资' AS purpose FROM formmain_0224 LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0224.id From beedfe51e245d79fbd50c084c1f829fa0445b113 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Mon, 15 Jul 2024 10:40:14 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E4=BB=A3=E5=8F=91=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE=202024?= =?UTF-8?q?=E5=B9=B47=E6=9C=8815=E6=97=A5=2010:40:09?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CbsPluginServiceImpl.java | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) 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 36b443de..9cf81f6b 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 @@ -353,6 +353,7 @@ public class CbsPluginServiceImpl implements ICbsPluginService { * @param list 表体 */ private void addAttribute(AgentPaymentEntity agentPay, PaymentApplySubmitReqDTO paymentApplySubmitReqDTO,List list) { + //招商 CMB //代发类型 paymentApplySubmitReqDTO.setBankExtend5("203"); @@ -366,16 +367,10 @@ public class CbsPluginServiceImpl implements ICbsPluginService { paymentApplySubmitReqDTO.setBankExtend6("203"); //代发信息 1002表示代发工资 paymentApplySubmitReqDTO.setBankExtend8("1002"); - for (PaymentApplyAgentDTO p : list) { - p.setDtlBankFlag("N"); - } //民生银行 CMC //1表示代发工资 paymentApplySubmitReqDTO.setBankExtend5("1"); - for (PaymentApplyAgentDTO p : list) { - p.setDtlBankFlag("N"); - } //农业银行 ABC //200表示同行代发工资 @@ -386,6 +381,28 @@ public class CbsPluginServiceImpl implements ICbsPluginService { //光大银行 CEB paymentApplySubmitReqDTO.setBankExtend1("00000000"); paymentApplySubmitReqDTO.setBankExtend8("0"); + //证件号，不知道填什么 + for (PaymentApplyAgentDTO paymentApplyAgentDTO : list) { + paymentApplyAgentDTO.setDtlExtend1(""); + } + + //民生银行 + //付款类型 1代表代发工资 + paymentApplySubmitReqDTO.setBankExtend5("1"); + + //工商银行 + paymentApplySubmitReqDTO.setUrgentTag("0"); + + //广发银行 + //3表示代发工资 + paymentApplySubmitReqDTO.setBankExtend2("3"); + + //华夏银行 + paymentApplySubmitReqDTO.setBankExtend1("0"); + // xhj3001表示代发工资 + paymentApplySubmitReqDTO.setBankExtend2("xhj3001"); + + } /** From 7ef5aba72867c9fd485f340fec3fcf301c336194 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Tue, 16 Jul 2024 15:01:12 +0800 Subject: [PATCH 08/11] =?UTF-8?q?cbs=E6=8F=92=E4=BB=B6=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=202024=E5=B9=B47=E6=9C=8816=E6=97=A5=2015:01:07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/cbs8/plugin/ElecBillPluginInitializer.java | 3 ++- .../cbs8/plugin/TransactionDetailPluginInitializer.java | 4 ++-- .../plugin/cbs8/service/impl/CbsPluginServiceImpl.java | 9 +++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java index 685cef93..e51e66c8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java @@ -3,6 +3,7 @@ package com.hzya.frame.plugin.cbs8.plugin; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -96,6 +97,6 @@ public class ElecBillPluginInitializer extends PluginBaseEntity { @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { cbsPluginService.elecBillUpload(requestJson); - return null; + return BaseResult.getSuccessMessageEntity("cbs8电子回单插件执行成功"); } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java index de84e734..23a87f8b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java @@ -7,6 +7,7 @@ import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO; import com.hzya.frame.cbs8.dto.res.TransactionDetailDTO; import com.hzya.frame.cbs8.util.CBSUtil; import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -120,7 +121,6 @@ public class TransactionDetailPluginInitializer extends PluginBaseEntity { List transactionDetailList = cbsPluginService.queryTransactionDetail(transactionDetailReqDTO); //保存交易明细到OA底表 cbsPluginService.saveTransactionDetail(transactionDetailList); - return new JsonResultEntity("成功",true,transactionDetailList); - //return null; + return BaseResult.getSuccessMessageEntity("成功",transactionDetailList); } } 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 9cf81f6b..31c3d52f 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 @@ -213,10 +213,11 @@ public class CbsPluginServiceImpl implements ICbsPluginService { public void elecBillUpload(JSONObject requestJson) throws Exception { //查询支付成功 没有电子回单的数据 PaymentEntity paymentEntity = new PaymentEntity(); - // List paymentList = paymentService.queryElecIsNull(paymentEntity); - paymentEntity.setPayDate("2024-06-20"); - paymentEntity.setReferenceNum("41"); - List paymentList = Arrays.asList(paymentEntity); + paymentEntity.setDataSourceCode(oa_data_source_code); + List paymentList = paymentService.queryElecIsNull(paymentEntity); + //paymentEntity.setPayDate("2024-06-20"); + //paymentEntity.setReferenceNum("41"); + //List paymentList = Arrays.asList(paymentEntity); if (CollectionUtils.isNotEmpty(paymentList)) { for (PaymentEntity pay : paymentList) { try { From 1a0860353548d69ce2064ada65950dae5bade905 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Tue, 16 Jul 2024 15:01:39 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E5=9F=9F=E5=90=8D=E4=BF=AE=E6=94=B9=202024=E5=B9=B47?= =?UTF-8?q?=E6=9C=8816=E6=97=A5=2015:01:34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildpackage/src/main/resources/application-xel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpackage/src/main/resources/application-xel.yml b/buildpackage/src/main/resources/application-xel.yml index 13b3782c..c295f664 100644 --- a/buildpackage/src/main/resources/application-xel.yml +++ b/buildpackage/src/main/resources/application-xel.yml @@ -12,7 +12,7 @@ spring: dynamic: datasource: master: - url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true username: root password: 62e4295b615a30dbf3b8ee96f41c820b driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 From 07f80f0552651ce4d647c9c3ed2b03c09ee1bec5 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Tue, 16 Jul 2024 15:04:22 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=202024=E5=B9=B47=E6=9C=8816=E6=97=A5=2015:04?= =?UTF-8?q?:16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seeyon/cbs8/entity/PaymentEntity.xml | 108 ++++++------------ 1 file changed, 35 insertions(+), 73 deletions(-) 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 fcc971c9..cf029e1d 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 @@ -315,74 +315,37 @@ - select - - from - v_hzya_oa_cbs + select v.* from ( + + ) v referenceNum = #{referenceNum} and busType = #{busType} @@ -452,9 +414,9 @@ and payResult = #{payResult} and payBankName = #{payBankName} and payType = #{payType} - and (payResult='支付中' - or payResult not in ('审批撤销','审批拒绝','处理失败','退票','支付成功','取消支付','修改支付','支付失败')) - and personalFlag='0' + and (v.payResult='支付中' + or v.payResult not in ('审批撤销','审批拒绝','处理失败','退票','支付成功','取消支付','修改支付','支付失败')) + and v.personalFlag='0' From 97a8b99d8b4a7ab202285efa53ae0ca4c31b218c Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 17 Jul 2024 10:05:09 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A4=84=E7=90=86=202024=E5=B9=B47=E6=9C=881?= =?UTF-8?q?7=E6=97=A5=2010:05:03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 31c3d52f..9d3b23d0 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 @@ -319,7 +319,7 @@ public class CbsPluginServiceImpl implements ICbsPluginService { } //不同银行添加 处理不一样 - addAttribute(agentPay,paymentApplySubmitReqDTO,paymentApplyAgentList); + //addAttribute(agentPay,paymentApplySubmitReqDTO,paymentApplyAgentList); PayResponseDTO payResponseDTO = cbs8Service.agentPayApply(paymentApplySubmitReqDTO,paymentApplyAgentList); if (null != payResponseDTO){ Boolean successed = payResponseDTO.getSuccessed();