Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
7dd8d8d475
2 zmienionych plików z 11 dodań i 2 usunięć
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/payBill/impl/JianHangMaServiceImpl.java
  2. +9
    -1
      mallinkService/src/main/java/com/iformall/service/payBill/impl/entity/JianHangMaRequest.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/payBill/impl/JianHangMaServiceImpl.java Wyświetl plik

@@ -37,6 +37,7 @@ public class JianHangMaServiceImpl extends PayBillBaseService implements PayBill
request.setMERCHANTID(wxPayAccountBill.getPayConfigString("MERCHANTID")); request.setMERCHANTID(wxPayAccountBill.getPayConfigString("MERCHANTID"));
request.setPOSID(wxPayAccountBill.getPayConfigString("POSID")); request.setPOSID(wxPayAccountBill.getPayConfigString("POSID"));
request.setBRANCHID(wxPayAccountBill.getPayConfigString("BRANCHID")); request.setBRANCHID(wxPayAccountBill.getPayConfigString("BRANCHID"));
request.setPUB(wxPayAccountBill.getPayConfigString("PUB_30"));//柜台公钥后30位
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
request.setORDERID(billdetail.getBillType()+"_"+idWorker.nextId()); request.setORDERID(billdetail.getBillType()+"_"+idWorker.nextId());
request.setPAYMENT(money); request.setPAYMENT(money);
@@ -50,7 +51,7 @@ public class JianHangMaServiceImpl extends PayBillBaseService implements PayBill
log.error("JianHangMaServiceImpl createPay setMAC error.",e); log.error("JianHangMaServiceImpl createPay setMAC error.",e);
return null; 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); log.info("full_url:"+full_url);
String response = HttpUtil.doPost(full_url, null); String response = HttpUtil.doPost(full_url, null);
log.info("url:"+full_url+">>>>reponse:"+response); log.info("url:"+full_url+">>>>reponse:"+response);


+ 9
- 1
mallinkService/src/main/java/com/iformall/service/payBill/impl/entity/JianHangMaRequest.java Wyświetl plik

@@ -37,11 +37,19 @@ public class JianHangMaRequest {
//订单超时时间 CHAR(14) YYYYMMDDHHMMSS 如:20120214143005 //订单超时时间 CHAR(14) YYYYMMDDHHMMSS 如:20120214143005
private String TIMEOUT; private String TIMEOUT;
//MAC校验域 CHAR(32) 采用标准MD5算法,由商户实现 //MAC校验域 CHAR(32) 采用标准MD5算法,由商户实现
private String PUB;
//MAC校验域 CHAR(32) 采用标准MD5算法,由商户实现
private String MAC; private String MAC;
public String toMacString() {
public String toMustString() {
return "MERCHANTID="+this.MERCHANTID+"&POSID="+this.POSID+"&BRANCHID="+this.BRANCHID+"&ORDERID="+this.ORDERID 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) +"&PAYMENT="+this.PAYMENT+"&CURCODE="+this.CURCODE+"&REMARK1="+this.REMARK1+"&REMARK2="+StringUtils.trimToEmpty(this.REMARK2)
+"&TXCODE="+this.TXCODE+"&RETURNTYPE="+this.RETURNTYPE+"&TIMEOUT="+this.TIMEOUT; +"&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;
}
} }

Ładowanie…
Anuluj
Zapisz