From 7dd8d8d475c527dbdb0b0a8f53a2327559ac928a Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 27 Jun 2024 22:18:30 +0800 Subject: [PATCH] fix --- .../service/payBill/impl/JianHangMaServiceImpl.java | 3 ++- .../service/payBill/impl/entity/JianHangMaRequest.java | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/payBill/impl/JianHangMaServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/payBill/impl/JianHangMaServiceImpl.java index bc339a6a6..dffc7a44d 100644 --- a/mallinkService/src/main/java/com/iformall/service/payBill/impl/JianHangMaServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/payBill/impl/JianHangMaServiceImpl.java @@ -37,6 +37,7 @@ public class JianHangMaServiceImpl extends PayBillBaseService implements PayBill request.setMERCHANTID(wxPayAccountBill.getPayConfigString("MERCHANTID")); request.setPOSID(wxPayAccountBill.getPayConfigString("POSID")); request.setBRANCHID(wxPayAccountBill.getPayConfigString("BRANCHID")); + request.setPUB(wxPayAccountBill.getPayConfigString("PUB_30"));//柜台公钥后30位 final IdWorker idWorker = IdWorker.get(); request.setORDERID(billdetail.getBillType()+"_"+idWorker.nextId()); request.setPAYMENT(money); @@ -50,7 +51,7 @@ public class JianHangMaServiceImpl extends PayBillBaseService implements PayBill log.error("JianHangMaServiceImpl createPay setMAC error.",e); return null; } - String full_url = url + "&"+request.toMacString()+"&MAC="+request.getMAC(); + String full_url = url + "&"+request.toMustString()+"&MAC="+request.getMAC(); log.info("full_url:"+full_url); String response = HttpUtil.doPost(full_url, null); log.info("url:"+full_url+">>>>reponse:"+response); diff --git a/mallinkService/src/main/java/com/iformall/service/payBill/impl/entity/JianHangMaRequest.java b/mallinkService/src/main/java/com/iformall/service/payBill/impl/entity/JianHangMaRequest.java index 8eccd245e..ee62a4643 100644 --- a/mallinkService/src/main/java/com/iformall/service/payBill/impl/entity/JianHangMaRequest.java +++ b/mallinkService/src/main/java/com/iformall/service/payBill/impl/entity/JianHangMaRequest.java @@ -37,11 +37,19 @@ public class JianHangMaRequest { //订单超时时间 CHAR(14) YYYYMMDDHHMMSS 如:20120214143005 private String TIMEOUT; //MAC校验域 CHAR(32) 采用标准MD5算法,由商户实现 + private String PUB; + //MAC校验域 CHAR(32) 采用标准MD5算法,由商户实现 private String MAC; - public String toMacString() { + public String toMustString() { return "MERCHANTID="+this.MERCHANTID+"&POSID="+this.POSID+"&BRANCHID="+this.BRANCHID+"&ORDERID="+this.ORDERID +"&PAYMENT="+this.PAYMENT+"&CURCODE="+this.CURCODE+"&REMARK1="+this.REMARK1+"&REMARK2="+StringUtils.trimToEmpty(this.REMARK2) +"&TXCODE="+this.TXCODE+"&RETURNTYPE="+this.RETURNTYPE+"&TIMEOUT="+this.TIMEOUT; } + + public String toMacString() { + return "MERCHANTID="+this.MERCHANTID+"&POSID="+this.POSID+"&BRANCHID="+this.BRANCHID+"&ORDERID="+this.ORDERID + +"&PAYMENT="+this.PAYMENT+"&CURCODE="+this.CURCODE+"&REMARK1="+this.REMARK1+"&REMARK2="+StringUtils.trimToEmpty(this.REMARK2) + +"&TXCODE="+this.TXCODE+"&RETURNTYPE="+this.RETURNTYPE+"&TIMEOUT="+this.TIMEOUT+"&PUB="+this.PUB; + } }