From 2a4dc73c59eae1e14b0e0660bf04652fa3d322ad Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 07 Apr 2021 12:06:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/payComProtocol/JsApiPayComReqData.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/payComProtocol/JsApiPayComReqData.java b/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/payComProtocol/JsApiPayComReqData.java
index 2f62555..45b726d 100644
--- a/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/payComProtocol/JsApiPayComReqData.java
+++ b/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/payComProtocol/JsApiPayComReqData.java
@@ -20,7 +20,7 @@
/**
* 商户号
*/
- private String mch_id = "";
+ private String mchid = "";
private String mch_appid = "";
@@ -71,7 +71,7 @@
String openid, String check_name, String bankCode) {
setMch_appid(mch_appid);
//默认必须设置
- setMch_id(mchID);
+ setMchid(mchID);
setDesc(desc);
setPartner_trade_no(outTradeNo);
setAmount(totalFee);
@@ -102,15 +102,13 @@
this.check_name = check_name;
}
- public String getMch_id() {
- return mch_id;
+ public String getMchid() {
+ return mchid;
}
- public void setMch_id(String mch_id) {
- this.mch_id = mch_id;
+ public void setMchid(String mchid) {
+ this.mchid = mchid;
}
-
-
public String getNonce_str() {
return nonce_str;
--
Gitblit v1.9.1