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 +