From e423d56d730db1baed24f3f7dbbc4141038776b6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:12:03 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式
---
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/payComProtocol/JsApiPayComReqData.java | 75 +++++++++++++------------------------
1 files changed, 26 insertions(+), 49 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 4dde739..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,33 +20,29 @@
/**
* 商户号
*/
- private String mch_id = "";
+ private String mchid = "";
- private String check_name = "";
+ private String mch_appid = "";
+
/**
* 商户企业付款单号
*/
private String partner_trade_no = "";
+
/**
* 随机字符串
*/
private String nonce_str = "";
+
+
+ private String check_name = "";
+
+
/**
* 签名
*/
private String sign = "";
- /**
- * 收款方银行卡号
- */
- private String enc_bank_no = "";
- /**
- * 收款方用户名
- */
- private String enc_true_name = "";
- /**
- * 收款方开户行
- */
- private String bank_code = "";
+
/**
* 付款金额 RMB(分)
*/
@@ -69,14 +65,13 @@
* @param desc 描述
* @param outTradeNo 商户企业付款单号
* @param totalFee 付款金额
- * @param bankNo 银行卡号
- * @param bankTrueName 收款号姓名
* @param bankCode 收款号开户行
*/
- public JsApiPayComReqData(String mchID,String paySecret ,String desc, String outTradeNo, int totalFee,
+ public JsApiPayComReqData(String mchID,String mch_appid,String paySecret ,String desc, String outTradeNo, int totalFee,
String openid, String check_name, String bankCode) {
+ setMch_appid(mch_appid);
//默认必须设置
- setMch_id(mchID);
+ setMchid(mchID);
setDesc(desc);
setPartner_trade_no(outTradeNo);
setAmount(totalFee);
@@ -87,10 +82,16 @@
//根据API给的签名规则进行签名 【 必须要放在本方法的最后】
String sign = Signature.getSign(toMap(),paySecret);
setSign(sign);//把签名数据设置到Sign这个属性中
-// setEnc_bank_no();
-// setEnc_true_name();
-// setBank_code();
+
+ }
+
+ public String getMch_appid() {
+ return mch_appid;
+ }
+
+ public void setMch_appid(String mch_appid) {
+ this.mch_appid = mch_appid;
}
public String getCheck_name() {
@@ -101,36 +102,12 @@
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 String getEnc_bank_no() {
- return enc_bank_no;
- }
-
- public void setEnc_bank_no(String enc_bank_no) {
- this.enc_bank_no = enc_bank_no;
- }
-
- public String getEnc_true_name() {
- return enc_true_name;
- }
-
- public void setEnc_true_name(String enc_true_name) {
- this.enc_true_name = enc_true_name;
- }
-
- public String getBank_code() {
- return bank_code;
- }
-
- public void setBank_code(String bank_code) {
- this.bank_code = bank_code;
+ public void setMchid(String mchid) {
+ this.mchid = mchid;
}
public String getNonce_str() {
--
Gitblit v1.9.1